[Git][java-team/tomcat9][sysvinit] make this build on bullseye

[mirabilos (@tg)]

mirabilos pushed to branch sysvinit at Debian Java Maintainers / tomcat9


Commits:
d73215c0 by mirabilos at 2022-06-04T01:04:23+02:00
make this build on bullseye

(this commit will also be needed for bullseye-security uploads)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/bullseye-build.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -14,8 +14,9 @@ tomcat9 (9.0.63-1wtf1) wtf-lts; urgency=high
     (currently only in the sysvinit script) they are created with the right
     owner and permission; the original (Closes: #987179) change did so only
     for rsyslogd users (the systemd startup scripts maybe assume rsyslogd?)
+  * d/p/bullseye-build.diff: Retrofit some anachronistic constants
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Sat, 04 Jun 2022 00:43:43 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Sat, 04 Jun 2022 01:03:47 +0200
 
 tomcat9 (9.0.63-1) unstable; urgency=medium
 


=====================================
debian/patches/bullseye-build.diff
=====================================
@@ -0,0 +1,24 @@
+# DP: make this build on bullseye when some constants were not yet added
+
+--- a/java/org/apache/jasper/compiler/JDTCompiler.java
++++ b/java/org/apache/jasper/compiler/JDTCompiler.java
+@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apa
+             } 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.apa
+                 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.


=====================================
debian/patches/series
=====================================
@@ -12,3 +12,4 @@
 0021-dont-test-unsupported-ciphers.patch
 exclude-TestJNDIRealmIntegration.patch
 disable-jacoco.patch
+bullseye-build.diff



View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/commit/d73215c057cd04c5da2d874c8d11d8360db3d88c

-- 
View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/commit/d73215c057cd04c5da2d874c8d11d8360db3d88c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220603/f26db103/attachment.htm>