Tony Mancill pushed to branch master at Debian Java Maintainers / commons-pool
Commits: d2a6e05c by Vladimir Petko at 2024-01-09T12:18:53+13:00 d/p/s, d/p/02_add_release_option.patch: pass -release option to javac - - - - - a05111ff by Vladimir Petko at 2024-01-09T12:19:10+13:00 d/rules: Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java. - - - - - b295cf70 by Vladimir Petko at 2024-01-09T12:28:41+13:00 changelog - - - - - 444da32b by Tony Mancill at 2024-01-09T04:21:10+00:00 Merge branch 'master' into 'master' Resolve Java 21 ftbfs See merge request java-team/commons-pool!2 - - - - - 4 changed files: - debian/changelog - + debian/patches/02_add_release_option.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +commons-pool (1.6-5) UNRELEASED; urgency=medium + + * Resolve Java 21 ftbfs (Closes: #1057497): + - d/rules: use java_compat_level variable provided by java-common to + pass minimum release level required by the default Java. + - d/p/02_add_release_option.patch: pass release option to javac + command. + + -- Vladimir Petko <vladimir.pe...@canonical.com> Tue, 09 Jan 2024 12:20:29 +1300 + commons-pool (1.6-4) unstable; urgency=medium * Removed Damien Raude-Morvan from the uploaders (Closes: #889330) ===================================== debian/patches/02_add_release_option.patch ===================================== @@ -0,0 +1,24 @@ +Description: pass -release option to build.xml + Workaround breaking Java 21 API changes by passing -release option + with the minimum supported release. +Author: Vladimir Petko <vladimir.pe...@canonical.com> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057497 +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -108,6 +108,7 @@ + debug="${javac.debug}" + deprecation="${javac.deprecation}" + optimize="${javac.optimize}" ++ release="${javac.release}" + target="${javac.target.version}" + source="${javac.src.version}"/> + </target> +@@ -119,6 +120,7 @@ + debug="${javac.debug}" + deprecation="${javac.deprecation}" + optimize="${javac.optimize}" ++ release="${javac.release}" + target="${javac.target.version}" + source="${javac.src.version}"> + <classpath> ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 01_build.patch +02_add_release_option.patch ===================================== debian/rules ===================================== @@ -1,7 +1,9 @@ #!/usr/bin/make -f +include /usr/share/java/java_defaults.mk + %: dh $@ --with maven-repo-helper override_dh_auto_build: - dh_auto_build -- dist + dh_auto_build -- dist -Djavac.release=$(java_compat_level) View it on GitLab: https://salsa.debian.org/java-team/commons-pool/-/compare/131646864ee1441da6a7f7cf6df8fea97a72b177...444da32bb401a05148a887fab571e910688d05c7 -- View it on GitLab: https://salsa.debian.org/java-team/commons-pool/-/compare/131646864ee1441da6a7f7cf6df8fea97a72b177...444da32bb401a05148a887fab571e910688d05c7 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
