[572114] Update Java EE Preview to Jetty 10
diff --git a/features/org.eclipse.jst.server_adapters.feature/feature.xml b/features/org.eclipse.jst.server_adapters.feature/feature.xml index 35d094e..13b8785 100644 --- a/features/org.eclipse.jst.server_adapters.feature/feature.xml +++ b/features/org.eclipse.jst.server_adapters.feature/feature.xml
@@ -15,7 +15,7 @@ <feature id="org.eclipse.jst.server_adapters.feature" label="%featureName" - version="3.2.600.qualifier" + version="3.2.700.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.jst.server_adapters.feature/pom.xml b/features/org.eclipse.jst.server_adapters.feature/pom.xml index 0e56c94..12a9f9d 100644 --- a/features/org.eclipse.jst.server_adapters.feature/pom.xml +++ b/features/org.eclipse.jst.server_adapters.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server_adapters.feature</artifactId> - <version>3.2.600-SNAPSHOT</version> + <version>3.2.700-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/features/org.eclipse.wst.server_ui.feature/feature.xml b/features/org.eclipse.wst.server_ui.feature/feature.xml index d2724cb..a02ebcf 100644 --- a/features/org.eclipse.wst.server_ui.feature/feature.xml +++ b/features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -11,11 +11,10 @@ Contributors: IBM Corporation - initial API and implementation --> - <feature id="org.eclipse.wst.server_ui.feature" label="%featureName" - version="3.3.1000.qualifier" + version="3.3.1100.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.server_ui.feature/pom.xml b/features/org.eclipse.wst.server_ui.feature/pom.xml index 19ad5f6..dc75da2 100644 --- a/features/org.eclipse.wst.server_ui.feature/pom.xml +++ b/features/org.eclipse.wst.server_ui.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.wst.server_ui.feature</artifactId> - <version>3.3.1000-SNAPSHOT</version> + <version>3.3.1100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF index e2b7d6f..5f28052 100644 --- a/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.preview.adapter;singleton:=true -Bundle-Version: 1.1.600.qualifier +Bundle-Version: 1.1.700.qualifier Bundle-Activator: org.eclipse.jst.server.preview.adapter.internal.PreviewPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/pom.xml b/plugins/org.eclipse.jst.server.preview.adapter/pom.xml index 46a87e0..00204bb 100644 --- a/plugins/org.eclipse.jst.server.preview.adapter/pom.xml +++ b/plugins/org.eclipse.jst.server.preview.adapter/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.preview.adapter</artifactId> - <version>1.1.600-SNAPSHOT</version> + <version>1.1.700-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java index b6b04b2..9325985 100644 --- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java +++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2018 IBM Corporation and others. + * Copyright (c) 2007, 2021 IBM Corporation and others. * All rights reserved. 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 @@ -52,7 +52,6 @@ getBundleForClass(javax.el.ELContext.class), getBundleForClass(com.sun.el.ExpressionFactoryImpl.class), "org.apache.commons.logging", - "org.eclipse.jetty.continuation", "org.eclipse.jetty.http", "org.eclipse.jetty.io", "org.eclipse.jetty.security", @@ -164,4 +163,4 @@ // ignore - process failed } } -} \ No newline at end of file +}