Tony Mancill pushed to branch master at Debian Java Maintainers / libcommons-collections3-java
Commits: 04866f03 by Vladimir Petko at 2024-01-25T16:04:12+13:00 Use java_compat_level variable provided by java-common to set Java release level. - - - - - fca6f628 by Vladimir Petko at 2024-01-25T16:09:16+13:00 changelog - - - - - a2e72571 by Tony Mancill at 2024-01-25T06:32:41+00:00 Merge branch 'master' into 'master' fix-up changelog after rebasing # Conflicts: # debian/changelog - - - - - e19a4b25 by Tony Mancill at 2024-01-25T06:41:08+00:00 Merge branch 'master' into 'master' Resolve Java 21 FTBFS See merge request java-team/libcommons-collections3-java!4 - - - - - 3 changed files: - debian/changelog - debian/patches/java11-compatibility.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,10 @@ libcommons-collections3-java (3.2.2-3) UNRELEASED; urgency=medium + [ Vladimir Petko ] + * Use java_compat_level variable provided by java-common to set Java + release level (Closes: #1057517). + + [ Debian Janitor ] * Remove constraints unnecessary since buster (oldstable): + libcommons-collections3-java: Drop conflict with removed package libjson-java (<= 2.3-2) in Breaks. @@ -10,7 +15,7 @@ libcommons-collections3-java (3.2.2-3) UNRELEASED; urgency=medium * Bump debhelper from old 11 to 13. * Set debhelper-compat version in Build-Depends. - -- Debian Janitor <jani...@jelmer.uk> Thu, 22 Dec 2022 11:09:43 -0000 + -- Vladimir Petko <vladimir.pe...@canonical.com> Thu, 25 Jan 2024 16:05:04 +1300 libcommons-collections3-java (3.2.2-2) unstable; urgency=medium ===================================== debian/patches/java11-compatibility.patch ===================================== @@ -3,11 +3,19 @@ Author: Emmanuel Bourg <ebo...@apache.org> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -269,6 +269,7 @@ +@@ -125,6 +125,7 @@ + <javac srcdir="${source.java}" + destdir="${build.classes}" + debug="${compile.debug}" ++ release="${javac.release}" + deprecation="${compile.deprecation}" + optimize="${compile.optimize}"> + </javac> +@@ -269,6 +270,7 @@ <javac srcdir="${source.test}" destdir="${build.tests}" debug="true" -+ release="8" ++ release="${javac.release}" deprecation="false" optimize="false"> <classpath> ===================================== debian/rules ===================================== @@ -1,6 +1,7 @@ #!/usr/bin/make -f include /usr/share/dpkg/pkg-info.mk +include /usr/share/java/java_defaults.mk LAST_MODIFIED := $(shell date +%s%N | cut -c -13) @@ -8,7 +9,7 @@ LAST_MODIFIED := $(shell date +%s%N | cut -c -13) dh $@ --with maven-repo-helper override_dh_auto_build: - dh_auto_build -- jar javadoc -Dlastmodified=$(LAST_MODIFIED) -Dant.build.javac.source=6 -Dant.build.javac.target=6 + dh_auto_build -- jar javadoc -Dlastmodified=$(LAST_MODIFIED) -Djavac.release=$(java_compat_level) override_dh_auto_install: mh_installpoms -plibcommons-collections3-java View it on GitLab: https://salsa.debian.org/java-team/libcommons-collections3-java/-/compare/17fd4c3c7d1950e01ee971ec84f78803e4f1bac7...e19a4b25dec34d54ffb2f989eb5b5dfe1ccfada7 -- View it on GitLab: https://salsa.debian.org/java-team/libcommons-collections3-java/-/compare/17fd4c3c7d1950e01ee971ec84f78803e4f1bac7...e19a4b25dec34d54ffb2f989eb5b5dfe1ccfada7 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