[nobug] increment for 3.22 and removal of IPlatformRunnable
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
index c87882a..08534f8 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.enterprise_core.feature"
label="%featureName"
- version="3.21.0.qualifier"
+ version="3.22.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
index b63200c..2c7b9f2 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.enterprise_core.feature</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>3.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
index 3a9f526..7538438 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.enterprise_sdk.feature"
label="%featureName"
- version="3.21.0.qualifier"
+ version="3.22.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
index c21137d..82d64b6 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.enterprise_sdk.feature</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>3.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
index b98baad..d4aed60 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.enterprise_tests.feature"
label="%featureName"
- version="3.21.0.qualifier"
+ version="3.22.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
index d01a1d1..e73452d 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.enterprise_tests.feature</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>3.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
index 5123a44..ab9a1ef 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.enterprise_ui.feature"
label="%featureName"
- version="3.21.0.qualifier"
+ version="3.22.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jst.jee.ui"
license-feature="org.eclipse.license"
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
index 80c98be..ec42607 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_ui.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.enterprise_ui.feature</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>3.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
index a20a2c7..ebba206 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.web_core.feature"
label="%featureName"
- version="3.21.0.qualifier"
+ version="3.22.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
index e124439..95d3e44 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_core.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.web_core.feature</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>3.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml
index e1667de..6e560f4 100755
--- a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.jst.web_js_support.feature"
label="%featureName"
- version="3.21.0.qualifier"
+ version="3.22.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml
index b20e061..4551736 100755
--- a/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_js_support.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.web_js_support.feature</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>3.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
index 8d3ca8b..18ba44e 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.web_sdk.feature"
label="%featureName"
- version="3.21.0.qualifier"
+ version="3.22.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
index 998481a..40620e5 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.web_sdk.feature</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>3.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
index b43fed9..ed069fb 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.web_tests.feature"
label="%featureName"
- version="3.21.0.qualifier"
+ version="3.22.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
index 63dfaca..9c5668b 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_tests.feature/pom.xml
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.web_tests.feature</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>3.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
index 3f9e4f3..e6227ba 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.web_ui.feature"
label="%featureName"
- version="3.21.0.qualifier"
+ version="3.22.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
index cceabf2..c5ef0a5 100644
--- a/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.web_ui.feature/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.web_ui.feature</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <version>3.22.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/core/tests/org.eclipse.jst.ws.tests/.classpath b/core/tests/org.eclipse.jst.ws.tests/.classpath
index d23fbaa..a4797dc 100644
--- a/core/tests/org.eclipse.jst.ws.tests/.classpath
+++ b/core/tests/org.eclipse.jst.ws.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="tests">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/core/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs b/core/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs
index b6940ab..afb9cda 100644
--- a/core/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/core/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,9 @@
-#Thu May 31 14:27:39 EDT 2007
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -55,4 +54,5 @@
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/core/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
index 568908e..07149d8 100644
--- a/core/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.tests;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-ClassPath: tests.jar
Bundle-Activator: org.eclipse.jst.ws.tests.plugin.TestsPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
@@ -38,4 +38,4 @@
org.eclipse.wst.validation,
org.eclipse.wst.ws.explorer
Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/tests/org.eclipse.jst.ws.tests/pom.xml b/core/tests/org.eclipse.jst.ws.tests/pom.xml
index db63ba3..f42b88b 100644
--- a/core/tests/org.eclipse.jst.ws.tests/pom.xml
+++ b/core/tests/org.eclipse.jst.ws.tests/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.jst.ws.tests</artifactId>
- <version>1.0.400-SNAPSHOT</version>
+ <version>1.0.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/core/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java b/core/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java
index ec2f6aa..b15be77 100644
--- a/core/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java
+++ b/core/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java
@@ -1,15 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2021 IBM Corporation and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
package org.eclipse.jst.ws.tests.unittest;
-import org.eclipse.core.runtime.IPlatformRunnable;
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
/**
* Minimal app to run as Eclipse "application"
*/
-public class LaunchTest implements IPlatformRunnable
+public class LaunchTest implements IApplication
{
- /**
- * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object)
- */
public Object run(Object args) throws Exception
{
@@ -28,6 +38,14 @@
return result;
}
else
- return IPlatformRunnable.EXIT_OK;
+ return IApplication.EXIT_OK;
}
+
+public Object start(IApplicationContext context) throws Exception {
+ // TODO Auto-generated method stub
+ return run(context.getArguments().get(IApplicationContext.APPLICATION_ARGS));
+}
+
+public void stop() {
+}
}
diff --git a/core/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/BuildClasspath.java b/core/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/BuildClasspath.java
index 4acaa6e..faa7e58 100644
--- a/core/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/BuildClasspath.java
+++ b/core/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/BuildClasspath.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2019 IBM Corporation and others.
+ * Copyright (c) 2007, 2021 IBM Corporation and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -15,8 +15,9 @@
import java.util.Enumeration;
import java.util.ResourceBundle;
-import org.eclipse.core.runtime.IPlatformRunnable;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.osgi.util.ManifestElement;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@@ -25,7 +26,7 @@
* This program will generate a classpath that can be used to build the wsexplorer.war file.
*
*/
-public class BuildClasspath implements IPlatformRunnable
+public class BuildClasspath implements IApplication
{
public Object run(Object args) throws Exception
{
@@ -38,7 +39,7 @@
buildClasspath( pluginRequires.getString(key) );
}
- return IPlatformRunnable.EXIT_OK;
+ return IApplication.EXIT_OK;
}
private void buildClasspath( String pluginId ) throws Exception
@@ -83,4 +84,11 @@
}
}
}
+
+ public Object start(IApplicationContext context) throws Exception {
+ return run(context.getArguments().get(IApplicationContext.APPLICATION_ARGS));
+ }
+
+ public void stop() {
+ }
}
