* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2021-05-02 17:57 Miroslav Šulc
0 siblings, 0 replies; 14+ messages in thread
From: Miroslav Šulc @ 2021-05-02 17:57 UTC (permalink / raw
To: gentoo-commits
commit: 2ea3f543b161af65a143053bd2cf4c0e940c9df9
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun May 2 12:02:08 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May 2 17:57:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea3f543
www-servers/tomcat: remove unused patch
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20649
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../tomcat/files/tomcat-10.0.2-build.xml.patch | 284 ---------------------
1 file changed, 284 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch
deleted file mode 100644
index 0ed24682291..00000000000
--- a/www-servers/tomcat/files/tomcat-10.0.2-build.xml.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 455edf9..457c0a9 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1032,6 +1032,7 @@
- addOSGi="true" />
-
- <!-- Servlet Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -1039,21 +1040,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- JSP Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -1166,10 +1169,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1397,9 +1400,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1459,7 +1462,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1502,7 +1505,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1517,7 +1520,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1620,9 +1623,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -2196,11 +2201,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2231,6 +2237,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="jakarta.servlet.*"
- excludepackagenames="jakarta.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2295,6 +2302,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="jakarta.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2357,13 +2365,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${osgi-annotations.jar}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!--
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3083,7 +3095,7 @@ skip.installer property in build.properties" />
-
- <target name="download-compile"
- description="Download components necessary to compile"
-- depends="setup-bnd">
-+ depends="setup-bnd" unless="noget">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -3127,7 +3139,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -3205,7 +3217,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3260,13 +3272,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3388,7 +3400,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3405,7 +3417,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3430,7 +3442,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3446,7 +3458,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3485,7 +3497,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3513,7 +3525,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3524,7 +3536,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3535,7 +3547,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3553,7 +3565,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
-
- <target name="ide-intellij"
- depends="download-compile, download-test-compile"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2024-06-27 15:40 Conrad Kostecki
0 siblings, 0 replies; 14+ messages in thread
From: Conrad Kostecki @ 2024-06-27 15:40 UTC (permalink / raw
To: gentoo-commits
commit: eda75238c5a532fec0c8dd33c90e47392acf27af
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jun 24 17:22:28 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 15:40:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda75238
www-servers/tomcat: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/37279
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../tomcat/files/tomcat-10.1.6-build.xml.patch | 120 ---------------------
1 file changed, 120 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
deleted file mode 100644
index 41cf58bc908c..000000000000
--- a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -1457,9 +1457,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!-- not needed for us
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1519,8 +1519,9 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!-- we provide jdt jar externally
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
- <local name="migration.jar.filename" />
- <basename property="migration.jar.filename" file="${migration-lib.jar}"/>
-@@ -1530,8 +1531,9 @@
- <exclude name="${migration-lib.jar.filename}"/>
- </fileset>
- </delete>
-+<!-- we provide migration tool externally
- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
--
-+-->
- <!-- Delete all other versions of OpenSSL support for Tomcat and copy the current one -->
- <!-- After module release
- <local name="openssl-lib.jar.filename" />
-@@ -2213,11 +2215,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!-- we provide tomcat native as another package and we don't need commons-daemon
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2378,8 +2381,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <link href="../elapi"/>
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!-- net is not accessed from emerge
- <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
- <link href="https://jakarta.ee/specifications/platform/10/apidocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3300,6 +3305,7 @@ asf.ldap.username=${release.asfusername}
- depends="setup-bnd">
-
- <!-- Download Commons Daemon -->
-+<!-- not needed
- <antcall target="downloadgz-2">
- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-@@ -3308,8 +3314,9 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
- <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
- </antcall>
--
-+-->
- <!-- Download JDT (Eclipse compiler) -->
-+<!-- we provide JDT
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${jdt.loc.1}"/>
- <param name="sourcefile.2" value="${jdt.loc.2}"/>
-@@ -3319,8 +3326,9 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
- <param name="checksum.value" value="${jdt.checksum.value}"/>
- </antcall>
--
-+-->
- <!-- Download WS API -->
-+<!-- we provide jaxrpc
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
- <param name="destfile" value="${jaxrpc-lib.jar}"/>
-@@ -3329,6 +3337,8 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
- </antcall>
-+-->
-+<!-- we provide wsdl4j
- <antcall target="downloadfile">
- <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
- <param name="destfile" value="${wsdl4j-lib.jar}"/>
-@@ -3337,8 +3347,9 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
- </antcall>
--
-+-->
- <!-- Tomcat Migration Tool for Jakarta EE -->
-+<!-- we provide migration tool
- <antcall target="downloadfile">
- <param name="sourcefile" value="${migration-lib.loc}"/>
- <param name="destfile" value="${migration-lib.jar}"/>
-@@ -3347,7 +3358,7 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${migration-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${migration-lib.checksum.value}"/>
- </antcall>
--
-+-->
- </target>
-
- <target name="download-test-compile"
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2024-05-26 21:31 Conrad Kostecki
0 siblings, 0 replies; 14+ messages in thread
From: Conrad Kostecki @ 2024-05-26 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 77f6f2a756d8271d8ebf4344fd12d36b1f6e575b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun May 26 09:00:58 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun May 26 21:29:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f6f2a7
www-servers/tomcat: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/36820
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../tomcat/files/tomcat-8.5.86-build.xml.patch | 111 ---------------------
.../tomcat/files/tomcat-8.5.95-min.java.patch | 37 -------
2 files changed, 148 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
deleted file mode 100644
index 85ad9ab64682..000000000000
--- a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -1148,9 +1148,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!-- not needed for us
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1210,7 +1210,9 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!-- we provide jdt jar externally
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+-->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1719,7 +1721,7 @@
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
- description="Prepare to build web services extras package">
--
-+<!-- we provide jaxrpc
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
- <param name="destfile" value="${jaxrpc-lib.jar}"/>
-@@ -1728,7 +1730,8 @@
- <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
- </antcall>
--
-+-->
-+<!-- we provide wsdl4j
- <antcall target="downloadfile">
- <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
- <param name="destfile" value="${wsdl4j-lib.jar}"/>
-@@ -1737,11 +1740,13 @@
- <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
- </antcall>
--
-+-->
-+<!-- ignored above
- <copy file="${jaxrpc-lib.jar}"
- tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
- <copy file="${wsdl4j-lib.jar}"
- tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
-+-->
- </target>
-
- <target name="extras-webservices"
-@@ -1850,11 +1855,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!-- we provide tomcat native as another package and we don't need commons-daemon
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2020,8 +2026,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <link href="../elapi"/>
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!-- net is not accessed from emerge
- <link href="https://docs.oracle.com/javase/7/docs/api/"/>
- <link href="https://docs.oracle.com/javaee/7/api/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -2933,6 +2941,7 @@ asf.ldap.username=${release.asfusername}
- description="Download components necessary to compile" >
-
- <!-- Download Commons Daemon -->
-+<!-- not needed
- <antcall target="downloadgz-2">
- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-@@ -2941,8 +2950,9 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
- <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
- </antcall>
--
-+-->
- <!-- Download JDT (Eclipse compiler) -->
-+<!-- we provide JDT
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${jdt.loc.1}"/>
- <param name="sourcefile.2" value="${jdt.loc.2}"/>
-@@ -2952,7 +2962,7 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
- <param name="checksum.value" value="${jdt.checksum.value}"/>
- </antcall>
--
-+-->
- </target>
-
- <target name="download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch b/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
deleted file mode 100644
index 9198ff3a1911..000000000000
--- a/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 723be26..3cf7bb7 100644
---- a/build.xml
-+++ b/build.xml
-@@ -112,8 +112,8 @@
-
- <!-- Java EE 7 platform requires Java 7+ -->
- <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
-- <property name="compile.release" value="7"/>
-- <property name="min.java.version" value="7"/>
-+ <property name="compile.release" value="8"/>
-+ <property name="min.java.version" value="8"/>
- <property name="build.java.version" value="11"/>
-
- <!-- Locations to create the JAR artifacts -->
---- a/webapps/docs/tomcat-docs.xsl
-+++ b/webapps/docs/tomcat-docs.xsl
-@@ -39,7 +39,7 @@
- <xsl:param name="version" select="'8.5.x'"/>
- <xsl:param name="majorversion" select="'8'"/>
- <xsl:param name="majorminorversion" select="'8.5'"/>
-- <xsl:param name="minjavaversion" select="'7'"/>
-+ <xsl:param name="minjavaversion" select="'8'"/>
- <xsl:param name="buildjavaversion" select="'11'"/>
- <xsl:param name="antversionrequired" select="'1.9.10'"/>
- <xsl:param name="build-date" select="'MMM d yyyy'"/>
---- a/modules/jdbc-pool/build.properties.default
-+++ b/modules/jdbc-pool/build.properties.default
-@@ -40,7 +40,7 @@ version.suffix=
- # contexts by the various build scripts.
- base.path=${basedir}/includes
-
--compile.release=7
-+compile.release=8
- compile.debug=true
-
- # Do not pass -deprecation (-Xlint:deprecation) flag to javac
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2024-05-09 10:57 Florian Schmaus
0 siblings, 0 replies; 14+ messages in thread
From: Florian Schmaus @ 2024-05-09 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 6fa39ad24289b738fc426772b610ddb359cb9631
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed May 8 18:12:35 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu May 9 10:57:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa39ad2
www-servers/tomcat: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../files/tomcat-9.0.50-insufficient-ecj.patch | 38 ---------
.../tomcat/files/tomcat-9.0.72-build.xml.patch | 97 ----------------------
2 files changed, 135 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
deleted file mode 100644
index d8f933c417b1..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -306,11 +306,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
- } else if(opt.equals("13")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_13);
- } else if(opt.equals("14")) {
-- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14);
-+ settings.put(CompilerOptions.OPTION_Source, "14");
- } else if(opt.equals("15")) {
-- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
-+ settings.put(CompilerOptions.OPTION_Source, "15");
- } else if(opt.equals("16")) {
-- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
-+ settings.put(CompilerOptions.OPTION_Source, "16");
- } else if(opt.equals("17")) {
- // Constant not available in latest ECJ version shipped with
- // Tomcat. May be supported in a snapshot build.
-@@ -366,14 +366,14 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_13);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_13);
- } else if(opt.equals("14")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14);
-- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
-+ settings.put(CompilerOptions.OPTION_Compliance, "14");
- } else if(opt.equals("15")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
-- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
-+ settings.put(CompilerOptions.OPTION_Compliance, "15");
- } else if(opt.equals("16")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
-- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
-+ settings.put(CompilerOptions.OPTION_Compliance, "16");
- } else if(opt.equals("17")) {
- // Constant not available in latest ECJ version shipped with
- // Tomcat. May be supported in a snapshot build.
diff --git a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
deleted file mode 100644
index bdf2efccbdbd..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -1436,9 +1436,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!-- not needed for us
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1498,7 +1498,9 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!-- we provide jdt jar externally
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+-->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -2154,11 +2156,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!-- we provide tomcat native as another package and we don't need commons-daemon
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2319,8 +2322,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <link href="../elapi"/>
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!-- net is not accessed from emerge
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3234,6 +3239,7 @@ asf.ldap.username=${release.asfusername}
- depends="setup-bnd">
-
- <!-- Download Commons Daemon -->
-+<!-- not needed
- <antcall target="downloadgz-2">
- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-@@ -3242,8 +3248,9 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
- <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
- </antcall>
--
-+-->
- <!-- Download JDT (Eclipse compiler) -->
-+<!-- we provide JDT
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${jdt.loc.1}"/>
- <param name="sourcefile.2" value="${jdt.loc.2}"/>
-@@ -3253,8 +3260,9 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
- <param name="checksum.value" value="${jdt.checksum.value}"/>
- </antcall>
--
-+-->
- <!-- Download WS API -->
-+<!-- we provide jaxrpc
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
- <param name="destfile" value="${jaxrpc-lib.jar}"/>
-@@ -3263,6 +3271,8 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
- </antcall>
-+-->
-+<!-- we provide wsdl4j
- <antcall target="downloadfile">
- <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
- <param name="destfile" value="${wsdl4j-lib.jar}"/>
-@@ -3271,7 +3281,7 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
- </antcall>
--
-+-->
- </target>
-
- <target name="download-test-compile"
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2023-03-23 5:48 Miroslav Šulc
0 siblings, 0 replies; 14+ messages in thread
From: Miroslav Šulc @ 2023-03-23 5:48 UTC (permalink / raw
To: gentoo-commits
commit: 2e0e7ae49b61ad7766730940d9672513e2332d01
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 05:48:06 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 05:48:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e0e7ae4
www-servers/tomcat/files: scrubbed patches
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch | 2 --
www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch | 2 --
www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch | 2 --
www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch | 2 --
www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch | 2 --
5 files changed, 10 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
index 341813c73123..41cf58bc908c 100644
--- a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index bea41a8..08ef1db 100644
--- a/build.xml
+++ b/build.xml
@@ -1457,9 +1457,9 @@
diff --git a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
index 8888e3589ce3..85ad9ab64682 100644
--- a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index d407be0..7c69a1b 100644
--- a/build.xml
+++ b/build.xml
@@ -1148,9 +1148,9 @@
diff --git a/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch
index 7aa1e883f133..e324b7602ec8 100644
--- a/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.37-fix-build-rewrite.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index 9ba357b..352e141 100644
--- a/build.xml
+++ b/build.xml
@@ -2716,7 +2716,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
diff --git a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
index 13e82c9c6517..d8f933c417b1 100644
--- a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch
@@ -1,5 +1,3 @@
-diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
-index 10d80e0..34ff7e0 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -306,11 +306,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
diff --git a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
index 985d5d4f94fb..bdf2efccbdbd 100644
--- a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index b420c2a..abecfde 100644
--- a/build.xml
+++ b/build.xml
@@ -1436,9 +1436,9 @@
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2022-10-30 9:28 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-10-30 9:28 UTC (permalink / raw
To: gentoo-commits
commit: dbfb5c45e92dd153733fffe84334dd3120c82142
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Oct 30 08:01:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:27:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbfb5c45
www-servers/tomcat: remove unused file
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28038
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../tomcat/files/tomcat-10.0.20-build.xml.patch | 347 ---------------------
1 file changed, 347 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch
deleted file mode 100644
index 7332c570160a..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.20-build.xml.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 72e49ad..8ff8ecc 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1030,6 +1030,7 @@
- addOSGi="true" />
-
- <!-- Servlet Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -1037,21 +1038,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- JSP Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -1164,10 +1167,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1404,9 +1407,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1466,7 +1469,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
- <local name="migration.jar.filename" />
-@@ -1477,7 +1480,7 @@
- <exclude name="${migration-lib.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1506,7 +1509,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1522,7 +1525,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1625,9 +1628,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -2131,11 +2136,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2159,13 +2165,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="jakarta.servlet.*"
- excludepackagenames="jakarta.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2181,8 +2187,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2202,8 +2207,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2223,13 +2227,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="jakarta.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2244,8 +2248,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2264,8 +2267,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp -html5"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2284,20 +2286,23 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
- failonwarning="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!--
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3134,7 +3139,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -3262,7 +3267,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3317,13 +3322,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3445,7 +3450,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3462,7 +3467,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3487,7 +3492,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3503,7 +3508,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3527,7 +3532,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3542,7 +3547,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3570,7 +3575,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3581,7 +3586,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3592,7 +3597,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3610,7 +3615,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
-
- <target name="ide-intellij"
- depends="download-compile, download-test-compile"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2022-06-03 5:38 Miroslav Šulc
0 siblings, 0 replies; 14+ messages in thread
From: Miroslav Šulc @ 2022-06-03 5:38 UTC (permalink / raw
To: gentoo-commits
commit: e146ea34e5dce5b1634be3336368c02818b7aa2b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jun 2 08:18:03 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 05:38:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e146ea34
www-servers/tomcat: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25727
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../tomcat/files/tomcat-10.0.16-build.xml.patch | 349 ---------------------
.../tomcat/files/tomcat-9.0.58-build.xml.patch | 321 -------------------
2 files changed, 670 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-10.0.16-build.xml.patch b/www-servers/tomcat/files/tomcat-10.0.16-build.xml.patch
deleted file mode 100644
index 38b3a335eca6..000000000000
--- a/www-servers/tomcat/files/tomcat-10.0.16-build.xml.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 33a4fde..6b2b5d5 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1012,6 +1012,7 @@
- addOSGi="true" />
-
- <!-- Servlet Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -1019,21 +1020,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- JSP Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -1146,10 +1149,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1386,9 +1389,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1448,7 +1451,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
- <local name="migration.jar.filename" />
-@@ -1459,7 +1462,7 @@
- <exclude name="${migration-lib.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1498,7 +1501,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1514,7 +1517,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1617,9 +1620,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -2117,11 +2122,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2145,13 +2151,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="jakarta.servlet.*"
- excludepackagenames="jakarta.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2167,8 +2173,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2188,8 +2193,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2209,13 +2213,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="jakarta.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2230,8 +2234,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2250,8 +2253,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2270,21 +2272,24 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp -html5"
- source="${compile.release}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- <path location="${osgi-annotations.jar}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!--
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3103,7 +3108,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -3222,7 +3227,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3277,13 +3282,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3405,7 +3410,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3422,7 +3427,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3447,7 +3452,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3463,7 +3468,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3487,7 +3492,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3502,7 +3507,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3530,7 +3535,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3541,7 +3546,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3552,7 +3557,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3570,7 +3575,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
-
- <target name="ide-intellij"
- depends="download-compile, download-test-compile"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.58-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.58-build.xml.patch
deleted file mode 100644
index 51f97e72e0b2..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.58-build.xml.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff --git a/build.xml b/build.xml
-index a51cbfb..43596ac 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1036,6 +1036,7 @@
- addOSGi="true" />
-
- <!-- Servlet Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -1043,21 +1044,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- JSP Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -1170,10 +1173,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1410,9 +1413,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1472,7 +1475,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1515,7 +1518,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1531,7 +1534,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1634,9 +1637,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -2139,11 +2144,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2167,13 +2173,13 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
- source="${compile.source}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2238,6 +2244,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2252,8 +2259,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
- source="${compile.source}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2272,8 +2278,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
-@@ -2292,21 +2297,24 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
- source="${compile.source}"
- maxmemory="512m"
-- failonerror="true"
-- failonwarning="true">
-+ failonerror="true">
- <classpath>
- <path refid="compile.classpath"/>
- <path location="${ant.core.lib}"/>
- <path location="${osgi-annotations.jar}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!--
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -3071,7 +3079,7 @@ skip.installer property in build.properties" />
-
- <target name="download-compile"
- description="Download components necessary to compile"
-- depends="setup-bnd">
-+ depends="setup-bnd" unless="noget">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -3115,7 +3123,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -3234,7 +3242,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -3289,13 +3297,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3417,7 +3425,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3434,7 +3442,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3459,7 +3467,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3475,7 +3483,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3499,7 +3507,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3514,7 +3522,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3542,7 +3550,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3553,7 +3561,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3564,7 +3572,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3582,7 +3590,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
-
- <target name="ide-intellij"
- depends="download-compile, download-test-compile"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2021-04-09 6:17 Miroslav Šulc
0 siblings, 0 replies; 14+ messages in thread
From: Miroslav Šulc @ 2021-04-09 6:17 UTC (permalink / raw
To: gentoo-commits
commit: cbe74101070dc78e36a9351057c278df097418e6
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 8 16:33:59 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 9 06:17:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe74101
www-servers/tomcat: remove unused patch
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20306
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/tomcat-9.0.40-insufficient-ecj.patch | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch
deleted file mode 100644
index dd002e2ca21..00000000000
--- a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
-index 4722a4a..27ce287 100644
---- a/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -307,7 +307,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
- } else if(opt.equals("13")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_13);
- } else if(opt.equals("14")) {
-- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14);
-+ settings.put(CompilerOptions.OPTION_Source, "14");
- } else if(opt.equals("15")) {
- // Constant not available in latest ECJ version shipped with
- // Tomcat. May be supported in a snapshot build.
-@@ -368,8 +368,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_13);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_13);
- } else if(opt.equals("14")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14);
-- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14);
-+ settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
-+ settings.put(CompilerOptions.OPTION_Compliance, "14");
- } else if(opt.equals("15")) {
- // Constant not available in latest ECJ version shipped with
- // Tomcat. May be supported in a snapshot build.
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2021-02-27 15:38 Conrad Kostecki
0 siblings, 0 replies; 14+ messages in thread
From: Conrad Kostecki @ 2021-02-27 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 5b190076392db59b4c908decbd40065a392604b3
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 27 15:28:44 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 15:37:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b190076
www-servers/tomcat: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/19687
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../tomcat/files/tomcat-9.0.37-build.xml.patch | 284 ---------------------
1 file changed, 284 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch
deleted file mode 100644
index ea902b4b922..00000000000
--- a/www-servers/tomcat/files/tomcat-9.0.37-build.xml.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 8e02cb5..9007e8b 100644
---- a/build.xml
-+++ b/build.xml
-@@ -760,6 +760,7 @@
- addOSGi="true" />
-
- <!-- Servlet 4.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
-@@ -767,21 +768,23 @@
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license"
- addOSGi="true" />
--
-+-->
- <!-- EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- JSP Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- addOSGi="true" />
--
-+-->
- <!-- WebSocket API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
- filesDir="${tomcat.classes}"
-@@ -894,10 +897,10 @@
- addOSGi="true" />
-
- <!-- Re-packaged Apache Commons DBCP 2-->
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.tomcat-dbcp"
-- addOSGi="true" />
-+ addOSGi="true" /> -->
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1139,9 +1142,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1201,7 +1204,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1244,7 +1247,7 @@
-
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1259,7 +1262,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1362,9 +1365,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1863,11 +1868,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1962,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2023,13 +2031,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- <link href="../annotationapi"/>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!--
- <link href="https://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -2756,7 +2768,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-compile"
-- description="Download components necessary to compile" >
-+ description="Download components necessary to compile" unless="noget" >
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2889,7 +2901,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2944,13 +2956,13 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-@@ -3072,7 +3084,7 @@ skip.installer property in build.properties" />
- </sequential>
- </macrodef>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3089,7 +3101,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3114,7 +3126,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3130,7 +3142,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3154,7 +3166,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3169,7 +3181,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3197,7 +3209,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3208,7 +3220,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3219,7 +3231,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
-@@ -3237,7 +3249,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
-
- <target name="ide-intellij"
- depends="download-compile, download-test-compile"
-- description="Creates project directory .idea for IntelliJ IDEA">
-+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
-
- <copy todir="${tomcat.home}/.idea">
- <fileset dir="${tomcat.home}/res/ide-support/idea"/>
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2019-03-11 4:48 Aaron Bauman
0 siblings, 0 replies; 14+ messages in thread
From: Aaron Bauman @ 2019-03-11 4:48 UTC (permalink / raw
To: gentoo-commits
commit: 4b515b99de1aaeb28010266127b80664e242262f
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar 5 16:54:11 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 04:46:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b515b99
www-servers/tomcat: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11270
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../tomcat/files/tomcat-8.0.49-build.xml.patch | 265 ---------------------
.../tomcat/files/tomcat-8.5.27-build.xml.patch | 256 --------------------
2 files changed, 521 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
deleted file mode 100644
index ab6590d5c12..00000000000
--- a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -718,24 +718,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
- <!-- JSP 2.3 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- WebSocket 1.1 API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1005,9 +1010,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1067,7 +1072,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1101,7 +1106,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1116,7 +1121,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1220,9 +1225,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1615,7 +1622,7 @@
-
- <target name="extras-commons-logging-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-@@ -1754,7 +1761,7 @@
-
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1941,11 +1948,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1955,6 +1963,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -2016,6 +2025,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2054,9 +2064,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2791,7 +2803,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile" unless="noget">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2868,7 +2880,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2908,18 +2920,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2931,7 +2943,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2950,7 +2962,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2961,7 +2973,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2979,7 +2991,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2989,7 +3001,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -3012,7 +3024,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -3023,7 +3035,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -3034,7 +3046,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
deleted file mode 100644
index c8022bcd5e4..00000000000
--- a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch
+++ /dev/null
@@ -1,256 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -717,24 +717,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
- <!-- JSP 2.3 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- WebSocket 1.1 API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -1010,9 +1015,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1072,7 +1077,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1106,7 +1111,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1121,7 +1126,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1225,9 +1230,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
-
- <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1610,7 +1617,7 @@
-
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1750,11 +1757,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!--
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1764,6 +1772,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1828,6 +1837,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1868,9 +1878,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2617,7 +2629,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile" unless="noget">
-
- <!-- Download Commons Daemon -->
- <antcall target="downloadgz-2">
-@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2694,7 +2706,7 @@ skip.installer property in build.properties" />
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" />
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2776,7 +2788,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2787,7 +2799,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2805,7 +2817,7 @@ skip.installer property in build.properties" />
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2815,7 +2827,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2838,7 +2850,7 @@ skip.installer property in build.properties" />
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2849,7 +2861,7 @@ skip.installer property in build.properties" />
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2860,7 +2872,7 @@ skip.installer property in build.properties" />
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2016-05-18 6:50 Austin English
0 siblings, 0 replies; 14+ messages in thread
From: Austin English @ 2016-05-18 6:50 UTC (permalink / raw
To: gentoo-commits
commit: a650374dd6fc0424109ff5db28779f825e0db641
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 06:44:48 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May 18 06:44:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a650374d
www-servers/tomcat: use #!/sbin/openrc-run instead of #!/sbin/runscript
www-servers/tomcat/files/tomcat-r1.init | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-r1.init b/www-servers/tomcat/files/tomcat-r1.init
index 531baa1..13c3e54 100644
--- a/www-servers/tomcat/files/tomcat-r1.init
+++ b/www-servers/tomcat/files/tomcat-r1.init
@@ -1,5 +1,5 @@
-#!/@GENTOO_PORTAGE_EPREFIX@sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
+#!/@GENTOO_PORTAGE_EPREFIX@sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
extra_commands="forcestop"
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2016-01-18 15:22 Miroslav Šulc
0 siblings, 0 replies; 14+ messages in thread
From: Miroslav Šulc @ 2016-01-18 15:22 UTC (permalink / raw
To: gentoo-commits
commit: d945b4b0f1deecf4516a4e4ede040859b1b0daf9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 15:22:24 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 15:22:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d945b4b0
www-servers/tomcat: removed obsolete file
Package-Manager: portage-2.2.26
.../tomcat/files/tomcat-8.0.26-build.xml.patch | 265 ---------------------
1 file changed, 265 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch
deleted file mode 100644
index 1923d23..0000000
--- a/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
---- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
-@@ -697,24 +697,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
- <!-- JSP 2.3 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- WebSocket 1.1 API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -982,14 +987,14 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
-
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1049,7 +1054,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1083,7 +1088,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1098,7 +1103,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1202,10 +1207,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
--
-+-->
- <!-- Note the meta-inf below will work as long as there is only one JAR
- that needs to add entries. If there is more than one a more complex
- solution will be required. -->
-@@ -1542,7 +1548,7 @@
-
- <target name="extras-commons-logging-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-@@ -1681,7 +1687,7 @@
-
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1882,6 +1888,7 @@
-
- <target name="javadoc" depends="dist-source,extras-webservices-prepare"
- description="Create the Tomcat javadoc" >
-+<!--
- <javadoc packagenames="javax.servlet.*"
- excludepackagenames="javax.servlet.jsp.*"
- sourcepath="${tomcat.dist}/src/java"
-@@ -1940,6 +1947,7 @@
- <path location="${ant.core.lib}"/>
- </classpath>
- </javadoc>
-+-->
- <javadoc packagenames="javax.websocket.*"
- sourcepath="${tomcat.dist}/src/java"
- destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1970,15 +1978,17 @@
- docencoding="UTF-8"
- charset="UTF-8"
- additionalparam="-breakiterator -notimestamp"
-- maxmemory="256m" >
-+ maxmemory="512m" >
- <classpath>
- <path refid="compile.classpath"/>
- <path refid="tomcat.webservices.classpath"/>
- <path location="${ant.core.lib}"/>
- </classpath>
-+<!--
- <link href="../servletapi"/>
- <link href="../jspapi"/>
- <link href="../elapi"/>
-+-->
- <link href="../websocketapi"/>
- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2739,7 +2749,7 @@
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2773,7 +2783,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2829,7 @@
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadzip-2">
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2845,18 +2855,18 @@
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2868,7 +2878,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2887,7 +2897,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2898,7 +2908,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2916,7 +2926,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2926,7 +2936,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2949,7 +2959,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2960,7 +2970,7 @@
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2971,7 +2981,7 @@
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2015-08-22 20:31 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2015-08-22 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 84e0bd2ce26ad5948983b359bfbcebf4e34a79e2
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 20:31:08 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 20:31:08 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e0bd2c
www-servers/tomcat: Fix javadoc generation, closes bug #558408
Package-Manager: portage-2.2.20.1
.../tomcat/files/tomcat-7.0.63-build.xml.patch | 36 +++++++++++--
.../tomcat/files/tomcat-8.0.24-build.xml.patch | 61 +++++++++++++++++-----
2 files changed, 80 insertions(+), 17 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
index 23181e7..481591f 100644
--- a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
@@ -1,6 +1,6 @@
diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-16 14:17:34.594426081 +0100
++++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
@@ -660,12 +660,14 @@
</fileset>
</copy>
@@ -92,7 +92,35 @@ diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/buil
<antcall target="downloadfile">
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2642,7 +2653,7 @@
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ <fail unless="java.7.home"
+ message="The java.7.home property must be set for javadoc build"/>
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+ <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
</target>
<target name="download-compile"
@@ -101,7 +129,7 @@ diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/buil
<antcall target="downloadfile-2">
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2699,7 +2710,7 @@
+@@ -2699,7 +2714,7 @@
</target>
<target name="download-test-compile"
@@ -110,7 +138,7 @@ diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/buil
<antcall target="downloadfile">
<param name="sourcefile" value="${junit.loc}"/>
-@@ -2727,7 +2738,7 @@
+@@ -2727,7 +2742,7 @@
</target>
<target name="download-dist"
diff --git a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch
index 9854c9d..1923d23 100644
--- a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch
@@ -1,6 +1,6 @@
diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-14 13:45:50.315788075 +0100
++++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
@@ -697,24 +697,29 @@
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
@@ -107,7 +107,42 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<antcall target="downloadfile">
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2739,7 +2745,7 @@
+@@ -1882,6 +1888,7 @@
+
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+ description="Create the Tomcat javadoc" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1940,6 +1947,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1970,15 +1978,17 @@
+ docencoding="UTF-8"
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp"
+- maxmemory="256m" >
++ maxmemory="512m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+ <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2739,7 +2749,7 @@
</target>
<target name="download-compile"
@@ -116,7 +151,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<antcall target="downloadfile-2">
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2773,7 +2779,7 @@
+@@ -2773,7 +2783,7 @@
</target>
<target name="download-test-compile"
@@ -125,7 +160,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<antcall target="downloadfile">
<param name="sourcefile" value="${junit.loc}"/>
-@@ -2819,7 +2825,7 @@
+@@ -2819,7 +2829,7 @@
</target>
<target name="download-dist"
@@ -134,7 +169,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<antcall target="downloadzip-2">
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2845,18 +2851,18 @@
+@@ -2845,18 +2855,18 @@
<!-- =============== Utility Targets to support downloads ================ -->
@@ -156,7 +191,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<!-- Download and extract the package -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
-@@ -2868,7 +2874,7 @@
+@@ -2868,7 +2878,7 @@
<delete file="${temp.file}.tar.gz"/>
</target>
@@ -165,7 +200,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<!-- Download and extract the package from the two alternative locations -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
-@@ -2887,7 +2893,7 @@
+@@ -2887,7 +2897,7 @@
<delete file="${temp.file}.tar.gz"/>
</target>
@@ -174,7 +209,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<!-- Download and extract the package -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
-@@ -2898,7 +2904,7 @@
+@@ -2898,7 +2908,7 @@
<delete file="${temp.file}"/>
</target>
@@ -183,7 +218,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<!-- Download and extract the package from the two alternative locations -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
-@@ -2916,7 +2922,7 @@
+@@ -2916,7 +2926,7 @@
<delete file="${temp.file}"/>
</target>
@@ -192,7 +227,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<!-- Download the file -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
-@@ -2926,7 +2932,7 @@
+@@ -2926,7 +2936,7 @@
<move file="${temp.file}" tofile="${destfile}"/>
</target>
@@ -201,7 +236,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<!-- Download the file from the two alternative locations -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
-@@ -2949,7 +2955,7 @@
+@@ -2949,7 +2959,7 @@
<move file="${temp.file}" tofile="${destfile}"/>
</target>
@@ -210,7 +245,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<condition property="trydownload.run">
<and>
<not>
-@@ -2960,7 +2966,7 @@
+@@ -2960,7 +2970,7 @@
</condition>
</target>
@@ -219,7 +254,7 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/buil
<!-- Downloads a file if not yet downloaded and the source URL is available -->
<get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
</target>
-@@ -2971,7 +2977,7 @@
+@@ -2971,7 +2981,7 @@
<target name="ide-eclipse"
depends="download-compile, extras-webservices-prepare, download-test-compile"
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
@ 2015-08-16 14:22 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2015-08-16 14:22 UTC (permalink / raw
To: gentoo-commits
commit: 4d10f751d5f03e1e9ec52633229bc6e163241aa9
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 22:54:26 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 14:22:02 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d10f751
www-servers/tomcat: Remove orphaned patch
Package-Manager: portage-2.2.20.1
.../tomcat/files/tomcat-8.0.22-build.xml.patch | 230 ---------------------
1 file changed, 230 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-8.0.22-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.22-build.xml.patch
deleted file mode 100644
index d747959..0000000
--- a/www-servers/tomcat/files/tomcat-8.0.22-build.xml.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml
---- apache-tomcat-8.0.18-src-orig/build.xml 2015-01-28 15:10:36.112146352 -0500
-+++ apache-tomcat-8.0.18-src/build.xml 2015-02-19 18:08:37.971396016 -0500
-@@ -703,24 +703,29 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- notice="${tomcat.manifests}/servlet-api.jar.notice"
- license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
- <!-- JSP 2.3 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
- <!-- EL 3.0 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}"
- filesDir="${tomcat.classes}"
- filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- WebSocket 1.1 API JAR File -->
- <jarIt jarfile="${websocket-api.jar}"
-@@ -992,14 +997,14 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!--
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
-
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1059,7 +1064,7 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1093,7 +1098,7 @@
- </javac>
- </target>
-
-- <target name="build-tomcat-jdbc" depends="package">
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget">
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1108,7 +1113,7 @@
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
- </target>
-
-- <target name="build-tomcat-jdbc-src">
-+ <target name="build-tomcat-jdbc-src" unless="noget">
- <!-- build the jdbc-pool source jar-->
- <echo message="Building Tomcat JDBC pool src JAR"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1212,10 +1217,11 @@
-
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.embed}" />
--
-+-->
- <!-- Note the meta-inf below will work as long as there is only one JAR
- that needs to add entries. If there is more than one a more complex
- solution will be required. -->
-@@ -1519,7 +1525,7 @@
-
- <target name="extras-commons-logging-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-@@ -1658,7 +1664,7 @@
-
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
-- description="Prepare to build web services extras package">
-+ description="Prepare to build web services extras package" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2703,7 +2709,7 @@
- </target>
-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
-+ description="Download (and build) components necessary to compile" unless="noget">
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2746,7 +2752,7 @@
- </target>
-
- <target name="download-test-compile"
-- description="Download additional components for the tests" >
-+ description="Download additional components for the tests" unless="noget">
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
-@@ -2792,7 +2798,7 @@
- </target>
-
- <target name="download-dist"
-- description="Download additional components for a distribution" >
-+ description="Download additional components for a distribution" unless="noget">
-
- <antcall target="downloadzip-2">
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2818,18 +2824,18 @@
-
- <!-- =============== Utility Targets to support downloads ================ -->
-
-- <target name="setproxy" if="${proxy.use}">
-+ <target name="setproxy" if="${proxy.use}" unless="noget">
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
-- <target name="testexist">
-+ <target name="testexist" unless="noget">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2841,7 +2847,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadgz-2" unless="exist" depends="testexist">
-+ <target name="downloadgz-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2860,7 +2866,7 @@
- <delete file="${temp.file}.tar.gz"/>
- </target>
-
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
- <!-- Download and extract the package -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2871,7 +2877,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-+ <target name="downloadzip-2" unless="noget" depends="testexist">
- <!-- Download and extract the package from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2889,7 +2895,7 @@
- <delete file="${temp.file}"/>
- </target>
-
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
- <!-- Download the file -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2899,7 +2905,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-+ <target name="downloadfile-2" unless="noget" depends="testexist">
- <!-- Download the file from the two alternative locations -->
- <local name="temp.file"/>
- <mkdir dir="${base.path}"/>
-@@ -2922,7 +2928,7 @@
- <move file="${temp.file}" tofile="${destfile}"/>
- </target>
-
-- <target name="trydownload.check" depends="setproxy">
-+ <target name="trydownload.check" depends="setproxy" unless="noget">
- <condition property="trydownload.run">
- <and>
- <not>
-@@ -2933,7 +2939,7 @@
- </condition>
- </target>
-
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
- <!-- Downloads a file if not yet downloaded and the source URL is available -->
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
- </target>
-@@ -2944,7 +2950,7 @@
-
- <target name="ide-eclipse"
- depends="download-compile, extras-webservices-prepare, download-test-compile"
-- description="Prepares the source tree to be built in Eclipse">
-+ description="Prepares the source tree to be built in Eclipse" unless="noget">
-
- <!-- Copy the sample project files into the root directory -->
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-06-27 15:40 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-02 17:57 [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-06-27 15:40 Conrad Kostecki
2024-05-26 21:31 Conrad Kostecki
2024-05-09 10:57 Florian Schmaus
2023-03-23 5:48 Miroslav Šulc
2022-10-30 9:28 Sam James
2022-06-03 5:38 Miroslav Šulc
2021-04-09 6:17 Miroslav Šulc
2021-02-27 15:38 Conrad Kostecki
2019-03-11 4:48 Aaron Bauman
2016-05-18 6:50 Austin English
2016-01-18 15:22 Miroslav Šulc
2015-08-22 20:31 James Le Cuirot
2015-08-16 14:22 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox