[579611] Update to Apache Tomcat 9.0.60/10.0.18
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/AddTomcat.md b/plugins/org.eclipse.jst.server.tomcat.core/AddTomcat.md index 0e8235b..8d77cc8 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/AddTomcat.md +++ b/plugins/org.eclipse.jst.server.tomcat.core/AddTomcat.md
@@ -42,4 +42,6 @@ ### Determining values for installable runtimes: 1. For ostype win32: filecount = unzip -l apache-tomcat-10.0.13.zip|grep -v '\/$'|grep 'apache-tomcat-'|grep -v ^Archive|wc -l + for A in apache-tomcat*zip ; do echo $A ; unzip -l $A|grep -v '\/$'|grep 'apache-tomcat-'|grep -v ^Archive|wc -l ; done 1. For other ostypes: filecount = tar tvzf apache-tomcat-10.0.13.tar.gz|grep -v '\/$'|wc -l + for A in apache-tomcat*.tar.gz ; do echo $A ; tar tvzf $A|grep -v '\/$'|wc -l;done
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 4520927..061f5de 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.1800.qualifier +Bundle-Version: 1.1.1900.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 565c641..cd2adea 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml +++ b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
@@ -763,52 +763,52 @@ <runtime id="org.eclipse.jst.server.tomcat.runtime.85" licenseUrl="https://www.apache.org/licenses/LICENSE-2.0.txt" - archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73.tar.gz" - archivePath="apache-tomcat-8.5.73" - archiveSize="10581990" + archiveUrl="https://dlcdn.apache.org/tomcat/tomcat-8/v8.5.77/bin/apache-tomcat-8.5.77.tar.gz" + archivePath="apache-tomcat-8.5.77" + archiveSize="10559655" fileCount="625" os="linux,macosx"/> <runtime id="org.eclipse.jst.server.tomcat.runtime.85" licenseUrl="https://www.apache.org/licenses/LICENSE-2.0.txt" - archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.73/bin/apache-tomcat-8.5.73-windows-x86.zip" - archivePath="apache-tomcat-8.5.73" - archiveSize="11625330" - fileCount="627" + archiveUrl="https://dlcdn.apache.org/tomcat/tomcat-8/v8.5.77/bin/apache-tomcat-8.5.77.zip" + archivePath="apache-tomcat-8.5.77" + archiveSize="11073862" + fileCount="619" os="win32"/> <runtime id="org.eclipse.jst.server.tomcat.runtime.90" licenseUrl="https://www.apache.org/licenses/LICENSE-2.0.txt" - archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.tar.gz" - archivePath="apache-tomcat-9.0.55" - archiveSize="11579748" - fileCount="639" + archiveUrl="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.60/bin/apache-tomcat-9.0.60.tar.gz" + archivePath="apache-tomcat-9.0.60" + archiveSize="11543791" + fileCount="633" os="linux,macosx"/> <runtime id="org.eclipse.jst.server.tomcat.runtime.90" licenseUrl="https://www.apache.org/licenses/LICENSE-2.0.txt" - archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.55/bin/apache-tomcat-9.0.55.zip" - archivePath="apache-tomcat-9.0.55" - archiveSize="12123853" - fileCount="639" + archiveUrl="https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.60/bin/apache-tomcat-9.0.60.zip" + archivePath="apache-tomcat-9.0.60" + archiveSize="12083665" + fileCount="633" os="win32"/> <runtime id="org.eclipse.jst.server.tomcat.runtime.100" licenseUrl="https://www.apache.org/licenses/LICENSE-2.0.txt" - archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-10/v10.0.13/bin/apache-tomcat-10.0.13.tar.gz" - archivePath="apache-tomcat-10.0.13" - archiveSize="11927066" - fileCount="642" + archiveUrl="https://dlcdn.apache.org/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18.tar.gz" + archivePath="apache-tomcat-10.0.18" + archiveSize="11898821" + fileCount="636" os="linux,macosx"/> <runtime id="org.eclipse.jst.server.tomcat.runtime.100" licenseUrl="https://www.apache.org/licenses/LICENSE-2.0.txt" - archiveUrl="https://archive.apache.org/dist/tomcat/tomcat-10/v10.0.13/bin/apache-tomcat-10.0.13.zip" - archivePath="apache-tomcat-10.0.13" - archiveSize="12471922" - fileCount="642" + archiveUrl="https://dlcdn.apache.org/tomcat/tomcat-10/v10.0.18/bin/apache-tomcat-10.0.18.zip" + archivePath="apache-tomcat-10.0.18" + archiveSize="12441230" + fileCount="636" os="win32"/> </extension> </plugin>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml index ccc5710..6ce34e8 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.1800-SNAPSHOT</version> + <version>1.1.1900-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>