diff options
Diffstat (limited to 'www-servers/tomcat/files')
-rw-r--r-- | www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch | 29 | ||||
-rw-r--r-- | www-servers/tomcat/files/tomcat-10.1.20-offline.patch | 12 |
2 files changed, 41 insertions, 0 deletions
diff --git a/www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch b/www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch new file mode 100644 index 000000000000..ade8527d11f1 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch @@ -0,0 +1,29 @@ +--- a/build.xml ++++ b/build.xml +#<!-- we provide tomcat native as another package and we don't need commons-daemon +@@ -1469,7 +1469,6 @@ + <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"> +#<!-- we provide jdt jar externally +@@ -1530,7 +1529,6 @@ + <exclude name="${jdt.jar.filename}"/> + </fileset> + </delete> +- <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" /> +#<!-- we provide migration tool externally +@@ -1541,7 +1539,6 @@ + <exclude name="${migration-lib.jar.filename}"/> + </fileset> + </delete> +- <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 diff --git a/www-servers/tomcat/files/tomcat-10.1.20-offline.patch b/www-servers/tomcat/files/tomcat-10.1.20-offline.patch new file mode 100644 index 000000000000..94edd1c8b7e9 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-10.1.20-offline.patch @@ -0,0 +1,12 @@ +--- a/build.xml ++++ b/build.xml +# javadoc would fail without network access +@@ -2413,8 +2410,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <link href="../elapi"/> + <link href="../websocketapi"/> + <link href="../jaspicapi"/> +- <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/**"/> |