From 62ddc060c11059544a871b23e7bdbfbcd88f9032 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 21:32:02 +0100 Subject: [PATCH 01/21] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- tomcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 74eb1ea..f400708 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Sat Mar 02 2024 Jiri Vanek - 1:9.0.83-3 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 1:9.0.83-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 19bcaaf7bf79957b874038d54b921846a01f2d4d Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 24 May 2024 13:29:46 +0300 Subject: [PATCH 02/21] Update to 10.1.24 --- java-9-start-up-parameters.conf | 7 - module-start-up-parameters.conf | 7 + rhbz-1857043.patch | 29 ++-- sources | 2 +- tomcat-10.1-JDTCompiler.patch | 46 ++++++ ....patch => tomcat-10.1-bnd-annotation.patch | 0 ...=> tomcat-10.1-bootstrap-MANIFEST.MF.patch | 0 tomcat-10.1-catalina-policy.patch | 17 +++ ...digest.script => tomcat-10.1-digest.script | 0 ...h => tomcat-10.1-tomcat-users-webapp.patch | 0 ....script => tomcat-10.1-tool-wrapper.script | 0 tomcat-9.0.conf => tomcat-10.1.conf | 15 +- tomcat-9.0.logrotate => tomcat-10.1.logrotate | 0 tomcat-9.0.service => tomcat-10.1.service | 0 tomcat-9.0.sysconfig => tomcat-10.1.sysconfig | 0 tomcat-9.0.wrapper => tomcat-10.1.wrapper | 0 tomcat-9.0-JDTCompiler.patch | 24 --- tomcat-9.0-catalina-policy.patch | 25 ---- tomcat-9.0-log4j.properties | 11 -- tomcat.spec | 141 ++++++++---------- 20 files changed, 151 insertions(+), 173 deletions(-) delete mode 100644 java-9-start-up-parameters.conf create mode 100644 module-start-up-parameters.conf create mode 100644 tomcat-10.1-JDTCompiler.patch rename tomcat-9.0-bnd-annotation.patch => tomcat-10.1-bnd-annotation.patch (100%) rename tomcat-9.0-bootstrap-MANIFEST.MF.patch => tomcat-10.1-bootstrap-MANIFEST.MF.patch (100%) create mode 100644 tomcat-10.1-catalina-policy.patch rename tomcat-9.0-digest.script => tomcat-10.1-digest.script (100%) rename tomcat-9.0-tomcat-users-webapp.patch => tomcat-10.1-tomcat-users-webapp.patch (100%) rename tomcat-9.0-tool-wrapper.script => tomcat-10.1-tool-wrapper.script (100%) rename tomcat-9.0.conf => tomcat-10.1.conf (73%) rename tomcat-9.0.logrotate => tomcat-10.1.logrotate (100%) rename tomcat-9.0.service => tomcat-10.1.service (100%) rename tomcat-9.0.sysconfig => tomcat-10.1.sysconfig (100%) rename tomcat-9.0.wrapper => tomcat-10.1.wrapper (100%) delete mode 100644 tomcat-9.0-JDTCompiler.patch delete mode 100644 tomcat-9.0-catalina-policy.patch delete mode 100644 tomcat-9.0-log4j.properties diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf deleted file mode 100644 index 341e077..0000000 --- a/java-9-start-up-parameters.conf +++ /dev/null @@ -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 diff --git a/module-start-up-parameters.conf b/module-start-up-parameters.conf new file mode 100644 index 0000000..ba35e23 --- /dev/null +++ b/module-start-up-parameters.conf @@ -0,0 +1,7 @@ +# 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 diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index dd74c3b..dd2a38c 100644 --- a/rhbz-1857043.patch +++ b/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-05-09 20:41:23.000000000 +0300 ++++ build.xml 2024-05-22 17:26:11.558331902 +0300 +@@ -1111,7 +1111,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 ++ addOSGi="false" /> + + + + addOSGi="false" /> @@ -58,7 +65,7 @@ diff -up ./build.xml.orig ./build.xml = 1:4.10 +BuildRequires: ant >= 1.10.2 +BuildRequires: ecj >= 4.20 BuildRequires: findutils -BuildRequires: java-devel >= 1:1.8.0 +BuildRequires: java-devel >= 17 BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd +BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8) +Requires: (java-headless >= 11 or java >= 11) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -135,7 +137,7 @@ 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 +Obsoletes: %{name}-jsp-2.3-api Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} @@ -147,7 +149,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 +Requires: tomcat-jakartaee-migration Requires(preun): coreutils %description lib @@ -156,9 +159,7 @@ 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 %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -166,7 +167,7 @@ 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 %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -189,6 +190,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch 2 -p0 %patch 3 -p0 %patch 4 -p0 +%patch 5 -p0 %patch 6 -p0 # Remove webservices naming resources as it's generally unused @@ -196,14 +198,13 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # 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 - %build -export OPT_JAR_LIST="xalan-j2-serializer" +#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 # so just create a dummy file for later removal @@ -225,12 +226,13 @@ touch HACK -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 @@ -238,7 +240,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} @@ -271,33 +272,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 \ @@ -318,6 +319,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} @@ -326,6 +328,7 @@ 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 @@ -394,6 +397,7 @@ popd %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 @@ -413,18 +417,6 @@ exit 0 # 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}/* @@ -433,24 +425,6 @@ exit 0 %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 - %files %defattr(0664,root,tomcat,0755) %doc {LICENSE,NOTICE,RELEASE*} @@ -483,7 +457,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 @@ -550,6 +524,9 @@ fi %{appdir}/ROOT %changelog +* Fri May 31 2024 Dimitris Soumis - 1:10.1.24-1 +- Update to 10.1.24 + * Sat Mar 02 2024 Jiri Vanek - 1:9.0.83-3 - Rebuilt for java-21-openjdk as system jdk From e035bd3ae4307e8580a2f56988fc5b9752a0d7a1 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 7 Jun 2024 16:10:44 +0300 Subject: [PATCH 03/21] Revert "Update to 10.1.24" This reverts commit 19bcaaf7bf79957b874038d54b921846a01f2d4d. --- java-9-start-up-parameters.conf | 7 + module-start-up-parameters.conf | 7 - rhbz-1857043.patch | 29 ++-- sources | 2 +- tomcat-10.1-JDTCompiler.patch | 46 ------ tomcat-10.1-catalina-policy.patch | 17 --- tomcat-9.0-JDTCompiler.patch | 24 +++ ...n.patch => tomcat-9.0-bnd-annotation.patch | 0 ... => tomcat-9.0-bootstrap-MANIFEST.MF.patch | 0 tomcat-9.0-catalina-policy.patch | 25 ++++ ...-digest.script => tomcat-9.0-digest.script | 0 tomcat-9.0-log4j.properties | 11 ++ ...ch => tomcat-9.0-tomcat-users-webapp.patch | 0 ...r.script => tomcat-9.0-tool-wrapper.script | 0 tomcat-10.1.conf => tomcat-9.0.conf | 15 +- tomcat-10.1.logrotate => tomcat-9.0.logrotate | 0 tomcat-10.1.service => tomcat-9.0.service | 0 tomcat-10.1.sysconfig => tomcat-9.0.sysconfig | 0 tomcat-10.1.wrapper => tomcat-9.0.wrapper | 0 tomcat.spec | 141 ++++++++++-------- 20 files changed, 173 insertions(+), 151 deletions(-) create mode 100644 java-9-start-up-parameters.conf delete mode 100644 module-start-up-parameters.conf delete mode 100644 tomcat-10.1-JDTCompiler.patch delete mode 100644 tomcat-10.1-catalina-policy.patch create mode 100644 tomcat-9.0-JDTCompiler.patch rename tomcat-10.1-bnd-annotation.patch => tomcat-9.0-bnd-annotation.patch (100%) rename tomcat-10.1-bootstrap-MANIFEST.MF.patch => tomcat-9.0-bootstrap-MANIFEST.MF.patch (100%) create mode 100644 tomcat-9.0-catalina-policy.patch rename tomcat-10.1-digest.script => tomcat-9.0-digest.script (100%) create mode 100644 tomcat-9.0-log4j.properties rename tomcat-10.1-tomcat-users-webapp.patch => tomcat-9.0-tomcat-users-webapp.patch (100%) rename tomcat-10.1-tool-wrapper.script => tomcat-9.0-tool-wrapper.script (100%) rename tomcat-10.1.conf => tomcat-9.0.conf (73%) rename tomcat-10.1.logrotate => tomcat-9.0.logrotate (100%) rename tomcat-10.1.service => tomcat-9.0.service (100%) rename tomcat-10.1.sysconfig => tomcat-9.0.sysconfig (100%) rename tomcat-10.1.wrapper => tomcat-9.0.wrapper (100%) diff --git a/java-9-start-up-parameters.conf b/java-9-start-up-parameters.conf new file mode 100644 index 0000000..341e077 --- /dev/null +++ b/java-9-start-up-parameters.conf @@ -0,0 +1,7 @@ +# 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 diff --git a/module-start-up-parameters.conf b/module-start-up-parameters.conf deleted file mode 100644 index ba35e23..0000000 --- a/module-start-up-parameters.conf +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index dd2a38c..dd74c3b 100644 --- a/rhbz-1857043.patch +++ b/rhbz-1857043.patch @@ -1,6 +1,7 @@ ---- build.xml.orig 2024-05-09 20:41:23.000000000 +0300 -+++ build.xml 2024-05-22 17:26:11.558331902 +0300 -@@ -1111,7 +1111,7 @@ +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 @@ filesDir="${tomcat.classes}" filesId="files.annotations-api" manifest="${tomcat.manifests}/annotations-api.jar.manifest" @@ -9,7 +10,7 @@ -+ addOSGi="false" /> - - - + addOSGi="false" /> @@ -65,7 +58,7 @@ = 1.10.2 -BuildRequires: ecj >= 4.20 +BuildRequires: ant +BuildRequires: ecj >= 1:4.10 BuildRequires: findutils -BuildRequires: java-devel >= 17 +BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd -BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 11 or java >= 11) +Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -137,7 +135,7 @@ 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.3-api +Obsoletes: %{name}-jsp-2.2-api Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} @@ -149,8 +147,7 @@ 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 >= 4.20 -Requires: tomcat-jakartaee-migration +Requires: ecj >= 1:4.10 Requires(preun): coreutils %description lib @@ -159,7 +156,9 @@ 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} -Obsoletes: %{name}-servlet-4.0-api +Provides: servlet6 +Provides: servlet3 +Obsoletes: %{name}-servlet-3.1-api %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -167,7 +166,7 @@ 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-3.0-api +Obsoletes: %{name}-el-2.2-api %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -190,7 +189,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch 2 -p0 %patch 3 -p0 %patch 4 -p0 -%patch 5 -p0 %patch 6 -p0 # Remove webservices naming resources as it's generally unused @@ -198,13 +196,14 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " # Configure maven files %mvn_package ":tomcat-el-api" tomcat-el-api -%mvn_alias "org.apache.tomcat:tomcat-el-api" "jakarta.servlet:jakarta.servlet-api" +%mvn_alias "org.apache.tomcat:tomcat-el-api" "org.eclipse.jetty.orbit:javax.el" %mvn_package ":tomcat-jsp-api" tomcat-jsp-api -%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "jakarta.servlet:jakarta.servlet.jsp" +%mvn_alias "org.apache.tomcat:tomcat-jsp-api" "org.eclipse.jetty.orbit:javax.servlet.jsp" %mvn_package ":tomcat-servlet-api" tomcat-servlet-api + %build -#export OPT_JAR_LIST="xalan-j2-serializer" +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 # so just create a dummy file for later removal @@ -226,13 +225,12 @@ touch HACK -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 output/build/lib/jakartaee-migration.jar +%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar # Remove the example webapps per Apache Tomcat Security Considerations -# see https://tomcat.apache.org/tomcat-10.1-doc/security-howto.html +# see https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html %{__rm} -rf output/build/webapps/examples @@ -240,6 +238,7 @@ 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} @@ -272,33 +271,33 @@ popd > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE2} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} -%{__install} -m 0755 %{SOURCE3} \ +%{__install} -m 0644 %{SOURCE4} \ ${RPM_BUILD_ROOT}%{_sbindir}/%{name} -%{__install} -m 0644 %{SOURCE7} \ +%{__install} -m 0644 %{SOURCE11} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service -%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE4} \ +%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}.disabled %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE5} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ - -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \ > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper -%{__install} -m 0644 %{SOURCE8} \ +%{__install} -m 0644 %{SOURCE21} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions -%{__install} -m 0755 %{SOURCE9} \ +%{__install} -m 0755 %{SOURCE30} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble -%{__install} -m 0755 %{SOURCE10} \ +%{__install} -m 0755 %{SOURCE31} \ ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server -%{__install} -m 0644 %{SOURCE11} \ +%{__install} -m 0644 %{SOURCE32} \ ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service - -%{__install} -m 0644 %{SOURCE12} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ + +%{__install} -m 0644 %{SOURCE33} ${RPM_BUILD_ROOT}%{confdir}/conf.d/ # Substitute libnames in catalina-tasks.xml sed -i \ @@ -319,7 +318,6 @@ 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} @@ -328,7 +326,6 @@ 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 @@ -397,7 +394,6 @@ popd %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 @@ -417,6 +413,18 @@ exit 0 # 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}/* @@ -425,6 +433,24 @@ exit 0 %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 + %files %defattr(0664,root,tomcat,0755) %doc {LICENSE,NOTICE,RELEASE*} @@ -457,7 +483,7 @@ exit 0 %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost %attr(0755,root,tomcat) %dir %{confdir}/conf.d %{confdir}/conf.d/README -%{confdir}/conf.d/module-start-up-parameters.conf +%{confdir}/conf.d/java-9-start-up-parameters.conf %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties @@ -524,9 +550,6 @@ exit 0 %{appdir}/ROOT %changelog -* Fri May 31 2024 Dimitris Soumis - 1:10.1.24-1 -- Update to 10.1.24 - * Sat Mar 02 2024 Jiri Vanek - 1:9.0.83-3 - Rebuilt for java-21-openjdk as system jdk From 4e42dab0c0888c1eb12b5fee717d355f7aa4abe9 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 7 Jun 2024 16:12:57 +0300 Subject: [PATCH 04/21] Revert 10.1.24 update, rebase to 9.0.89 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4196751..a23d2c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.83-src.tar.gz) = 28e112a9d01918434ad03c414058275bbc4e34be408c2cfe2d819c3a08cadc3c31920e279c5312529aa2f5abf1e002537012c5f06d43ba8894448afd5585c231 +SHA512 (apache-tomcat-9.0.89-src.tar.gz) = c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1 diff --git a/tomcat.spec b/tomcat.spec index f400708..0b0026a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 83 +%global micro_version 89 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Fri Jun 7 2024 Dimitris Soumis - 1:9.0.89-1 +- Update to 9.0.89 + * Sat Mar 02 2024 Jiri Vanek - 1:9.0.83-3 - Rebuilt for java-21-openjdk as system jdk From b2dffed0fe9f36896d939e824b3c2aafd4c4863b Mon Sep 17 00:00:00 2001 From: Dimitris Soumis Date: Fri, 7 Jun 2024 18:04:56 +0300 Subject: [PATCH 05/21] Fix the release version of 9.0.89 --- tomcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.spec b/tomcat.spec index 0b0026a..2af0af7 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 From 7a65d7945eb0dd533914896c138819e23e237e0e Mon Sep 17 00:00:00 2001 From: dsoumis Date: Thu, 20 Jun 2024 13:29:56 +0300 Subject: [PATCH 06/21] Update to 9.0.90 --- sources | 2 +- tomcat.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a23d2c8..6bccc7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.89-src.tar.gz) = c2e8e45a98cd30764b507bb997c7cf1b8e337be9c6d1833bb5f916a5d86d96cb095f430884d0a248cdc3b510beb11e227cc160f8402ba5b2e3952399a44461d1 +SHA512 (apache-tomcat-9.0.90-src.tar.gz) = ade9eda20fe137080eb4fb43a36e510025822acabaf5564a950d24eded491e3f8846dff6ab6382716cd2f3aa676e4f134d28d7c1fa5f9d89230aa600d18071cb diff --git a/tomcat.spec b/tomcat.spec index 2af0af7..e27bba2 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 89 +%global micro_version 90 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Thu Jun 20 2024 Dimitris Soumis - 1:9.0.90-1 +- Update to 9.0.90 + * Fri Jun 7 2024 Dimitris Soumis - 1:9.0.89-1 - Update to 9.0.89 From 46222133fedf189ad491940c60e7d5cb1be99107 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Thu, 11 Jul 2024 13:07:16 +0300 Subject: [PATCH 07/21] Update to 9.0.91 --- sources | 2 +- tomcat.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 6bccc7c..02d68a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.90-src.tar.gz) = ade9eda20fe137080eb4fb43a36e510025822acabaf5564a950d24eded491e3f8846dff6ab6382716cd2f3aa676e4f134d28d7c1fa5f9d89230aa600d18071cb +SHA512 (apache-tomcat-9.0.91-src.tar.gz) = 43e09871b76f63416d8ac9d4594752dba5f8335e34bceb0ef0b210f47314e922e95e0e6a2939ac4807d60d2fb5b81f03079590644fc2a9fa5d51cccfd3813ab4 diff --git a/tomcat.spec b/tomcat.spec index e27bba2..8d8fdec 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 90 +%global micro_version 91 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -56,7 +56,7 @@ 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 @@ -94,7 +94,7 @@ BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd -Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8) +Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java >= 1:1.8) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -550,6 +550,9 @@ fi %{appdir}/ROOT %changelog +* Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 +- Update to 9.0.91 + * Thu Jun 20 2024 Dimitris Soumis - 1:9.0.90-1 - Update to 9.0.90 From f3204303dd0817de48b1774b093dfc39fade865b Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 6 Aug 2024 03:32:29 +0000 Subject: [PATCH 08/21] Update to 9.0.93 upstream release - Resolves: rhbz#2303026 Upstream tag: 9.0.93 Upstream commit: a33d708d Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 02d68a0..087b80d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.91-src.tar.gz) = 43e09871b76f63416d8ac9d4594752dba5f8335e34bceb0ef0b210f47314e922e95e0e6a2939ac4807d60d2fb5b81f03079590644fc2a9fa5d51cccfd3813ab4 +SHA512 (apache-tomcat-9.0.93-src.tar.gz) = 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac diff --git a/tomcat.spec b/tomcat.spec index 8d8fdec..b30e851 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 91 +%global micro_version 93 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Tue Aug 06 2024 Packit - 1:9.0.93-1 +- Update to version 9.0.93 +- Resolves: rhbz#2303026 + * Thu Jul 11 2024 Dimitris Soumis - 1:9.0.91-1 - Update to 9.0.91 From d39d771511567cf692aa06e29aa6396801be46a3 Mon Sep 17 00:00:00 2001 From: Dimitris Soumis Date: Tue, 6 Aug 2024 13:45:18 +0300 Subject: [PATCH 09/21] Fix rhbz-1857043.patch --- rhbz-1857043.patch | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch index dd74c3b..d6185aa 100644 --- a/rhbz-1857043.patch +++ b/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-03 00:24:59.000000000 +0300 ++++ build.xml 2024-08-06 13:42:04.710875124 +0300 +@@ -1110,7 +1110,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 ++ addOSGi="false" /> + + + + addOSGi="false" /> @@ -130,7 +137,7 @@ diff -up ./build.xml.orig ./build.xml Date: Tue, 10 Sep 2024 21:14:27 +0000 Subject: [PATCH 10/21] Update to 9.0.94 upstream release - Resolves: rhbz#2311320 Upstream tag: 9.0.94 Upstream commit: ce248107 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 087b80d..9db4cad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.93-src.tar.gz) = 015be491867f05ab39d1d39899fc5434516bd613b0a45e87a066fb4a6a1b5d9e2973ed370bfca86acacd55a45d6acd6354523a199a422bf506d864d43f6ddeac +SHA512 (apache-tomcat-9.0.94-src.tar.gz) = d731f4e8693326d5d9641a06ae77de9ef94088ffa0ddfdf52bcec3f5bc22c3139008750cefb156a078de0bb60d84131c3953305499a3bd912763b9a1c49504f6 diff --git a/tomcat.spec b/tomcat.spec index b30e851..1479816 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 93 +%global micro_version 94 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Tue Sep 10 2024 Packit - 1:9.0.94-1 +- Update to version 9.0.94 +- Resolves: rhbz#2311320 + * Tue Aug 06 2024 Packit - 1:9.0.93-1 - Update to version 9.0.93 - Resolves: rhbz#2303026 From b14ec454a56b22698b095ec591bbed302f2c334e Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 17 Sep 2024 14:35:20 +0000 Subject: [PATCH 11/21] Update to 9.0.95 upstream release - Resolves: rhbz#2312858 Upstream tag: 9.0.95 Upstream commit: 9f8c522e Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9db4cad..2347049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.94-src.tar.gz) = d731f4e8693326d5d9641a06ae77de9ef94088ffa0ddfdf52bcec3f5bc22c3139008750cefb156a078de0bb60d84131c3953305499a3bd912763b9a1c49504f6 +SHA512 (apache-tomcat-9.0.95-src.tar.gz) = 8ab69edd3761f2be112dbef9047cf331ad4d5ff8feb83dc35bebcdc1384853ed33313cc152f38f0604629d94e32a5eaf242a1dda8e7b04b9442dc03eb6b3b7db diff --git a/tomcat.spec b/tomcat.spec index 1479816..990e9c3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 94 +%global micro_version 95 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Tue Sep 17 2024 Packit - 1:9.0.95-1 +- Update to version 9.0.95 +- Resolves: rhbz#2312858 + * Tue Sep 10 2024 Packit - 1:9.0.94-1 - Update to version 9.0.94 - Resolves: rhbz#2311320 From 3facd9a2aa782ca35bec04c1a0d9fd355ab3a952 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 8 Oct 2024 15:02:15 +0000 Subject: [PATCH 12/21] Update to 9.0.96 upstream release - Resolves: rhbz#2317237 Upstream tag: 9.0.96 Upstream commit: 7ecea316 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2347049..3fe0723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.95-src.tar.gz) = 8ab69edd3761f2be112dbef9047cf331ad4d5ff8feb83dc35bebcdc1384853ed33313cc152f38f0604629d94e32a5eaf242a1dda8e7b04b9442dc03eb6b3b7db +SHA512 (apache-tomcat-9.0.96-src.tar.gz) = cd6d0730b2aa34520249f8285b0663f88b601ca508f8534fa948ad0a9502dd760f446b6adc930b947c310d05e33025186b88ecab71a0ea16618ae24edb0c4884 diff --git a/tomcat.spec b/tomcat.spec index 990e9c3..7da6bc8 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 95 +%global micro_version 96 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Tue Oct 08 2024 Packit - 1:9.0.96-1 +- Update to version 9.0.96 +- Resolves: rhbz#2317237 + * Tue Sep 17 2024 Packit - 1:9.0.95-1 - Update to version 9.0.95 - Resolves: rhbz#2312858 From 2047c51dacbf289b08d7f7fc76b27ef309b2d0ca Mon Sep 17 00:00:00 2001 From: Dimitris Soumis Date: Mon, 2 Dec 2024 16:03:34 +0200 Subject: [PATCH 13/21] Update to 9.0.97 upstream release --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3fe0723..5b5a264 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.96-src.tar.gz) = cd6d0730b2aa34520249f8285b0663f88b601ca508f8534fa948ad0a9502dd760f446b6adc930b947c310d05e33025186b88ecab71a0ea16618ae24edb0c4884 +SHA512 (apache-tomcat-9.0.97-src.tar.gz) = e0500e0c7e4af40f0a6db845b73f41423a7b7746e110053c36744fc376a0db96d141069035171f5b6efdf6011c155cbc29815cd286a0508cefaddb776909a00a diff --git a/tomcat.spec b/tomcat.spec index 7da6bc8..b06b920 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 96 +%global micro_version 97 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 +- Update to version 9.0.97 +- Resolves: rhbz#2327089 + * Tue Oct 08 2024 Packit - 1:9.0.96-1 - Update to version 9.0.96 - Resolves: rhbz#2317237 From 9dc14538ccf7f2bc43ad62f3da1c2d234407268b Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 9 Dec 2024 15:23:45 +0000 Subject: [PATCH 14/21] Update to 9.0.98 upstream release - Resolves: rhbz#2331168 Upstream tag: 9.0.98 Upstream commit: 727a8467 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5b5a264..18f1e2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.97-src.tar.gz) = e0500e0c7e4af40f0a6db845b73f41423a7b7746e110053c36744fc376a0db96d141069035171f5b6efdf6011c155cbc29815cd286a0508cefaddb776909a00a +SHA512 (apache-tomcat-9.0.98-src.tar.gz) = eb380dae515a259d23d5311d0b96b8ef5068c0d8d72da215410e5475582d2ff82182b7331e0d197eb993d8014a99ea40290154a343e961a07ed02be6894759cc diff --git a/tomcat.spec b/tomcat.spec index b06b920..43269f9 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 97 +%global micro_version 98 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Mon Dec 09 2024 Packit - 1:9.0.98-1 +- Update to version 9.0.98 +- Resolves: rhbz#2331168 + * Mon Dec 02 2024 Dimitris Soumis - 1:9.0.97-1 - Update to version 9.0.97 - Resolves: rhbz#2327089 From 6688d66622dfa6f2f467ef5ea79d0fb7e63e76e2 Mon Sep 17 00:00:00 2001 From: Dimitris Soumis Date: Thu, 5 Dec 2024 16:18:03 +0200 Subject: [PATCH 15/21] This pull request enables tests in the Fedora CI using `tmt` which also allows to easily execute and debug tests from your laptop: Run tests directly on your localhost: sudo dnf install -y tmt tmt run --all provision --how local Run tests in a virtual machine: sudo dnf install -y tmt+provision-virtual tmt run Check the documentation to learn more about the tool: https://docs.fedoraproject.org/en-US/ci/tmt/ --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 13 +++++++++++++ plans/javapackages.fmf | 7 +++++++ plans/smoke.fmf | 5 +++++ 5 files changed, 27 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf create mode 100644 plans/smoke.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..b81b8c4 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,13 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !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} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..a2cdaba --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f40 +execute: + how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..039f41a --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,5 @@ +discover: + how: fmf + url: https://src.fedoraproject.org/tests/tomcat +execute: + how: tmt From 7b34af624e295884bf0d5626e70eb9b3b08fe5a2 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 10 Feb 2025 12:50:44 +0000 Subject: [PATCH 16/21] Update to 9.0.99 upstream release - Resolves: rhbz#2344641 Upstream tag: 9.0.99 Upstream commit: 71451078 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 18f1e2f..f13e7ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.98-src.tar.gz) = eb380dae515a259d23d5311d0b96b8ef5068c0d8d72da215410e5475582d2ff82182b7331e0d197eb993d8014a99ea40290154a343e961a07ed02be6894759cc +SHA512 (apache-tomcat-9.0.99-src.tar.gz) = 87431afb3f7d4eaf2ede17a945f49e44f27d55af508fea901a5415f1b50e40254d344d848b34574a63ccd4dd927aa79e20dea60ab3a01f09a3a43b7d852faaf2 diff --git a/tomcat.spec b/tomcat.spec index 43269f9..90e65cc 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 98 +%global micro_version 99 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Mon Feb 10 2025 Packit - 1:9.0.99-1 +- Update to version 9.0.99 +- Resolves: rhbz#2344641 + * Mon Dec 09 2024 Packit - 1:9.0.98-1 - Update to version 9.0.98 - Resolves: rhbz#2331168 From 4b0799e2ff53d5ba9ab8e1db83e3ec19c5ada8c4 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 17 Feb 2025 10:56:48 +0000 Subject: [PATCH 17/21] Update to 9.0.100 upstream release - Resolves: rhbz#2346089 Upstream tag: 9.0.100 Upstream commit: ef8388bc Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f13e7ab..001035f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.99-src.tar.gz) = 87431afb3f7d4eaf2ede17a945f49e44f27d55af508fea901a5415f1b50e40254d344d848b34574a63ccd4dd927aa79e20dea60ab3a01f09a3a43b7d852faaf2 +SHA512 (apache-tomcat-9.0.100-src.tar.gz) = 0fb016596d1c71da54c7bae8b2b1d5976247127b120234292e96d72d7d244abd9eb0d8f44a1c93eaff853ecf091be34087c113058ae12e9d4dbadc77673b1522 diff --git a/tomcat.spec b/tomcat.spec index 90e65cc..63cc97d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 99 +%global micro_version 100 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Mon Feb 17 2025 Packit - 1:9.0.100-1 +- Update to version 9.0.100 +- Resolves: rhbz#2346089 + * Mon Feb 10 2025 Packit - 1:9.0.99-1 - Update to version 9.0.99 - Resolves: rhbz#2344641 From abdbe017d7156f51dcf3cb11167f080558b1f03b Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 6 Mar 2025 11:36:17 +0000 Subject: [PATCH 18/21] Update to 9.0.102 upstream release - Resolves: rhbz#2350305 Upstream tag: 9.0.102 Upstream commit: 2a833768 Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 001035f..08f22de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.100-src.tar.gz) = 0fb016596d1c71da54c7bae8b2b1d5976247127b120234292e96d72d7d244abd9eb0d8f44a1c93eaff853ecf091be34087c113058ae12e9d4dbadc77673b1522 +SHA512 (apache-tomcat-9.0.102-src.tar.gz) = 2f06b1432a217470097704040cd7aed70e169981140f78c6fd6d46d55b2fd36fa174d85f34f288138f9373469d8c98cddeb3cd030c76dc69c724ab3e3b978095 diff --git a/tomcat.spec b/tomcat.spec index 63cc97d..ea8042b 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 100 +%global micro_version 102 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Thu Mar 06 2025 Packit - 1:9.0.102-1 +- Update to version 9.0.102 +- Resolves: rhbz#2350305 + * Mon Feb 17 2025 Packit - 1:9.0.100-1 - Update to version 9.0.100 - Resolves: rhbz#2346089 From 991cc06bf766d676d2b006365febb347e7b8e94b Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 25 Apr 2025 14:37:55 +0300 Subject: [PATCH 19/21] Fix gating rules --- gating.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gating.yaml b/gating.yaml index b81b8c4..19d2681 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,13 +1,16 @@ --- !Policy product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable + - fedora-rawhide +decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: - !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} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} \ No newline at end of file From e4c2960cc0cc6010c97869cfcec8d3b8a650bc49 Mon Sep 17 00:00:00 2001 From: dsoumis Date: Fri, 25 Apr 2025 14:46:54 +0300 Subject: [PATCH 20/21] Fix gating rules --- gating.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gating.yaml b/gating.yaml index 19d2681..da1c0b0 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,6 +5,7 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule { test_case_name: fedora-ci.koji-build./plans/smoke.functional } --- !Policy product_versions: - fedora-* @@ -12,5 +13,4 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} \ No newline at end of file From 7799f5f24bef198123719e163fbca592ae6ccbbe Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 9 Apr 2025 21:07:47 +0000 Subject: [PATCH 21/21] Update to 9.0.104 upstream release - Resolves: rhbz#2358742 Upstream tag: 9.0.104 Upstream commit: f8cfae0a Commit authored by Packit automation (https://packit.dev/) --- sources | 2 +- tomcat.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 08f22de..eb94083 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.102-src.tar.gz) = 2f06b1432a217470097704040cd7aed70e169981140f78c6fd6d46d55b2fd36fa174d85f34f288138f9373469d8c98cddeb3cd030c76dc69c724ab3e3b978095 +SHA512 (apache-tomcat-9.0.104-src.tar.gz) = d2d66a1e0bf55cd6379154a023aaccec5e4007a95412e7207ecf729d315c6afdc3125a985cdf1289ad66162a180f24798161436e99d792e24deee71aaf521a4c diff --git a/tomcat.spec b/tomcat.spec index ea8042b..0335af1 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 102 +%global micro_version 104 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,10 @@ fi %{appdir}/ROOT %changelog +* Wed Apr 09 2025 Packit - 1:9.0.104-1 +- Update to version 9.0.104 +- Resolves: rhbz#2358742 + * Thu Mar 06 2025 Packit - 1:9.0.102-1 - Update to version 9.0.102 - Resolves: rhbz#2350305