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

.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

ci.fmf

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

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}

java-9-start-up-parameters.conf

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

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

@@ -1,7 +1,6 @@
-diff -up ./build.xml.orig ./build.xml
---- build.xml.orig	2021-07-07 10:53:55.493742841 +0800
-+++ build.xml	2021-07-07 11:09:43.107968515 +0800
-@@ -1020,7 +1020,7 @@
+--- 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"
@@ -10,7 +9,7 @@ diff -up ./build.xml.orig ./build.xml
  
      <!-- Servlet Implementation JAR File -->
      <jarIt jarfile="${servlet-api.jar}"
-@@ -1029,41 +1029,41 @@
+@@ -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"
@@ -39,6 +38,14 @@ diff -up ./build.xml.orig ./build.xml
        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 -->
@@ -58,7 +65,7 @@ diff -up ./build.xml.orig ./build.xml
  
      <!-- Bootstrap JAR File -->
      <jarIt jarfile="${bootstrap.jar}"
-@@ -1075,61 +1075,61 @@
+@@ -1183,68 +1183,68 @@
      <jarIt jarfile="${tomcat-util.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.tomcat-util"
@@ -90,6 +97,14 @@ diff -up ./build.xml.orig ./build.xml
        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 -->
@@ -130,7 +145,7 @@ diff -up ./build.xml.orig ./build.xml
  
      <!-- Catalina Ant Tasks JAR File -->
      <jarIt jarfile="${catalina-ant.jar}"
-@@ -1140,27 +1140,27 @@
+@@ -1255,27 +1255,27 @@
      <jarIt jarfile="${catalina-storeconfig.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.catalina-storeconfig"
@@ -162,7 +177,7 @@ diff -up ./build.xml.orig ./build.xml
  
      <!-- i18n JARs -->
      <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1620,7 +1620,7 @@
+@@ -1748,7 +1748,7 @@
             filesId="files.tomcat-embed-core"
             notice="${tomcat.manifests}/servlet-api.jar.notice"
             license="${tomcat.manifests}/servlet-api.jar.license"
@@ -171,7 +186,7 @@ diff -up ./build.xml.orig ./build.xml
             addGraal="true"
             graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
             graalFiles="res/graal/tomcat-embed-core/native-image"
-@@ -1628,7 +1628,7 @@
+@@ -1756,7 +1756,7 @@
      <jarIt jarfile="${tomcat-embed-el.jar}"
             filesDir="${tomcat.classes}"
             filesId="files.tomcat-embed-el"
@@ -180,7 +195,7 @@ diff -up ./build.xml.orig ./build.xml
             addGraal="true"
             graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
             graalFiles="res/graal/tomcat-embed-el/native-image"
-@@ -1637,7 +1637,7 @@
+@@ -1765,7 +1765,7 @@
             filesDir="${tomcat.classes}"
             filesId="files.tomcat-embed-jasper"
             meta-inf="${tomcat.manifests}/jasper.jar"
@@ -189,7 +204,7 @@ diff -up ./build.xml.orig ./build.xml
             addGraal="true"
             graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
             graalFiles="res/graal/tomcat-embed-jasper/native-image"
-@@ -1646,7 +1646,7 @@
+@@ -1774,7 +1774,7 @@
             filesDir="${tomcat.classes}"
             filesId="files.tomcat-embed-websocket"
             meta-inf="${tomcat.manifests}/tomcat-websocket.jar"

sources

@@ -1 +1 @@
-SHA512 (apache-tomcat-9.0.65-src.tar.gz) = 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
+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.conf

@@ -28,24 +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"
 
-# SHUTDOWN_WAIT has been deprecated. To change the shutdown wait time, set
-# TimeoutStopSec in tomcat.service.
-
 # 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-9.0-JDTCompiler.patch

@@ -1,24 +0,0 @@
-diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java ./java/org/apache/jasper/compiler/JDTCompiler.java
-index 2e361f2..277d8f4 100644
---- java/org/apache/jasper/compiler/JDTCompiler.java
-+++ java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
-             } else if(opt.equals("15")) {
-                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_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 that runs on
-                 // Java 8.
-@@ -377,8 +377,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
-                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
-                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_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 that runs on
-                 // Java 8.

tomcat-9.0-catalina-policy.patch

@@ -1,26 +0,0 @@
---- conf/catalina.policy.orig	2021-07-07 10:25:53.461393329 +0800
-+++ conf/catalina.policy	2021-07-07 10:27:47.688682404 +0800
-@@ -56,6 +56,16 @@ 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/ecj/ecj.jar" {
-+        permission java.security.AllPermission;
-+};
-+
- 
- // ========== CATALINA CODE PERMISSIONS =======================================
- 
-@@ -261,4 +271,4 @@ grant codeBase "file:${catalina.home}/we
- //
- // The permissions granted to a specific JAR
- // grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
--// };
-\ No newline at end of file
-+// };

tomcat-9.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-9.0-osgi-annotations.patch

@@ -1,66 +0,0 @@
---- build.properties.default.orig       2022-06-21 20:30:04.498997718 +0800
-+++ build.properties.default    2022-06-21 20:30:57.579522800 +0800
-@@ -308,6 +308,16 @@ bnd.home=${base.path}/bnd-${bnd.version}
- bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
- bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
-
-+# ----- OSGi annotations bundle, version 1.0.0 or later            -----
-+# ----- required to avoid Javadoc error when using bnd annotations -----
-+osgi-annotations.version=1.1.1
-+osgi-annotations.checksum.enabled=true
-+osgi-annotations.checksum.algorithm=MD5|SHA-1
-+osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d
-+osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
-+osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-+osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-+
- # ----- JSign, version 4.1 or later -----
- jsign.version=4.1
-
---- build.xml.orig	2022-06-21 20:36:12.785560093 +0800
-+++ build.xml	2022-06-21 20:40:41.155154959 +0800
-@@ -213,6 +213,7 @@
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-     <pathelement location="${bnd.jar}"/>
-+    <pathelement location="${osgi-annotations.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-     <pathelement location="${jaxrpc-lib.jar}"/>
-     <pathelement location="${wsdl4j-lib.jar}"/>
-@@ -2270,7 +2271,8 @@ Apache Tomcat ${version} native binaries
-       failonwarning="true">
-       <classpath>
-         <path refid="compile.classpath"/>
--        <path location="${ant.core.lib}"/>
-+	<path location="${ant.core.lib}"/>
-+	<path location="${osgi-annotations.jar}"/>
-       </classpath>
-       <link href="../annotationapi"/>
-       <link href="../servletapi"/>
-@@ -3671,12 +3673,26 @@ Read the Building page on the Apache Tom
-       <param name="checksum.algorithm" value="${bnd.checksum.algorithm}"/>
-       <param name="checksum.value" value="${bnd.checksum.value}"/>
-     </antcall>
-+    <!-- Download OSGi annotations -->
-+    <antcall target="downloadfile">
-+      <param name="sourcefile" value="${osgi-annotations.loc}"/>
-+      <param name="destfile" value="${osgi-annotations.jar}"/>
-+      <param name="destdir" value="${osgi-annotations.home}"/>
-+      <param name="checksum.enabled" value="${osgi-annotations.checksum.enabled}"/>
-+      <param name="checksum.algorithm" value="${osgi-annotations.checksum.algorithm}"/>
-+      <param name="checksum.value" value="${osgi-annotations.checksum.value}"/>
-+    </antcall>
-   </target>
- 
-   <target name="setup-bnd" depends="download-bnd">
-     <!-- Add bnd tasks to project -->
-     <path id="bnd.classpath">
-       <fileset file="${bnd.jar}" />
-+      <fileset file="${bndlib.jar}" />
-+      <fileset file="${bndlibg.jar}" />
-+      <fileset file="${bndannotation.jar}" />
-+      <fileset file="${slf4j-api.jar}" />
-+      <fileset file="${osgi-cmpn.jar}" />
-     </path>
- 
-     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />

tomcat-build.patch

@@ -1,12 +1,19 @@
 diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd
---- ./res/bnd/build-defaults.bnd.orig	2020-07-13 13:47:01.229077747 -0400
-+++ ./res/bnd/build-defaults.bnd	2020-07-13 13:47:12.923095618 -0400
+--- 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
- Specification-Version: ${version.major.minor}
+@@ -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.spec

@@ -28,19 +28,19 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%global jspspec 2.3
-%global major_version 9
-%global minor_version 0
-%global micro_version 65
+%global jspspec 3.1
+%global major_version 10
+%global minor_version 1
+%global micro_version 46
 %global packdname apache-tomcat-%{version}-src
-%global servletspec 4.0
-%global elspec 3.0
+%global servletspec 6.0
+%global elspec 5.0
 %global tcuid 53
 # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java
-%global native_version 1.2.21
+%global native_version 2.0.8
 
 
-# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
+# FHS 3.0 compliant tree structure - http://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
 %global basedir %{_var}/lib/%{name}
 %global appdir %{basedir}/webapps
 %global homedir %{_datadir}/%{name}
@@ -51,59 +51,57 @@
 %global cachedir %{_var}/cache/%{name}
 %global tempdir %{cachedir}/temp
 %global workdir %{cachedir}/work
-%global _systemddir /lib/systemd/system
 
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       1%{?dist}
+Release:       %autorelease
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
-License:       ASL 2.0
+# Automatically converted from old format: ASL 2.0 - review is highly recommended.
+License:       Apache-2.0
 URL:           http://tomcat.apache.org/
 Source0:       http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz
 Source1:       %{name}-%{major_version}.%{minor_version}.conf
-Source3:       %{name}-%{major_version}.%{minor_version}.sysconfig
-Source4:       %{name}-%{major_version}.%{minor_version}.wrapper
-Source5:       %{name}-%{major_version}.%{minor_version}.logrotate
-Source6:       %{name}-%{major_version}.%{minor_version}-digest.script
-Source7:       %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
-Source11:      %{name}-%{major_version}.%{minor_version}.service
-Source21:      tomcat-functions
-Source30:      tomcat-preamble
-Source31:      tomcat-server
-Source32:      tomcat-named.service
-Source33:      java-9-start-up-parameters.conf
+Source2:       %{name}-%{major_version}.%{minor_version}.sysconfig
+Source3:       %{name}-%{major_version}.%{minor_version}.wrapper
+Source4:       %{name}-%{major_version}.%{minor_version}.logrotate
+Source5:       %{name}-%{major_version}.%{minor_version}-digest.script
+Source6:       %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
+Source7:       %{name}-%{major_version}.%{minor_version}.service
+Source8:       %{name}-functions
+Source9:       %{name}-preamble
+Source10:      %{name}-server
+Source11:      %{name}-named.service
+Source12:      module-start-up-parameters.conf
 
 Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 Patch2:        %{name}-build.patch
 Patch3:        %{name}-%{major_version}.%{minor_version}-catalina-policy.patch
-Patch4:        rhbz-1857043.patch
+Patch4:        %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch
 Patch5:        %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch
-Patch6:        %{name}-%{major_version}.%{minor_version}-osgi-annotations.patch
+Patch6:        rhbz-1857043.patch
 
 BuildArch:     noarch
 ExclusiveArch:  %{java_arches} noarch
 
-BuildRequires: ant
-BuildRequires: ecj >= 1:4.10
+BuildRequires: ant-openjdk25  >= 1.10.2
+BuildRequires: ecj >= 4.20
 BuildRequires: findutils
-BuildRequires: java-devel >= 1:1.8.0
-BuildRequires: javapackages-local
+BuildRequires: java-25-devel
+BuildRequires: javapackages-local-openjdk25
 BuildRequires: aqute-bnd
 BuildRequires: aqute-bndlib
-BuildRequires: wsdl4j
 BuildRequires: systemd
+BuildRequires: tomcat-jakartaee-migration
 
-Requires:      java-headless >= 1:1.8.0
+Requires:      (java-25-headless or java-25)
 Requires:      javapackages-tools
-Requires:      procps
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel} > 7
 Recommends:    tomcat-native >= %{native_version}
 %endif
-Requires(pre):    shadow-utils
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
@@ -138,9 +136,11 @@ The docs web application for Apache Tomcat.
 %package jsp-%{jspspec}-api
 Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes
 Provides: jsp = %{jspspec}
-Obsoletes: %{name}-jsp-2.2-api
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-jsp-2.3-api < 1:9.1
+Provides:  %{name}-jsp-2.3-api = %{?epoch:%{epoch}:}%{version}-%{release}
+
 
 %description jsp-%{jspspec}-api
 Apache Tomcat JSP API Implementation Classes.
@@ -150,7 +150,8 @@ Summary: Libraries needed to run the Tomcat Web container
 Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
-Requires: ecj >= 1:4.10
+Requires: ecj >= 4.20
+Recommends: tomcat-jakartaee-migration
 Requires(preun): coreutils
 
 %description lib
@@ -159,9 +160,8 @@ Libraries needed to run the Tomcat Web container.
 %package servlet-%{servletspec}-api
 Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes
 Provides: servlet = %{servletspec}
-Provides: servlet6
-Provides: servlet3
-Obsoletes: %{name}-servlet-3.1-api
+Obsoletes: %{name}-servlet-4.0-api < 1:9.1
+Provides:  %{name}-servlet-4.0-api = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description servlet-%{servletspec}-api
 Apache Tomcat Servlet API Implementation Classes.
@@ -169,7 +169,8 @@ Apache Tomcat Servlet API Implementation Classes.
 %package el-%{elspec}-api
 Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes
 Provides: el_api = %{elspec}
-Obsoletes: %{name}-el-2.2-api
+Obsoletes: %{name}-el-3.0-api < 1:9.1
+Provides:  %{name}-el-3.0-api = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description el-%{elspec}-api
 Apache Tomcat EL API Implementation Classes.
@@ -187,29 +188,32 @@ The ROOT web application for Apache Tomcat.
 find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
    -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete
 
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
+%patch 0 -p0
+%patch 1 -p0
+%patch 2 -p0
+%patch 3 -p0
+%patch 4 -p0
+%patch 5 -p0
+%patch 6 -p0
 
 # Remove webservices naming resources as it's generally unused
 %{__rm} -rf java/org/apache/naming/factory/webservices
 
 # Configure maven files
 %mvn_package ":tomcat-el-api" tomcat-el-api
-%mvn_alias "org.apache.tomcat:tomcat-el-api" "org.eclipse.jetty.orbit:javax.el"
+%mvn_alias "org.apache.tomcat:tomcat-el-api" "jakarta.servlet:jakarta.servlet-api"
 %mvn_package ":tomcat-jsp-api" tomcat-jsp-api
-%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "org.eclipse.jetty.orbit:javax.servlet.jsp"
+%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "jakarta.servlet:jakarta.servlet.jsp"
 %mvn_package ":tomcat-servlet-api" tomcat-servlet-api
 
+# Create a sysusers.d config file
+cat >tomcat.sysusers.conf <<EOF
+u tomcat %{tcuid} 'Apache Tomcat' %{homedir} -
+EOF
+
 
 %build
-export OPT_JAR_LIST="xalan-j2-serializer"
-# we don't care about the tarballs and we're going to replace
-# tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar
+# we don't care about the tarballs and we're going to replace jars
 # so just create a dummy file for later removal
 touch HACK
 
@@ -224,22 +228,18 @@ touch HACK
   -Dcommons-daemon.native.win.mgr.exe="HACK" \
   -Dnsis.exe="HACK" \
   -Djaxrpc-lib.jar="HACK" \
-  -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
+  -Dwsdl4j-lib.jar="HACK" \
   -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
-  -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \
-  -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \
-  -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
-  -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
-  -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \
-  -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \
+  -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
   -Dversion="%{version}" \
   -Dversion.build="%{micro_version}" \
+  -Dmigration-lib.jar="$(build-classpath tomcat-jakartaee-migration/jakartaee-migration.jar)" \
   deploy
 
 # remove some jars that we'll replace with symlinks later
-%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar
+%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar output/build/lib/jakartaee-migration.jar
 # Remove the example webapps per Apache Tomcat Security Considerations
-# see https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html
+# see https://tomcat.apache.org/tomcat-10.1-doc/security-howto.html
 %{__rm} -rf output/build/webapps/examples
 
 
@@ -247,7 +247,6 @@ touch HACK
 # build initial path structure
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_systemddir}
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir}
@@ -280,33 +279,33 @@ popd
     > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf
 %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
+   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE2} \
     > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
-%{__install} -m 0644 %{SOURCE4} \
+%{__install} -m 0755 %{SOURCE3} \
     ${RPM_BUILD_ROOT}%{_sbindir}/%{name}
-%{__install} -m 0644 %{SOURCE11} \
+%{__install} -m 0644 %{SOURCE7} \
     ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
-%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
+%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \
     > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled
 %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
+   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE5} \
     > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest
 %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
+   -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
     > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper
 
-%{__install} -m 0644 %{SOURCE21} \
+%{__install} -m 0644 %{SOURCE8} \
     ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions
-%{__install} -m 0755 %{SOURCE30} \
+%{__install} -m 0755 %{SOURCE9} \
     ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble
-%{__install} -m 0755 %{SOURCE31} \
+%{__install} -m 0755 %{SOURCE10} \
     ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server
-%{__install} -m 0644 %{SOURCE32} \
+%{__install} -m 0644 %{SOURCE11} \
     ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service
 
-%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{confdir}/conf.d/
+%{__install} -m 0644 %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/
 
 # Substitute libnames in catalina-tasks.xml
 sed -i \
@@ -327,6 +326,7 @@ popd
 
 pushd output/build
     %{_bindir}/build-jar-repository lib ecj 2>&1
+    %{_bindir}/build-jar-repository lib tomcat-jakartaee-migration 2>&1
 popd
 
 pushd ${RPM_BUILD_ROOT}%{libdir}
@@ -335,6 +335,9 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
     %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar .
     %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar .
     %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar
+    %{__ln_s} $(build-classpath tomcat-jakartaee-migration/jakartaee-migration) jakartaee-migration.jar
+    
+    cp ../../%{name}/bin/tomcat-juli.jar .
 popd
 
 # symlink to the FHS locations where we've installed things
@@ -350,7 +353,7 @@ popd
 # Install the maven metadata for the spec impl artifacts as other projects use them
 #%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
 pushd res/maven
-    for pom in tomcat-el-api.pom tomcat-jsp-api.pom tomcat-servlet-api.pom; do
+    for pom in *.pom; do
         # fix-up version in all pom files
         sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom
     done
@@ -360,60 +363,65 @@ popd
 %mvn_artifact res/maven/tomcat-el-api.pom output/build/lib/el-api.jar
 %mvn_artifact res/maven/tomcat-jsp-api.pom output/build/lib/jsp-api.jar
 %mvn_artifact res/maven/tomcat-servlet-api.pom output/build/lib/servlet-api.jar
+
+%mvn_file org.apache.tomcat:tomcat-annotations-api tomcat/annotations-api
+%mvn_artifact res/maven/tomcat-annotations-api.pom ${RPM_BUILD_ROOT}%{libdir}/annotations-api.jar
+%mvn_artifact res/maven/tomcat-api.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-api.jar
+%mvn_file org.apache.tomcat:tomcat-catalina-ant tomcat/catalina-ant
+%mvn_artifact res/maven/tomcat-catalina-ant.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ant.jar
+%mvn_file org.apache.tomcat:tomcat-catalina-ha tomcat/catalina-ha
+%mvn_artifact res/maven/tomcat-catalina-ha.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ha.jar
+%mvn_file org.apache.tomcat:tomcat-catalina tomcat/catalina
+%mvn_artifact res/maven/tomcat-catalina.pom ${RPM_BUILD_ROOT}%{libdir}/catalina.jar
+%mvn_artifact res/maven/tomcat-coyote.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-coyote.jar
+%mvn_artifact res/maven/tomcat-dbcp.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-dbcp.jar
+%mvn_artifact res/maven/tomcat-i18n-cs.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-cs.jar
+%mvn_artifact res/maven/tomcat-i18n-de.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-de.jar
+%mvn_artifact res/maven/tomcat-i18n-es.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-es.jar
+%mvn_artifact res/maven/tomcat-i18n-fr.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-fr.jar
+%mvn_artifact res/maven/tomcat-i18n-ja.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ja.jar
+%mvn_artifact res/maven/tomcat-i18n-ko.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ko.jar
+%mvn_artifact res/maven/tomcat-i18n-pt-BR.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-pt-BR.jar
+%mvn_artifact res/maven/tomcat-i18n-ru.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ru.jar
+%mvn_artifact res/maven/tomcat-i18n-zh-CN.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-zh-CN.jar
+%mvn_file org.apache.tomcat:tomcat-jasper-el tomcat/jasper-el
+%mvn_artifact res/maven/tomcat-jasper-el.pom ${RPM_BUILD_ROOT}%{libdir}/jasper-el.jar
+%mvn_file org.apache.tomcat:tomcat-jasper tomcat/jasper
+%mvn_artifact res/maven/tomcat-jasper.pom ${RPM_BUILD_ROOT}%{libdir}/jasper.jar
+%mvn_file org.apache.tomcat:tomcat-jaspic-api tomcat/jaspic-api
+%mvn_artifact res/maven/tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{libdir}/jaspic-api.jar
+%mvn_artifact res/maven/tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jdbc.jar
+%mvn_artifact res/maven/tomcat-jni.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni.jar
+%mvn_artifact res/maven/tomcat-juli.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-juli.jar
+%mvn_file org.apache.tomcat:tomcat-ssi tomcat/catalina-ssi
+%mvn_artifact res/maven/tomcat-ssi.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ssi.jar
+%mvn_file org.apache.tomcat:tomcat-storeconfig tomcat/catalina-storeconfig
+%mvn_artifact res/maven/tomcat-storeconfig.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-storeconfig.jar
+%mvn_file org.apache.tomcat:tomcat-tribes tomcat/catalina-tribes
+%mvn_artifact res/maven/tomcat-tribes.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-tribes.jar
+%mvn_artifact res/maven/tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util-scan.jar
+%mvn_artifact res/maven/tomcat-util.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util.jar
+%mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api
+%mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar
+%mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar
+%mvn_artifact res/maven/tomcat-websocket-client-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-client-api.jar
+%mvn_artifact res/maven/tomcat.pom
+
 %mvn_install
 
-%pre
-# add the tomcat user and group
-getent group tomcat >/dev/null || %{_sbindir}/groupadd -f -g %{tcuid} -r tomcat
-if ! getent passwd tomcat >/dev/null ; then
-    if ! getent passwd %{tcuid} >/dev/null ; then
-        %{_sbindir}/useradd -r -u %{tcuid} -g tomcat -d %{homedir} -s /sbin/nologin -c "Apache Tomcat" tomcat
-        # Tomcat uses a reserved ID, so there should never be an else
-    fi
-fi
-exit 0
+install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf
 
 %post
 # install but don't activate
 %systemd_post %{name}.service
 
-%post jsp-%{jspspec}-api
-%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
-    %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200
-
-%post servlet-%{servletspec}-api
-%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
-    %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
-
-%post el-%{elspec}-api
-%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
-   %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
-
 %preun
 # clean tempdir and workdir on removal or upgrade
 %{__rm} -rf %{workdir}/* %{tempdir}/*
 %systemd_preun %{name}.service
 
 %postun
-%systemd_postun_with_restart %{name}.service 
-
-%postun jsp-%{jspspec}-api
-if [ "$1" = "0" ]; then
-    %{_sbindir}/update-alternatives --remove jsp \
-        %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
-fi
-
-%postun servlet-%{servletspec}-api
-if [ "$1" = "0" ]; then
-    %{_sbindir}/update-alternatives --remove servlet \
-        %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
-fi
-
-%postun el-%{elspec}-api
-if [ "$1" = "0" ]; then
-    %{_sbindir}/update-alternatives --remove elspec \
-        %{_javadir}/%{name}-el-%{elspec}-api.jar
-fi
+%systemd_postun_with_restart %{name}.service
 
 %files 
 %defattr(0664,root,tomcat,0755)
@@ -447,7 +455,7 @@ fi
 %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
 %attr(0755,root,tomcat) %dir %{confdir}/conf.d
 %{confdir}/conf.d/README
-%{confdir}/conf.d/java-9-start-up-parameters.conf
+%{confdir}/conf.d/module-start-up-parameters.conf
 %config(noreplace) %{confdir}/%{name}.conf
 %config(noreplace) %{confdir}/*.policy
 %config(noreplace) %{confdir}/*.properties
@@ -467,6 +475,7 @@ fi
 %{homedir}/work
 %{homedir}/logs
 %{homedir}/conf
+%{_sysusersdir}/tomcat.conf
 
 %files admin-webapps
 %defattr(0664,root,tomcat,0755)
@@ -476,33 +485,162 @@ fi
 %files docs-webapp
 %{appdir}/docs
 
-%files lib
+%files lib -f .mfiles
 %dir %{libdir}
 %{libdir}/*.jar
 %{_javadir}/*.jar
 %{bindir}/tomcat-juli.jar
 %exclude %{libdir}/%{name}-el-%{elspec}-api.jar
+%exclude %{libdir}/%{name}-servlet-%{servletspec}*.jar
+%exclude %{libdir}/%{name}-jsp-%{jspspec}*.jar
 %exclude %{_javadir}/%{name}-servlet-%{servletspec}*.jar
 %exclude %{_javadir}/%{name}-el-%{elspec}-api.jar
 %exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar
+%exclude %{_javadir}/%{name}-servlet-api.jar
+%exclude %{_javadir}/%{name}-el-api.jar
+%exclude %{_javadir}/%{name}-jsp-api.jar
+%exclude %{_jnidir}/*
 
 %files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api
 %{_javadir}/%{name}-jsp-%{jspspec}*.jar
+%{libdir}/%{name}-jsp-%{jspspec}*.jar
+%{_javadir}/%{name}-jsp-api.jar
 
 %files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api
 %doc LICENSE
 %{_javadir}/%{name}-servlet-%{servletspec}*.jar
+%{libdir}/%{name}-servlet-%{servletspec}*.jar
+%{_javadir}/%{name}-servlet-api.jar
 
 %files el-%{elspec}-api -f .mfiles-tomcat-el-api
 %doc LICENSE
 %{_javadir}/%{name}-el-%{elspec}-api.jar
 %{libdir}/%{name}-el-%{elspec}-api.jar
+%{_javadir}/%{name}-el-api.jar
 
 %files webapps
 %defattr(0644,tomcat,tomcat,0755)
 %{appdir}/ROOT
 
 %changelog
+* Thu Sep 25 2025 Adam Williamson <awilliam@redhat.com> - 1:10.1.46-2
+- Drop now-unnecessary version bounds in java requirements
+- Specify java-25-headless, not java-headless (#2398212)
+
+* Fri Sep 12 2025 Dimitris Soumis <dsoumis@redhat.com> - 1:10.1.46-1
+- Update to version 10.1.46
+
+* Tue Aug 19 2025 Dimitris Soumis <dsoumis@redhat.com> - 1:10.1.43-7
+- Add virtual provides to resolve installability issues
+
+* Thu Aug 14 2025 Dimitris Soumis <dsoumis@redhat.com> - 1:10.1.43-6
+- Rebuilt for the side tag f43-build-side-116701
+
+* Tue Jul 29 2025 Dimitris Soumis <dsoumis@redhat.com> - 1:10.1.43-5
+- Rebuilt for the side tag f43-build-side-114811
+
+* Fri Jan 10 2025 Dimitris Soumis <dsoumis@redhat.com> - 1:10.1.34-1
+- Update to version 10.1.34
+
+* Mon Dec 09 2024 Packit <hello@packit.dev> - 1:9.0.98-1
+- Update to version 9.0.98
+- Resolves: rhbz#2331168
+
+* Mon Dec 02 2024 Dimitris Soumis <dsoumis@redhat.com> - 1:9.0.97-1
+- Update to version 9.0.97
+- Resolves: rhbz#2327090
+
+* Tue Oct 08 2024 Packit <hello@packit.dev> - 1:9.0.96-1
+- Update to version 9.0.96
+- Resolves: rhbz#2317237
+
+* Tue Sep 17 2024 Packit <hello@packit.dev> - 1:9.0.95-1
+- Update to version 9.0.95
+- Resolves: rhbz#2312858
+
+* Tue Sep 10 2024 Packit <hello@packit.dev> - 1:9.0.94-1
+- Update to version 9.0.94
+- Resolves: rhbz#2311320
+
+* Tue Aug 06 2024 Packit <hello@packit.dev> - 1:9.0.93-1
+- Update to version 9.0.93
+- Resolves: rhbz#2303026
+
+* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 1:9.0.91-1
+- convert license to SPDX
+
+* Thu Jul 11 2024 Dimitris Soumis <dsoumis@redhat.com> - 1:9.0.91-1
+- Update to 9.0.91
+
+* Thu Jun 20 2024 Dimitris Soumis <dsoumis@redhat.com> - 1:9.0.90-1
+- Update to 9.0.90
+
+* Fri Jun 7 2024 Dimitris Soumis <dsoumis@redhat.com> - 1:9.0.89-1
+- Update to 9.0.89 
+
+* Thu Feb 29 2024 Adam Williamson <awilliam@redhat.com> - 1:9.0.83-4
+- Accept java-21-headless as one of the alternatives for java
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1:9.0.83-3
+- Rebuilt for java-21-openjdk as system jdk
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:9.0.83-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Dec 01 2023 Hui Wang <huwang@redhat.com> - 1:9.0.83-1
+- Update to 9.0.83
+
+* Mon Oct 16 2023 Hui Wang <huwang@redhat.com> - 1:9.0.82-1
+- Update to 9.0.82
+- Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9
+
+* Wed Sep 13 2023 Hui Wang <huwang@redhat.com> - 1:9.0.80-1
+- Update to 9.0.80
+- Fix java version
+
+* Fri Aug 04 2023 Hui Wang <huwang@redhat.com> - 1:9.0.78-4
+- Fix files permission
+
+* Wed Jul 26 2023 Hui Wang <huwang@redhat.com> - 1:9.0.78-3
+- Exclude jnidir in the lib subpackage
+
+* Tue Jul 25 2023 Hui Wang <huwang@redhat.com> - 1:9.0.78-2
+- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib subpackage
+
+* Tue Jul 25 2023 Hui Wang <huwang@redhat.com> - 1:9.0.78-1
+- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage
+- Update to 9.0.78
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:9.0.76-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 20 2023 Hui Wang <huwang@redhat.com> - 1:9.0.76-2
+- Resolves: rhbz#2189672 Missing Tomcat POM files in Fedora Rawhide
+- Remove JDTCompiler patch because ecj has been update
+- Update to 9.0.76
+- Resolves: rhbz#2188218 Link bin/tomcat-juli.jar to /usr/share/java
+- Move tomcat-jsp-2.3-api.jar,tomcat-servlet-4.0-api.jar and tomcat-el-api.jar to the subpackages
+
+* Thu Jun 08 2023 Hui Wang <huwang@redhat.com> - 1:9.0.75-1
+- Update to 9.0.75
+
+* Fri Mar 17 2023 Hui Wang <huwang@redhat.com> - 1:9.0.73-1
+- Update to 9.0.73
+
+* Sun Jan 29 2023 Hui Wang <huwang@redhat.com> - 1:9.0.71-1
+- Update to 9.0.71
+- Remove osgi-annotations patch
+- Add bnd-annotation dependency which is in bndlib package 
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:9.0.70-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jan 13 2023 Hui Wang <huwang@redhat.com> - 1:9.0.70-1
+- Update to 9.0.70
+
+* Thu Nov 03 2022 Hui Wang <huwang@redhat.com> - 1:9.0.68-1
+- Update to 9.0.68
+
 * Thu Jul 21 2022 Hui Wang <huwang@redhat.com> - 1:9.0.65-1
 - Update to 9.0.65