Markus Koschany pushed to branch master at Debian Java Maintainers / tomcat10
Commits:
8df21b21 by Tamás J. Tóth at 2023-08-14T20:44:33+00:00
Add 0027-migration-classpath.patch
Add jakartaee-migration-1.0.6-shaded.jar (provided by the
tomcat-jakartaee-migration package) to the classpath so that
deployment-time migration works. Add the package as a
recommended package to tomcat10-common.
- - - - -
3577e2a0 by Tamás J. Tóth at 2023-08-14T20:46:35+00:00
Make webapps-javaee read/write under systemd
The deployment-time migration tries to write there.
- - - - -
2468e2f7 by Markus Koschany at 2023-08-15T13:12:08+00:00
Merge branch 'master' into 'master'
Make deployment-time migration work
See merge request java-team/tomcat10!1
- - - - -
3 changed files:
- debian/control
- + debian/patches/0027-migration-classpath.patch
- debian/tomcat10.service
Changes:
=====================================
debian/control
=====================================
@@ -37,6 +37,7 @@ Depends:
default-jre-headless | java11-runtime-headless | java11-runtime,
libtomcat10-java (>= ${source:Version}),
${misc:Depends}
+Recommends: tomcat-jakartaee-migration
Description: Apache Tomcat 10 - Servlet and JSP engine -- common files
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
specifications from Oracle, and provides a "pure Java" HTTP web
@@ -44,6 +45,9 @@ Description: Apache Tomcat 10 - Servlet and JSP engine --
common files
.
This package contains common files needed by the tomcat10 and tomcat10-user
packages (Tomcat 10 scripts and libraries).
+ .
+ Install the recommended tomcat-jakartaee-migration package if you need
+ deployment-time migration.
Package: tomcat10
Architecture: all
=====================================
debian/patches/0027-migration-classpath.patch
=====================================
@@ -0,0 +1,23 @@
+Description: Add tomcat-jakartaee-migration to classpath
+ Add jakartaee-migration-1.0.6-shaded.jar (provided by the
+ tomcat-jakartaee-migration package) to the classpath so that
+ deployment-time migration works.
+Author: Tamás J. Tóth (debreport...@jnet.hu)
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040226
+Forwarded: not-needed
+Last-Update: 2023-08-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: debian-tomcat10/bin/catalina.sh
+===================================================================
+--- debian-tomcat10.orig/bin/catalina.sh
++++ debian-tomcat10/bin/catalina.sh
+@@ -211,7 +211,7 @@ fi
+ if [ ! -z "$CLASSPATH" ] ; then
+ CLASSPATH="$CLASSPATH":
+ fi
+-CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar
++CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar:/usr/share/tomcat-jakartaee-migration/lib/jakartaee-migration-1.0.6-shaded.jar
+
+ if [ -z "$CATALINA_OUT" ] ; then
+ CATALINA_OUT="$CATALINA_BASE"/logs/catalina.out
=====================================
debian/tomcat10.service
=====================================
@@ -37,6 +37,7 @@ CacheDirectoryMode=750
ProtectSystem=strict
ReadWritePaths=/etc/tomcat10/Catalina/
ReadWritePaths=/var/lib/tomcat10/webapps/
+ReadWritePaths=/var/lib/tomcat10/webapps-javaee/
ReadWritePaths=/var/log/tomcat10/
[Install]
View it on GitLab:
https://salsa.debian.org/java-team/tomcat10/-/compare/ff430840b08b7d39a3f6b42020cc4c53a70b2d2d...2468e2f73a64aebac9b0c0d03dab6f6175e8bf2c
--
View it on GitLab:
https://salsa.debian.org/java-team/tomcat10/-/compare/ff430840b08b7d39a3f6b42020cc4c53a70b2d2d...2468e2f73a64aebac9b0c0d03dab6f6175e8bf2c
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
