[581548] Update Tomcat downloads for 10.1.10 Change-Id: I3ffcdc9176bf1551297faeeb5f1eb0795556866a
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 f61d0a7..2895968 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.600.qualifier" + version="3.4.700.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="0.0.0">
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 0702a0a..d475d01 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.600-SNAPSHOT</version> + <version>3.4.700-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml index bf15fe8..0996a6a 100644 --- a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml +++ b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/feature.xml
@@ -14,7 +14,7 @@ <feature id="org.eclipse.jst.server_adapters.ext.sdk.feature" label="%featureName" - version="3.4.600.qualifier" + version="3.4.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.ext.sdk.feature/pom.xml b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/pom.xml index 97d6a91..cb71467 100644 --- a/features/org.eclipse.jst.server_adapters.ext.sdk.feature/pom.xml +++ b/features/org.eclipse.jst.server_adapters.ext.sdk.feature/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.servertools</groupId> <artifactId>org.eclipse.jst.server_adapters.ext.sdk.feature</artifactId> - <version>3.4.600-SNAPSHOT</version> + <version>3.4.700-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
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 71d8395..756a924 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
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jst.server.tomcat.core Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.server.tomcat.core; singleton:=true -Bundle-Version: 1.2.300.qualifier +Bundle-Version: 1.2.400.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 16c8450..9ed5c9f 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml +++ b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
@@ -871,17 +871,17 @@ <runtime id="org.eclipse.jst.server.tomcat.runtime.101" licenseUrl="https://www.apache.org/licenses/LICENSE-2.0.txt" - archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.tar.gz" - archivePath="apache-tomcat-10.1.8" - archiveSize="12088035" + archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.10/bin/apache-tomcat-10.1.10.tar.gz" + archivePath="apache-tomcat-10.1.10" + archiveSize="12139568" fileCount="636" os="linux,macosx"/> <runtime id="org.eclipse.jst.server.tomcat.runtime.101" licenseUrl="https://www.apache.org/licenses/LICENSE-2.0.txt" - archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.zip" - archivePath="apache-tomcat-10.1.8" - archiveSize="12643379" + archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.10/bin/apache-tomcat-10.1.10.zip" + archivePath="apache-tomcat-10.1.10" + archiveSize="12695268" fileCount="636" os="win32"/> </extension>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml index 875bc8a..0b5383f 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.2.300-SNAPSHOT</version> + <version>1.2.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeClasspathProvider.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeClasspathProvider.java index 45fa7bd..f692dbe 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeClasspathProvider.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntimeClasspathProvider.java
@@ -33,7 +33,7 @@ private static final String JST_WEB_FACET_ID = "jst.web"; private final String getStandardsJavadocLocation(int eeVersion, String jarName) { - String url = "https://jakarta.ee/specifications/servlet/5.0/apidocs/"; + String url = "https://jakarta.ee/specifications/servlet/6.0/apidocs/"; switch (eeVersion) { case 3 : url = "https://docs.oracle.com/javaee/3/api/"; @@ -72,6 +72,7 @@ url = "https://jakarta.ee/specifications/authentication/2.0/apidocs/"; } break; + case 10: default : // Jakarta EE 10 uses a different URL for each component specification url = "https://jakarta.ee/specifications/servlet/6.0/apidocs/"; @@ -99,7 +100,10 @@ /* Default to v10.1 doc. v7.0 is currently the oldest advertised version on the front page */ String tomcatDocURL = "http://tomcat.apache.org/tomcat-10.1-doc/api/"; String runtimeTypeId = runtime.getRuntimeType().getId(); - if (runtimeTypeId.indexOf("100") > 0) { + if (runtimeTypeId.indexOf("101") > 0) { + tomcatDocURL = "http://tomcat.apache.org/tomcat-10.1-doc/api/"; + } + else if (runtimeTypeId.indexOf("100") > 0) { tomcatDocURL = "http://tomcat.apache.org/tomcat-10.0-doc/api/"; } else if (runtimeTypeId.indexOf("90") > 0) {