Fix java requirements (#2398212)

With java-latest now being 25, but only java-25 providing the
generic 'java' and 'java-headless' etc., we get file conflicts
if a transaction includes both things that want 'java-25' or
'java-25-headless' and things that want 'java' or 'java-headless'.
This is because dnf prefers java-latest as a provider of the
java-25-* provides (it's versioned higher than the java-25
packages), but only the java-25 packages provide the generic
requirements.

To avoid this making FreeIPA uninstallable, let's get rid of the
generic 'java-headless' requirement. I think f7115aee was meant
to do this already, but missed it.

Also get rid of the now-useless version bounds on requirements
where the java version is included in the requirement name.

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,4 @@
 apache-tomcat-*-src.tar.gz
-
+results_tomcat
+tomcat*.src.rpm
+apache-tomcat-*-src/

.packit.yaml

@@ -0,0 +1,38 @@
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+create_sync_note: false
+
+upstream_project_url: https://github.com/apache/tomcat.git
+
+issue_repository: https://src.fedoraproject.org/rpms/tomcat
+
+jobs:
+# https://packit.dev/docs/configuration/downstream/pull_from_upstream
+# Make sure there is Fedora mapping for the 'tomcat' project in https://release-monitoring.org/projects/search/?pattern=tomcat
+# Make sure Monitoring status on the left side at https://src.fedoraproject.org/rpms/tomcat is set to Monitoring
+- job: pull_from_upstream
+  trigger: release
+  dist_git_branches:
+    - fedora-branched
+
+# https://packit.dev/docs/configuration/downstream/koji_build
+- job: koji_build
+  trigger: commit
+  dist_git_branches:
+    - fedora-all
+    
+- job: koji_build
+  trigger: commit
+  scratch: true
+  allowed_pr_authors: ['all_admins', 'all_committers']
+  allowed_committers: ['all_admins', 'all_committers']
+  dist_git_branches:
+    - fedora-all
+
+# https://packit.dev/docs/configuration/downstream/bodhi_update
+- job: bodhi_update
+  trigger: commit
+  allowed_builders: ['packit', 'all_admins']
+  dist_git_branches:
+    - fedora-branched # rawhide updates are created automatically

add_parent_logger_getter.patch

@@ -1,29 +0,0 @@
---- modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java.sav	2012-01-17 13:55:44.000000000 +0400
-+++ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java	2012-01-22 00:44:22.299789107 +0400
-@@ -19,9 +19,11 @@ package org.apache.tomcat.jdbc.pool;
- import java.io.PrintWriter;
- import java.sql.Connection;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.Iterator;
- import java.util.Properties;
- import java.util.concurrent.Future;
-+import java.util.logging.Logger;
- 
- import javax.sql.XAConnection;
- 
-@@ -534,6 +536,14 @@ public class DataSourceProxy implements
-     }
- 
-     /**
-+     * no-op
-+     * {@link javax.sql.DataSource#getParentLogger}
-+     */
-+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+	throw new SQLFeatureNotSupportedException();
-+    }
-+
-+    /**
-      * no-op
-      * {@link javax.sql.DataSource#getLogWriter}
-      */

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

el-api-OSGi-MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: javax.el;version="2.2.0"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 2.2.0
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: javax.el
-DynamicImport-Package: org.apache.el
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

gating.yaml

@@ -0,0 +1,20 @@
+--- !Policy
+product_versions:
+  - fedora-rawhide
+decision_contexts:
+  - bodhi_update_push_stable
+  - bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional}
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_stable
+  - bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}

jasper-OSGi-MANIFEST.MF

@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.jasper;version="8.0.26",org.apache.jasper.c
- ompiler;version="8.0.26",org.apache.jasper.compiler.tagplugin;version
- ="8.0.26",org.apache.jasper.resources;version="8.0.26",org.apache.jas
- per.runtime;version="8.0.26",org.apache.jasper.security;version="7.0.
- 19",org.apache.jasper.servlet;version="8.0.26",org.apache.jasper.tagp
- lugins.jstl;version="8.0.26",org.apache.jasper.tagplugins.jstl.core;v
- ersion="8.0.26",org.apache.jasper.util;version="8.0.26",org.apache.ja
- sper.xmlparser;version="8.0.26"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 8.0.26
-Bundle-Localization: plugin
-Bundle-Name: %bundleName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.jasper
-Import-Package: javax.servlet;version="[2.4.0, 3.0.0]",javax.servlet.h
- ttp;version="[2.4.0, 3.0.0]",javax.servlet.jsp;version="[2.0.0, 2.2.0
- ]",javax.servlet.jsp.el;version="[2.0.0, 2.2.0]",javax.servlet.jsp.re
- sources;version="[2.0.0, 2.2.0]",javax.servlet.jsp.tagext;version="[2
- .0.0, 2.2.0]",javax.servlet.resources;version="[2.4.0, 3.0.0]",javax.
- xml.parsers,org.apache.commons.el;version="[1.0.0,2.0.0)",org.apache.
- commons.logging;version="[1.0.0,2.0.0)",org.apache.tools.ant;resoluti
- on:=optional,org.apache.tools.ant.taskdefs;resolution:=optional,org.a
- pache.tools.ant.types;resolution:=optional,org.apache.tools.ant.util;
- resolution:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.
- sax.helpers,org.apache.tomcat;version="8.0.26",org.apache.juli.loggin
- g;version="8.0.26",javax.el;version="2.2.0",org.eclipse.jdt.internal.
- compiler,org.eclipse.jdt.internal.compiler.parser,org.eclipse.jdt.int
- ernal.compiler.parser.diagnose,org.eclipse.jdt.internal.compiler.flow
- ,org.eclipse.jdt.internal.compiler.util,org.eclipse.jdt.internal.comp
- iler.impl,org.eclipse.jdt.internal.compiler.lookup,org.eclipse.jdt.in
- ternal.compiler.codegen,org.eclipse.jdt.internal.compiler.batch,org.e
- clipse.jdt.internal.compiler.classfmt,org.eclipse.jdt.internal.compil
- er.ast,org.eclipse.jdt.internal.compiler.problem,org.eclipse.jdt.inte
- rnal.compiler.env,org.eclipse.jdt.internal.core.util,org.eclipse.jdt.
- core.compiler
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

jasper-el-OSGi-MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.el;version="7.0.21"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 8.0.26
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Import-Package: javax.el;version="2.2"
-Bundle-SymbolicName: org.apache.el
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

jsp-api-OSGi-MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Vendor: %bundleProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
-Bundle-Name: %bundleName
-Bundle-SymbolicName: javax.servlet.jsp
-Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v
- ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp
- .tagext; version=2.2
-Bundle-Version: 2.2.0.v200806031607
-Bundle-ManifestVersion: 2
-Import-Package: javax.servlet; version=3.0,javax.servlet.http; version
- =3.0,javax.servlet.resources; version=3.0,javax.el;version="2.2.0"

module-start-up-parameters.conf

@@ -0,0 +1,8 @@
+# Add the module start-up parameters required by Tomcat
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.lang=ALL-UNNAMED"
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.io=ALL-UNNAMED"
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util=ALL-UNNAMED"
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
+JAVA_OPTS="$JAVA_OPTS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+export JAVA_OPTS
+

plans/javapackages.fmf

@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f42
+execute:
+  how: tmt

plans/smoke.fmf

@@ -0,0 +1,5 @@
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/tomcat
+execute:
+    how: tmt

rhbz-1857043.patch

@@ -0,0 +1,215 @@
+--- build.xml.orig	2024-08-02 18:14:43.000000000 +0300
++++ build.xml	2024-08-19 13:56:38.991730088 +0300
+@@ -1121,7 +1121,7 @@
+       filesDir="${tomcat.classes}"
+       filesId="files.annotations-api"
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Servlet Implementation JAR File -->
+     <jarIt jarfile="${servlet-api.jar}"
+@@ -1130,48 +1130,48 @@
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- 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" />
++      addOSGi="false" />
+ 
+     <!-- 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" />
++      addOSGi="false" />
+ 
+     <!-- WebSocket API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.websocket-api"
+       manifest="${tomcat.manifests}/websocket-api.jar.manifest"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- WebSocket Client API JAR File -->
+     <jarIt jarfile="${websocket-client-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.websocket-client-api"
+       manifest="${tomcat.manifests}/websocket-client-api.jar.manifest"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- JASPIC API JAR File -->
+     <jarIt jarfile="${jaspic-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jaspic-api"
+       manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Tomcat-juli JAR File -->
+     <jarIt jarfile="${tomcat-juli.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-juli"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+@@ -1183,68 +1183,68 @@
+     <jarIt jarfile="${tomcat-util.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-util"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Tomcat API JAR File -->
+     <jarIt jarfile="${tomcat-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-api"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Tomcat Util Scan JAR File -->
+     <jarIt jarfile="${tomcat-util-scan.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-util-scan"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <jarIt jarfile="${tomcat-jni.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-jni"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Protocol handlers - Coyote -->
+     <jarIt jarfile="${tomcat-coyote.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-coyote"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- OpenSSL FFM - Coyote -->
+     <jarIt jarfile="${tomcat-coyote-ffm.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-coyote-ffm"
+       manifest="${tomcat.manifests}/tomcat-coyote-ffm.jar.manifest"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- WebSocket implementation JAR File -->
+     <jarIt jarfile="${tomcat-websocket.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-websocket"
+       meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Catalina GroupCom/Tribes JAR File -->
+     <jarIt jarfile="${catalina-tribes.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina-tribes"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Catalina Main JAR File -->
+     <jarIt jarfile="${catalina.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Catalina Cluster/HA JAR File -->
+     <jarIt jarfile="${catalina-ha.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina-ha"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Server-Side Includes (SSI) -->
+     <jarIt jarfile="${catalina-ssi.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina-ssi"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Catalina Ant Tasks JAR File -->
+     <jarIt jarfile="${catalina-ant.jar}"
+@@ -1255,27 +1255,27 @@
+     <jarIt jarfile="${catalina-storeconfig.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina-storeconfig"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Jasper EL Implementation JAR File -->
+     <jarIt jarfile="${jasper-el.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jasper-el"
+       meta-inf="${tomcat.manifests}/jasper-el.jar"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Jasper Implementation JAR File -->
+     <jarIt jarfile="${jasper.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jasper"
+       meta-inf="${tomcat.manifests}/jasper.jar"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 2-->
+     <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-dbcp"
+-      addOSGi="true" />
++      addOSGi="false" />
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1748,7 +1748,7 @@
+            filesId="files.tomcat-embed-core"
+            notice="${tomcat.manifests}/servlet-api.jar.notice"
+            license="${tomcat.manifests}/servlet-api.jar.license"
+-           addOSGi="true"
++           addOSGi="false"
+            addGraal="true"
+            graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
+            graalFiles="res/graal/tomcat-embed-core/native-image"
+@@ -1756,7 +1756,7 @@
+     <jarIt jarfile="${tomcat-embed-el.jar}"
+            filesDir="${tomcat.classes}"
+            filesId="files.tomcat-embed-el"
+-           addOSGi="true"
++           addOSGi="false"
+            addGraal="true"
+            graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
+            graalFiles="res/graal/tomcat-embed-el/native-image"
+@@ -1765,7 +1765,7 @@
+            filesDir="${tomcat.classes}"
+            filesId="files.tomcat-embed-jasper"
+            meta-inf="${tomcat.manifests}/jasper.jar"
+-           addOSGi="true"
++           addOSGi="false"
+            addGraal="true"
+            graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
+            graalFiles="res/graal/tomcat-embed-jasper/native-image"
+@@ -1774,7 +1774,7 @@
+            filesDir="${tomcat.classes}"
+            filesId="files.tomcat-embed-websocket"
+            meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
+-           addOSGi="true"
++           addOSGi="false"
+            addGraal="true"
+            graalPrefix="org.apache.tomcat.embed/tomcat-embed-websocket"
+            graalFiles="res/graal/tomcat-embed-websocket/native-image"

servlet-api-OSGi-MANIFEST.MF

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4
-Bundle-SymbolicName: javax.servlet
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-Version: 3.0.0
-Bundle-Vendor: %bundleProvider
-Export-Package: javax.servlet;version="3.0",
- javax.servlet;version="2.6",
- javax.servlet.http;version="3.0",
- javax.servlet.http;version="2.6",
- javax.servlet.annotation;version="2.6",
- javax.servlet.descriptor;version="3.0",
- javax.servlet.descriptor;version="2.6",
- javax.servlet.resources;version="3.0",
- javax.servlet.resources;version="2.6"

sources

@@ -1 +1 @@
-SHA512 (apache-tomcat-8.0.44-src.tar.gz) = e9b793aeeced1c4bf8e1eabc7717dd839b13cbb886a2e3144fdc37f5ed14b4a0bff2c893221a4b29ccd3270950c1ebb37977588f3743b195c4e33796fad47abe
+SHA512 (apache-tomcat-10.1.46-src.tar.gz) = 4abb5a5fad013135c4107508e4530673e4af623658b6aff5c4fc18fd557dfca37b58a9c5c0479e52e240b53d469ad91a34225a80b718aa2f91b8d385d16d9682

tomcat-10.1-JDTCompiler.patch

@@ -0,0 +1,30 @@
+--- java/org/apache/jasper/compiler/JDTCompiler.java.orig	2024-12-05 18:01:16.000000000 +0200
++++ java/org/apache/jasper/compiler/JDTCompiler.java	2025-01-07 16:30:34.996302312 +0200
+@@ -302,9 +302,9 @@ public class JDTCompiler extends org.apa
+             } else if (opt.equals("17")) {
+                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_17);
+             } else if (opt.equals("18")) {
+-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_18);
++                settings.put(CompilerOptions.OPTION_Source, "18");
+             } else if (opt.equals("19")) {
+-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_19);
++                settings.put(CompilerOptions.OPTION_Source, "19");
+             } else if (opt.equals("20")) {
+                 // Constant not available in latest ECJ version that runs on
+                 // Java 11.
+@@ -392,11 +392,11 @@ public class JDTCompiler extends org.apa
+                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_17);
+                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_17);
+             } else if (opt.equals("18")) {
+-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_18);
+-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_18);
++                settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
++                settings.put(CompilerOptions.OPTION_Compliance, "18");
+             } else if (opt.equals("19")) {
+-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_19);
+-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_19);
++                settings.put(CompilerOptions.OPTION_TargetPlatform, "19");
++                settings.put(CompilerOptions.OPTION_Compliance, "19");
+             } else if (opt.equals("20")) {
+                 // Constant not available in latest ECJ version that runs on
+                 // Java 11.

tomcat-10.1-bnd-annotation.patch

@@ -0,0 +1,10 @@
+--- build.xml.orig	2023-01-29 17:38:29.477052402 +0800
++++ build.xml	2023-01-29 17:42:03.369583841 +0800
+@@ -216,6 +216,7 @@
+   <!-- Classpaths -->
+   <path id="compile.classpath">
+     <pathelement location="${bnd.jar}"/>
++    <pathelement location="${bnd-annotation.jar}"/>
+     <pathelement location="${jdt.jar}"/>
+     <pathelement location="${jaxrpc-lib.jar}"/>
+     <pathelement location="${wsdl4j-lib.jar}"/>

tomcat-10.1-catalina-policy.patch

@@ -0,0 +1,16 @@
+--- conf/catalina.policy.orig	2024-05-22 16:12:23.809886452 +0300
++++ conf/catalina.policy	2024-05-22 16:14:38.913939654 +0300
+@@ -55,6 +55,14 @@
+         permission java.security.AllPermission;
+ };
+
++// ========== RHEL SPECIFIC CODE PERMISSIONS =======================================
++
++// Allowing everything in /usr/share/java allows too many unknowns to be permitted
++// Specifying the individual jars that tomcat needs to function with the security manager
++// is the safest way forward.
++grant codeBase "file:/usr/share/java/ecj/ecj.jar" {
++	permission java.security.AllPermission;
++};
+
+ // ========== CATALINA CODE PERMISSIONS =======================================

tomcat-10.1-tomcat-users-webapp.patch

@@ -1,6 +1,6 @@
 --- conf/tomcat-users.xml~	2008-01-28 17:41:06.000000000 -0500
 +++ conf/tomcat-users.xml	2008-03-07 19:40:07.000000000 -0500
-@@ -23,4 +23,14 @@
+@@ -53,4 +53,14 @@
    <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
    <user username="role1" password="<must-be-changed>" roles="role1"/>
  -->

tomcat-10.1.conf

@@ -28,25 +28,15 @@ CATALINA_HOME="@@@TCHOME@@@"
 # System-wide tmp
 CATALINA_TMPDIR="/var/cache/tomcat/temp"
 
-# You can pass some parameters to java here if you wish to
-#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
-
-# Use JAVA_OPTS to set java.library.path for libtcnative.so
-#JAVA_OPTS="-Djava.library.path=/usr/lib"
-
-# Set default javax.sql.DataSource factory to apache commons one. See rhbz#1214381
-JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory"
-
 # You can change your tomcat locale here
 #LANG="en_US"
 
 # Run tomcat under the Java Security Manager
 SECURITY_MANAGER="false"
 
-# Time to wait in seconds, before killing process
-# TODO(stingray): does nothing, fix.
-# SHUTDOWN_WAIT="30"
-
 # If you wish to further customize your tomcat environment,
 # put your own definitions here
 # (i.e. LD_LIBRARY_PATH for some jdbc drivers)
+
+# You can also pass parameters to Java here by defining JAVA_OPTS variable
+# (e.g. JAVA_OPTS="-Xminf0.1 -Xmaxf0.3")

tomcat-10.1.logrotate

@@ -0,0 +1,11 @@
+# This is an example config only and is disabled by default
+# If you wish to use it, you'll need to update /etc/tomcat/logging.properties
+# to prevent catalina*.log from being rotated by Tomcat
+@@@TCLOG@@@/catalina*.log {
+    copytruncate
+    weekly
+    rotate 52
+    compress
+    missingok
+    create 0644 tomcat tomcat
+}

tomcat-10.1.service

@@ -15,8 +15,6 @@ EnvironmentFile=-/etc/sysconfig/tomcat
 ExecStart=/usr/libexec/tomcat/server start
 SuccessExitStatus=143
 User=tomcat
-Group=tomcat
-
 
 [Install]
 WantedBy=multi-user.target

tomcat-8.0-catalina-policy.patch

@@ -1,39 +0,0 @@
---- conf/catalina.policy~	2016-06-17 10:20:17.649171968 -0400
-+++ conf/catalina.policy	2016-06-17 10:23:35.358309244 -0400
-@@ -50,6 +50,36 @@ grant codeBase "file:${java.home}/lib/ex
-         permission java.security.AllPermission;
- };
- 
-+// ========== RHEL SPECIFIC CODE PERMISSIONS =======================================
-+
-+// Allowing everything in /usr/share/java allows too many unknowns to be permitted
-+// Specifying the individual jars that tomcat needs to function with the security manager
-+// is the safest way forward.
-+grant codeBase "file:/usr/share/java/tomcat-servlet-3.0-api.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/tomcat-jsp-2.2-api.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/tomcat-el-2.2-api.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/log4j.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/ecj.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/apache-commons-pool.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/apache-commons-dbcp.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/apache-commons-collections.jar" {
-+        permission java.security.AllPermission;
-+};
-+
- 
- // ========== CATALINA CODE PERMISSIONS =======================================
- 

tomcat-8.0-jsvc.service

@@ -1,22 +0,0 @@
-# Systemd unit file for tomcat
-# 
-# To create clones of this service:
-# 1) By default SERVICE_NAME=tomcat. When cloned, the value must be defined 
-# before tomcat-sysd is called.
-# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat
-# to override tomcat defaults
-
-[Unit]
-Description=Apache Tomcat Web Application Container JSVC wrapper
-After=syslog.target network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME=" "USE_JSVC=true"
-EnvironmentFile=-/etc/sysconfig/tomcat
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
-
-[Install]
-WantedBy=multi-user.target

tomcat-8.0-log4j.properties

@@ -1,11 +0,0 @@
-log4j.rootLogger=debug, R 
-log4j.appender.R=org.apache.log4j.RollingFileAppender 
-log4j.appender.R.File=${catalina.base}/logs/tomcat.log 
-log4j.appender.R.MaxFileSize=10MB 
-log4j.appender.R.MaxBackupIndex=10 
-log4j.appender.R.layout=org.apache.log4j.PatternLayout 
-log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n 
-log4j.logger.org.apache.catalina=DEBUG, R
-log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG, R
-log4j.logger.org.apache.catalina.core=DEBUG, R
-log4j.logger.org.apache.catalina.session=DEBUG, R

tomcat-8.0.36-CompilerOptionsV9.patch

@@ -1,24 +0,0 @@
---- java/org/apache/jasper/compiler/JDTCompiler.java~	2016-07-01 14:39:19.728255958 -0400
-+++ java/org/apache/jasper/compiler/JDTCompiler.java	2016-07-01 14:39:37.191311760 -0400
-@@ -312,9 +312,6 @@
-             } else if(opt.equals("1.8")) {
-                 settings.put(CompilerOptions.OPTION_Source,
-                              CompilerOptions.VERSION_1_8);
--            } else if(opt.equals("1.9")) {
--                settings.put(CompilerOptions.OPTION_Source,
--                             CompilerOptions.VERSION_1_9);
-             } else {
-                 log.warn("Unknown source VM " + opt + " ignored.");
-                 settings.put(CompilerOptions.OPTION_Source,
-@@ -361,11 +358,6 @@
-                              CompilerOptions.VERSION_1_8);
-                 settings.put(CompilerOptions.OPTION_Compliance,
-                         CompilerOptions.VERSION_1_8);
--            } else if(opt.equals("1.9")) {
--                settings.put(CompilerOptions.OPTION_TargetPlatform,
--                             CompilerOptions.VERSION_1_9);
--                settings.put(CompilerOptions.OPTION_Compliance,
--                        CompilerOptions.VERSION_1_9);
-             } else {
-                 log.warn("Unknown target VM " + opt + " ignored.");
-                 settings.put(CompilerOptions.OPTION_TargetPlatform,

tomcat-8.0.logrotate

@@ -1,8 +0,0 @@
-@@@TCLOG@@@/catalina.out {
-    copytruncate
-    weekly
-    rotate 52
-    compress
-    missingok
-    create 0644 tomcat tomcat
-}

tomcat-api-OSGi-MANIFEST.MF

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.tomcat;version="8.0.26"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 8.0.26
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.tomcat
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

tomcat-build.patch

@@ -0,0 +1,19 @@
+diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd
+--- res/bnd/build-defaults.bnd.orig     2023-10-16 11:23:04.752754202 +0800
++++ res/bnd/build-defaults.bnd  2023-10-16 11:23:29.931876910 +0800
+@@ -13,7 +13,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-Bundle-Version: ${version_cleanup;${version}}
++Bundle-Version: ${version}
+ Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt
+
+ Specification-Title: Apache Tomcat
+@@ -36,4 +36,4 @@ X-Compile-Target-JDK: ${compile.release}
+
+ -removeheaders: DSTAMP,TODAY,TSTAMP
+
+-module.name: org.apache.${replace;${Bundle-Name};-;.}
+\ No newline at end of file
++module.name: org.apache.${replace;${Bundle-Name};-;.}

tomcat-functions

@@ -13,30 +13,9 @@ _save_function() {
     eval "$NEWNAME_FUNC"
 }
 
-run_jsvc(){
-    if [ -x /usr/bin/jsvc ]; then
-        TOMCAT_USER="${TOMCAT_USER:-tomcat}"
-        JSVC="/usr/bin/jsvc"
-
-        JSVC_OPTS="-nodetach -pidfile /var/run/jsvc-tomcat${NAME}.pid -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out"
-        if [ "$1" = "stop" ]; then
-            JSVC_OPTS="${JSVC_OPTS} -stop"
-    	fi
-
-        exec "${JSVC}" ${JSVC_OPTS} ${FLAGS} -classpath "${CLASSPATH}" ${OPTIONS} "${MAIN_CLASS}" "${@}"
-    else
-       	echo "Can't find /usr/bin/jsvc executable"
-    fi
-
-}
-
 _save_function run run_java
 
 run() {
-   if [ "${USE_JSVC}" = "true" ] ; then
-	run_jsvc $@
-   else
 	run_java $@
-   fi
 }
 

tomcat-juli-OSGi-MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.juli;version="8.0.26",org.apache.juli.loggi
- ng;version="8.0.26"
-Bundle-Vendor: %bundleProvider
-Bundle-ClassPath: .
-Bundle-Version: 8.0.26
-Bundle-Name: %bundleName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.apache.juli
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-

tomcat-named.service

@@ -13,14 +13,12 @@ After=syslog.target network.target
 [Service]
 Type=simple
 EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME=%I"
-EnvironmentFile=-/etc/sysconfig/tomcat@%I
+Environment="NAME=%i"
+EnvironmentFile=-/etc/sysconfig/tomcat@%i
 ExecStart=/usr/libexec/tomcat/server start
 ExecStop=/usr/libexec/tomcat/server stop
 SuccessExitStatus=143
 User=tomcat
-Group=tomcat
 
 [Install]
 WantedBy=multi-user.target
-