Update plugins and tools to 3.6.0

Request: MO Change-Id: Ice96eac857f7cc61e32090ee20e7afa0d5f3fcb6
bdeployteam · Feb 2, 2021 · fbc516a · fbc516a
1 parent 5e5a350
commit fbc516a
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 62 deletions.
diff --git a/plugins/bdeploy-demo-plugin/build.gradle b/plugins/bdeploy-demo-plugin/build.gradle
@@ -8,13 +8,13 @@ repositories {
     mavenCentral()
 }
 
-version = "1.0.0"
+version = "1.0.1"
 
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 
 dependencies {
-    implementation 'io.bdeploy:api:3.2.0'
+    implementation 'io.bdeploy:api:3.6.0'
 }
 
 eclipse {

diff --git a/plugins/bdeploy-demo-plugin/gradle/wrapper/gradle-wrapper.jar b/plugins/bdeploy-demo-plugin/gradle/wrapper/gradle-wrapper.jar
diff --git a/plugins/bdeploy-demo-plugin/gradle/wrapper/gradle-wrapper.properties b/plugins/bdeploy-demo-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugins/bdeploy-demo-plugin/gradlew b/plugins/bdeploy-demo-plugin/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/plugins/bdeploy-demo-plugin/gradlew.bat b/plugins/bdeploy-demo-plugin/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/plugins/bdeploy-demo-plugin/src/main/java/io/bdeploy/plugins/starter/StarterResource.java b/plugins/bdeploy-demo-plugin/src/main/java/io/bdeploy/plugins/starter/StarterResource.java
@@ -3,24 +3,25 @@
 import java.util.Base64;
 
 import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
 import jakarta.ws.rs.QueryParam;
 
 /**
  * This simple resource has the capability to Base64 encode and decode a string.
  * <p>
  * The starter frontend module uses this APIs to demonstrate an editor with backend data binding.
  */
-@javax.ws.rs.Path("/starter")
+@Path("/starter")
 public class StarterResource {
 
     @GET
-    @javax.ws.rs.Path("/encode")
+    @Path("/encode")
     public String enc(@QueryParam("v") String value) {
     	return Base64.getEncoder().encodeToString(value.getBytes());
     }
 
     @GET
-    @javax.ws.rs.Path("/decode")
+    @Path("/decode")
     public String dec(@QueryParam("v") String value) {
         return new String(Base64.getDecoder().decode(value));
     }

diff --git a/plugins/build-tool-gradle/build.gradle b/plugins/build-tool-gradle/build.gradle
@@ -20,7 +20,7 @@ repositories {
     jcenter()
 }
 
-version = "3.5.0"
+version = "3.6.0"
 group = "io.bdeploy"
 
 dependencies {
@@ -29,7 +29,7 @@ dependencies {
     testImplementation gradleTestKit()
 
     implementation (
-        'io.bdeploy:api:3.5.0'
+        'io.bdeploy:api:3.6.0'
     )
 }
 

diff --git a/plugins/build-tool-gradle/gradle/wrapper/gradle-wrapper.properties b/plugins/build-tool-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugins/build-tool-gradle/src/main/java/io/bdeploy/gradle/BDeployProductTask.java b/plugins/build-tool-gradle/src/main/java/io/bdeploy/gradle/BDeployProductTask.java
@@ -10,8 +10,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.ws.rs.core.UriBuilder;
-
 import org.gradle.api.Action;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
@@ -39,6 +37,7 @@
 import io.bdeploy.gradle.config.BDeployRepositoryServerConfig;
 import io.bdeploy.gradle.extensions.ApplicationExtension;
 import io.bdeploy.gradle.extensions.BDeployProductExtension;
+import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Builds a product into a local BHive. Requires the applications with an

diff --git a/plugins/build-tool-gradle/src/main/java/io/bdeploy/gradle/BDeployPushTask.java b/plugins/build-tool-gradle/src/main/java/io/bdeploy/gradle/BDeployPushTask.java
@@ -1,7 +1,5 @@
 package io.bdeploy.gradle;
 
-import javax.ws.rs.core.UriBuilder;
-
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.provider.Property;
@@ -16,6 +14,7 @@
 import io.bdeploy.common.security.RemoteService;
 import io.bdeploy.gradle.extensions.BDeployServerExtension;
 import io.bdeploy.gradle.extensions.ServerExtension;
+import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Pushes a previously built product to a specified server.

diff --git a/plugins/build-tool-gradle/src/main/java/io/bdeploy/gradle/BDeployZipTask.java b/plugins/build-tool-gradle/src/main/java/io/bdeploy/gradle/BDeployZipTask.java
@@ -2,8 +2,6 @@
 
 import java.net.URI;
 
-import javax.ws.rs.core.UriBuilder;
-
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.RegularFileProperty;
@@ -18,6 +16,7 @@
 import io.bdeploy.bhive.op.remote.PushOperation;
 import io.bdeploy.common.ActivityReporter;
 import io.bdeploy.common.security.RemoteService;
+import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Packages a product as a ZIP file.

diff --git a/plugins/build-tool-tea/io.bdeploy.tea.feature/feature.xml b/plugins/build-tool-tea/io.bdeploy.tea.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.bdeploy.tea.feature"
       label="%featureName"
-      version="3.5.0.qualifier"
+      version="3.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">

diff --git a/plugins/build-tool-tea/io.bdeploy.tea.plugin/META-INF/MANIFEST.MF b/plugins/build-tool-tea/io.bdeploy.tea.plugin/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.bdeploy.tea.plugin
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.6.0.qualifier
 Automatic-Module-Name: org.eclipse.tea.library.bdeploy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .,
- maven/api-3.5.0.jar
+ maven/api-3.6.0.jar
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tea.core;bundle-version="1.1.0",
  org.eclipse.tea.core.ui;bundle-version="1.1.0",
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.core.di.annotations,
  org.eclipse.e4.core.di.extensions
 Bundle-ActivationPolicy: lazy
-Build-Maven: io.bdeploy:api:3.5.0
+Build-Maven: io.bdeploy:api:3.6.0
 Export-Package: io.bdeploy.common.util,
  io.bdeploy.tea.plugin,
  io.bdeploy.tea.plugin.rcp,

diff --git a/plugins/build-tool-tea/io.bdeploy.tea.plugin/build.properties b/plugins/build-tool-tea/io.bdeploy.tea.plugin/build.properties
@@ -5,5 +5,5 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                icons/,\
                plugin.properties,\
-               maven/api-3.5.0.jar
+               maven/api-3.6.0.jar
 
diff --git a/...ild-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployBuildProductTask.java b/...ild-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployBuildProductTask.java
@@ -18,8 +18,6 @@
 import java.util.Map;
 import java.util.SortedSet;
 
-import javax.ws.rs.core.UriBuilder;
-
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -48,6 +46,7 @@
 import io.bdeploy.common.util.StringHelper;
 import io.bdeploy.tea.plugin.server.BDeployTargetSpec;
 import io.bdeploy.tea.plugin.services.BDeployApplicationBuild;
+import jakarta.ws.rs.core.UriBuilder;
 
 @SuppressWarnings("restriction")
 public class BDeployBuildProductTask {

diff --git a/...ool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployCheckServerOnlineTask.java b/...ool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployCheckServerOnlineTask.java
@@ -3,14 +3,13 @@
  */
 package io.bdeploy.tea.plugin;
 
-import javax.ws.rs.core.UriBuilder;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 
 import io.bdeploy.api.remote.v1.PublicRootResource;
 import io.bdeploy.common.security.RemoteService;
 import io.bdeploy.jersey.JerseyClientFactory;
 import io.bdeploy.tea.plugin.server.BDeployTargetSpec;
+import jakarta.ws.rs.core.UriBuilder;
 
 public class BDeployCheckServerOnlineTask {
 

diff --git a/...d-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployPackageProductTask.java b/...d-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployPackageProductTask.java
@@ -7,9 +7,6 @@
 import java.net.URI;
 import java.util.Set;
 
-import javax.inject.Named;
-import javax.ws.rs.core.UriBuilder;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.tea.core.services.TaskingLog;
 import org.eclipse.tea.library.build.config.BuildDirectories;
@@ -20,6 +17,8 @@
 import io.bdeploy.bhive.op.CopyOperation;
 import io.bdeploy.bhive.op.ObjectListOperation;
 import io.bdeploy.common.ActivityReporter;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.UriBuilder;
 
 @Named("BDeploy Product Packaging")
 public class BDeployPackageProductTask {

diff --git a/...uild-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployProductPushTask.java b/...uild-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployProductPushTask.java
@@ -6,8 +6,6 @@
 import java.io.File;
 import java.util.function.Supplier;
 
-import javax.ws.rs.core.UriBuilder;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.tea.core.services.TaskingLog;
 import org.eclipse.tea.library.build.config.BuildDirectories;
@@ -20,6 +18,7 @@
 import io.bdeploy.common.NoThrowAutoCloseable;
 import io.bdeploy.common.security.RemoteService;
 import io.bdeploy.tea.plugin.server.BDeployTargetSpec;
+import jakarta.ws.rs.core.UriBuilder;
 
 public class BDeployProductPushTask {
 

diff --git a/...ild-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployProductTaskChain.java b/...ild-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/BDeployProductTaskChain.java
@@ -17,9 +17,6 @@
 import java.util.stream.Collectors;
 
 import javax.net.ssl.SSLHandshakeException;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.UriBuilder;
 
 import org.eclipse.core.internal.variables.StringVariableManager;
 import org.eclipse.core.runtime.CoreException;
@@ -69,6 +66,9 @@
 import io.bdeploy.tea.plugin.services.BDeployApplicationDescriptor;
 import io.bdeploy.tea.plugin.services.BDeployApplicationService;
 import io.bdeploy.tea.plugin.services.BDeployApplicationService.CreateApplicationTasks;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.UriBuilder;
 
 @SuppressWarnings("restriction")
 @Component

diff --git a/...d-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/server/BDeployLoginDialog.java b/...d-tool-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/server/BDeployLoginDialog.java
@@ -12,12 +12,6 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.Response.Status.Family;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.IMessageProvider;
@@ -36,6 +30,12 @@
 import org.eclipse.tea.core.services.TaskingLog;
 
 import io.bdeploy.api.remote.v1.dto.CredentialsApi;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.Status.Family;
 
 public class BDeployLoginDialog extends TitleAreaDialog {
 

diff --git a/...l-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/server/BDeployServerEditDialog.java b/...l-tea/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/server/BDeployServerEditDialog.java
@@ -6,8 +6,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.ws.rs.core.UriBuilder;
-
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -31,6 +29,7 @@
 import io.bdeploy.api.remote.v1.dto.InstanceGroupConfigurationApi;
 import io.bdeploy.common.security.RemoteService;
 import io.bdeploy.jersey.JerseyClientFactory;
+import jakarta.ws.rs.core.UriBuilder;
 
 public class BDeployServerEditDialog extends TitleAreaDialog {
 

diff --git a/...a/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/services/BDeployApplicationService.java b/...a/io.bdeploy.tea.plugin/src/io/bdeploy/tea/plugin/services/BDeployApplicationService.java
@@ -10,12 +10,12 @@
 import java.lang.annotation.Target;
 import java.util.List;
 
-import javax.inject.Qualifier;
-
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.tea.core.TaskExecutionContext;
 import org.eclipse.tea.core.annotations.TaskChainContextInit;
 
+import jakarta.inject.Qualifier;
+
 /**
  * Service which provides logic to enrich a {@link TaskExecutionContext} with logic to build a certain application configured in a
  * product descriptor.

diff --git a/plugins/gradle-plugin-test-project/build.gradle b/plugins/gradle-plugin-test-project/build.gradle
@@ -25,7 +25,7 @@ repositories {
     jcenter()
 }
 
-version = "1.0.0-SNAPSHOT"
+version = "1.0.1-SNAPSHOT"
 
 ext {
     buildDate = new Date().format('yyyyMMddHHmmss')

diff --git a/plugins/gradle-plugin-test-project/gradle/wrapper/gradle-wrapper.properties b/plugins/gradle-plugin-test-project/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists