Emmanuel Bourg pushed to branch master at Debian Java Maintainers / zookeeper
Commits: c7d80410 by Emmanuel Bourg at 2021-02-07T22:42:05+01:00 Standards-Version updated to 4.5.1 - - - - - 56adf846 by Emmanuel Bourg at 2021-02-07T23:11:24+01:00 Fixed the build failure with OpenJDK 17 (Closes: #981923) - - - - - 2086fbc1 by Emmanuel Bourg at 2021-02-07T23:16:54+01:00 Upload to unstable - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/18-java17-compatibility.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +zookeeper (3.4.13-6) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with OpenJDK 17 (Closes: #981923) + * Standards-Version updated to 4.5.1 + + -- Emmanuel Bourg <ebo...@apache.org> Sun, 07 Feb 2021 23:16:46 +0100 + zookeeper (3.4.13-5) unstable; urgency=medium [ tony mancill ] ===================================== debian/control ===================================== @@ -35,7 +35,7 @@ Build-Depends: procps, python3-all-dev, debhelper-compat (= 12) -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/java-team/zookeeper.git Vcs-Browser: https://salsa.debian.org/java-team/zookeeper Homepage: https://zookeeper.apache.org ===================================== debian/patches/18-java17-compatibility.patch ===================================== @@ -0,0 +1,31 @@ +Description: Fixes the compatibility with OpenJDK 17 +Author: Emmanuel Bourg <ebo...@apache.org> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -382,6 +382,7 @@ + + <target name="build-generated" depends="compile_jute,version-info,ivy-retrieve" > + <javac srcdir="${src_generated.dir}" destdir="${build.classes}" includeantruntime="false" ++ release="${javac.target}" + target="${javac.target}" source="${javac.source}" debug="on" classpath="${ivy.lib}/audience-annotations-${audience-annotations.version}.jar" /> + </target> + +@@ -538,7 +539,7 @@ + doctitle="${Name} ${version} API" + bottom="Copyright &copy; ${year} The Apache Software Foundation" + locale="en" +- additionalparam="-notimestamp" ++ additionalparam="-notimestamp -Xdoclint:none" + > + <packageset dir="${java.src.dir}"> + <include name="org/apache/**"/> +@@ -564,7 +565,7 @@ + doctitle="${Name} ${version} API" + bottom="Copyright &copy; ${year} The Apache Software Foundation" + locale="en" +- additionalparam="-notimestamp" ++ additionalparam="-notimestamp -Xdoclint:none" + > + + <fileset dir="${java.src.dir}"> ===================================== debian/patches/series ===================================== @@ -13,3 +13,4 @@ 15-javadoc-doclet.patch 16-ZOOKEEPER-1392.patch 17-gcc9-ftbfs-925869.patch +18-java17-compatibility.patch ===================================== debian/rules ===================================== @@ -13,8 +13,8 @@ ANT_ARGS = -Dversion=$(DEB_UPSTREAM_VERSION) \ -Divy.version=debian \ -Dapache-directory-api.version=debian \ -Divysettings.xml=/usr/share/ivy-debian-helper/ivysettings.xml \ - -Dant.build.javac.source=1.8 \ - -Dant.build.javac.target=1.8 + -Djavac.source=8 \ + -Djavac.target=8 %: dh $@ --buildsystem=ivy --with javahelper --with python3 View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/compare/ba628e377f813fd945a77bb257da104e19bccfde...2086fbc1dad9310e75005dfcf9c950a17f5b6946 -- View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/compare/ba628e377f813fd945a77bb257da104e19bccfde...2086fbc1dad9310e75005dfcf9c950a17f5b6946 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