Tony Mancill pushed to branch master at Debian Java Maintainers / beansbinding
Commits: 10114b6a by Vladimir Petko at 2024-01-05T21:00:29+13:00 d/rules, d/p/*: pass Java source and target level on ant command line, drop java compatibility patch (Closes: #1057491). - - - - - 376aeab3 by Vladimir Petko at 2024-01-05T21:03:56+13:00 changelog - - - - - 5363051c by Tony Mancill at 2024-01-29T05:12:22+00:00 Merge branch 'master' into 'master' Resolve Java 21 ftbfs See merge request java-team/beansbinding!3 - - - - - 4 changed files: - debian/changelog - − debian/patches/java9.patch - − debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +beansbinding (1.2.1-5) UNRELEASED; urgency=medium + + * d/rules, d/p/*: pass Java source and target level on Ant command + line, drop Java compatibility patch (Closes: #1057491). + + -- Vladimir Petko <vladimir.pe...@canonical.com> Fri, 05 Jan 2024 20:58:46 +1300 + beansbinding (1.2.1-4) unstable; urgency=medium * Team upload. ===================================== debian/patches/java9.patch deleted ===================================== @@ -1,48 +0,0 @@ -From: Markus Koschany <a...@debian.org> -Date: Fri, 23 Mar 2018 14:52:39 +0100 -Subject: java9 - -Fix FTBFS with Java 9. Use source/target 1.7 at least. - -Bug-Debian: https://bugs.debian.org/893100 -Forwarded: no ---- - nbproject/build-impl.xml | 4 ++-- - nbproject/project.properties | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml -index b0d6bbe..42850a6 100644 ---- a/nbproject/build-impl.xml -+++ b/nbproject/build-impl.xml -@@ -37,8 +37,8 @@ is divided into following sections: - <property file="${user.properties.file}"/> - <!-- The two properties below are usually overridden --> - <!-- by the active platform. Just a fallback. --> -- <property name="default.javac.source" value="1.4"/> -- <property name="default.javac.target" value="1.4"/> -+ <property name="default.javac.source" value="1.7"/> -+ <property name="default.javac.target" value="1.7"/> - </target> - <target name="-init-project" depends="-pre-init,-init-private,-init-user"> - <property file="nbproject/project.properties"/> -diff --git a/nbproject/project.properties b/nbproject/project.properties -index c6490ad..3408cff 100644 ---- a/nbproject/project.properties -+++ b/nbproject/project.properties -@@ -19,12 +19,12 @@ dist.javadoc.dir=${dist.dir}/javadoc - file.reference.el.jar=lib/el.jar - jar.compress=false - javac.classpath= --javac.compilerargs=-target 1.5 -+javac.compilerargs=-target 1.7 - # Space-separated list of extra javac options - #javac.compilerargs=-Xlint:unchecked - javac.deprecation=false --javac.source=1.5 --javac.target=1.5 -+javac.source=1.7 -+javac.target=1.7 - javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ ===================================== debian/patches/series deleted ===================================== @@ -1 +0,0 @@ -java9.patch ===================================== debian/rules ===================================== @@ -1,5 +1,7 @@ #!/usr/bin/make -f +include /usr/share/java/java_defaults.mk + export JAVA_HOME=/usr/lib/jvm/default-java VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^.*:\ ([0-9\.]+)(-|\+).*/\1/') @@ -7,7 +9,10 @@ VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^.*:\ ([0-9\ dh $@ --with javahelper --with jh_maven_repo_helper override_dh_auto_build: - ant -f build.xml dist + ant -f build.xml dist \ + -Djavac.source=$(java_compat_level) \ + -Djavac.target=$(java_compat_level) \ + -Djavac.compilerargs= override_jh_installlibs: jh_installlibs --upstream-version=$(VERSION) View it on GitLab: https://salsa.debian.org/java-team/beansbinding/-/compare/660e44b1f0aa88d295e27d1cd24b76f701ac5f9b...5363051ca252a3c13bf547d1569d2a5d76b1c0d0 -- View it on GitLab: https://salsa.debian.org/java-team/beansbinding/-/compare/660e44b1f0aa88d295e27d1cd24b76f701ac5f9b...5363051ca252a3c13bf547d1569d2a5d76b1c0d0 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
