[572025] Dynamic Web Module v5.0 is not supported with Tomcat 10 Change-Id: I51cba9c008904d6191f6005288bd5e66c0809a8e
diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml b/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml index f253e6e..e341caf 100644 --- a/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml +++ b/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml
@@ -14,7 +14,7 @@ <feature id="org.eclipse.jst.server_adapters.ext.feature" label="%featureName" - version="3.4.100.qualifier" + version="3.4.200.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.ext.feature/pom.xml b/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml index 05a31f0..29f7122 100644 --- a/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml +++ b/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server_adapters.ext.feature</artifactId> - <version>3.4.100-SNAPSHOT</version> + <version>3.4.200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/features/org.eclipse.jst.server_core.feature/feature.xml b/features/org.eclipse.jst.server_core.feature/feature.xml index 12bc862..76b1bb4 100644 --- a/features/org.eclipse.jst.server_core.feature/feature.xml +++ b/features/org.eclipse.jst.server_core.feature/feature.xml
@@ -15,7 +15,7 @@ <feature id="org.eclipse.jst.server_core.feature" label="%featureName" - version="3.4.400.qualifier" + version="3.4.500.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.jst.server_core.feature/pom.xml b/features/org.eclipse.jst.server_core.feature/pom.xml index 9618003..7bebaa1 100644 --- a/features/org.eclipse.jst.server_core.feature/pom.xml +++ b/features/org.eclipse.jst.server_core.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server_core.feature</artifactId> - <version>3.4.400-SNAPSHOT</version> + <version>3.4.500-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/features/org.eclipse.jst.server_ui.feature/feature.xml b/features/org.eclipse.jst.server_ui.feature/feature.xml index 4119d23..47474f9 100644 --- a/features/org.eclipse.jst.server_ui.feature/feature.xml +++ b/features/org.eclipse.jst.server_ui.feature/feature.xml
@@ -15,7 +15,7 @@ <feature id="org.eclipse.jst.server_ui.feature" label="%featureName" - version="3.4.400.qualifier" + version="3.4.500.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.jst.server_ui.feature/pom.xml b/features/org.eclipse.jst.server_ui.feature/pom.xml index c79843f..cf6bdaa 100644 --- a/features/org.eclipse.jst.server_ui.feature/pom.xml +++ b/features/org.eclipse.jst.server_ui.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server_ui.feature</artifactId> - <version>3.4.400-SNAPSHOT</version> + <version>3.4.500-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF index 398aa9d..21a4887 100644 --- a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.core; singleton:=true -Bundle-Version: 1.2.600.qualifier +Bundle-Version: 1.2.700.qualifier Bundle-Activator: org.eclipse.jst.server.core.internal.JavaServerPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.core/pom.xml b/plugins/org.eclipse.jst.server.core/pom.xml index caed0f2..eb2cafe 100644 --- a/plugins/org.eclipse.jst.server.core/pom.xml +++ b/plugins/org.eclipse.jst.server.core/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.core</artifactId> - <version>1.2.600-SNAPSHOT</version> + <version>1.2.700-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.properties b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.properties index 22a5e3b..dfe0350 100644 --- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.properties +++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/Messages.properties
@@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2009 IBM Corporation and others. +# Copyright (c) 2004, 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 @@ -12,8 +12,8 @@ ############################################################################### classpathContainerDescription=Server Library -classpathContainer={0} [{1}] -classpathContainerUnbound={0} [{1}] (unbound) +classpathContainer=Server Runtime {0} [{1}] +classpathContainerUnbound=Server Runtime {0} [{1}] (unbound) errorLocation=Invalid location. errorJRE=Invalid JRE.
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF index 5178425..90aac73 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.tomcat.core; singleton:=true -Bundle-Version: 1.1.1300.qualifier +Bundle-Version: 1.1.1400.qualifier Bundle-Activator: org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml index df20b59..2a7471e 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml +++ b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
@@ -158,7 +158,7 @@ class="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntime"> <moduleType types="jst.web" - versions="2.2, 2.3, 2.4, 2.5, 3.0, 3.1, 4.0"/> + versions="2.2, 2.3, 2.4, 2.5, 3.0, 3.1, 4.0, 5.0"/> <moduleType types="jst.utility" versions="1.0"/>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml index d2163ac..e235dc4 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml +++ b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.tomcat.core</artifactId> - <version>1.1.1300-SNAPSHOT</version> + <version>1.1.1400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF index 2ee4af1..b5f85f4 100644 --- a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.ui; singleton:=true -Bundle-Version: 1.1.400.qualifier +Bundle-Version: 1.1.500.qualifier Bundle-Activator: org.eclipse.jst.server.ui.internal.JavaServerUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.ui/pom.xml b/plugins/org.eclipse.jst.server.ui/pom.xml index 048b021..1be7c45 100644 --- a/plugins/org.eclipse.jst.server.ui/pom.xml +++ b/plugins/org.eclipse.jst.server.ui/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.ui</artifactId> - <version>1.1.400-SNAPSHOT</version> + <version>1.1.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/Messages.java b/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/Messages.java index 81a922d..d6074a6 100644 --- a/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/Messages.java +++ b/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/Messages.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2010 IBM Corporation and others. + * Copyright (c) 2005, 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 @@ -30,6 +30,7 @@ public static String classpathContainer; public static String classpathContainerDescription; public static String classpathContainerRuntimeList; + public static String classpathContainerPageDescription; public static String profilerPrefsTitle; public static String profilerPrefsNoneRegistered;
diff --git a/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/Messages.properties b/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/Messages.properties index 860ce54..5d1fa5d 100644 --- a/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/Messages.properties +++ b/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/Messages.properties
@@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2009 IBM Corporation and others. +# Copyright (c) 2004, 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 @@ -23,7 +23,8 @@ classpathContainer=Server Library classpathContainerDescription=Select a server runtime to add to the classpath -classpathContainerRuntimeList=Select a &runtime to add to the classpath: +classpathContainerPageDescription=Select a server runtime for the project build path. +classpathContainerRuntimeList=&Runtime environments: profilerPrefsTitle=Server Profiler selected for profiling: profilerPrefsNoneRegistered=No server profilers registered. \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/ServerClasspathContainerPage.java b/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/ServerClasspathContainerPage.java index 26b809c..763ffd8 100644 --- a/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/ServerClasspathContainerPage.java +++ b/plugins/org.eclipse.jst.server.ui/src/org/eclipse/jst/server/ui/internal/ServerClasspathContainerPage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 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,7 @@ super("server.container"); setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_WIZ_RUNTIME_TYPE)); setTitle(Messages.classpathContainer); - setDescription(Messages.classpathContainerDescription); + setDescription(Messages.classpathContainerPageDescription); setPageComplete(false); IRuntime[] runtimes = ServerCore.getRuntimes();
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF index 3bf1792..61505f3 100644 --- a/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jst.server.tomcat.core.tests Bundle-SymbolicName: org.eclipse.jst.server.tomcat.core.tests -Bundle-Version: 1.1.400.qualifier +Bundle-Version: 1.1.500.qualifier Bundle-ClassPath: tests.jar Bundle-Activator: org.eclipse.jst.server.tomcat.core.tests.TestsPlugin Bundle-Vendor: Eclipse.org
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml b/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml index 50b62c1..cc3727d 100644 --- a/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml +++ b/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server.tomcat.core.tests</artifactId> - <version>1.1.400-SNAPSHOT</version> + <version>1.1.500-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties>
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java index 53efb66..dd95b9f 100644 --- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java +++ b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2020 IBM Corporation and others. + * Copyright (c) 2005, 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 @@ -31,7 +31,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider; import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties; @@ -40,7 +39,6 @@ import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.project.facet.core.internal.FacetCorePlugin; import org.eclipse.wst.project.facet.IProductConstants; import org.eclipse.wst.project.facet.ProductManager; import org.eclipse.wst.server.core.IModule;