Tony Mancill pushed to branch master at Debian Java Maintainers / qpid-proton-j-extensions
Commits: 36af6d5e by Pushkar Kulkarni at 2024-01-24T22:51:28+05:30 Adjust -source/-target using java_compat_level OpenJDK 21 removed support for -source/-target value of 7/1.7. This means packages that use 7/1.7 will not compile. Also, packages using value 8/1.8 will see a deprecation warning. java-common introduces $java_compat_level which could be used to set the appropriate value for -source/-target. Also, we can turn off the deprecation warning (and failures due to -Werror) using "-Xlint:-options". - - - - - d9e6acd5 by Tony Mancill at 2024-02-21T04:49:38+00:00 Merge branch 'fix-1057533' into 'master' Adjust -source/-target using java_compat_level See merge request java-team/qpid-proton-j-extensions!1 - - - - - 4 changed files: - debian/changelog - + debian/patches/javac-source-target.patch - + debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +qpid-proton-j-extensions (1.2.4-2) unstable; urgency=medium + + * Use java-common's java_compat_level for -source/-target (Closes: #1057533) + + -- Pushkar Kulkarni <pushkar.kulka...@canonical.com> Sun, 21 Jan 2024 13:02:49 +0530 + qpid-proton-j-extensions (1.2.4-1) unstable; urgency=medium * Initial release ===================================== debian/patches/javac-source-target.patch ===================================== @@ -0,0 +1,21 @@ +--- a/pom.xml ++++ b/pom.xml +@@ -183,6 +183,7 @@ + <arg>-Xlint:try</arg> + <arg>-Xlint:unchecked</arg> + <arg>-Xlint:varargs</arg> ++ <arg>-Xlint:-options</arg> + </compilerArgs> + </configuration> + </plugin> +@@ -357,8 +358,8 @@ + <jdk>[1.8,9)</jdk> + </activation> + <properties> +- <maven.compiler.source>8</maven.compiler.source> +- <maven.compiler.target>8</maven.compiler.target> ++ <maven.compiler.source>${env.JAVA_SOURCE_VERSION}</maven.compiler.source> ++ <maven.compiler.target>${env.JAVA_TARGET_VERSION}</maven.compiler.target> + </properties> + <build> + <plugins> ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +javac-source-target.patch ===================================== debian/rules ===================================== @@ -1,4 +1,8 @@ #!/usr/bin/make -f +include /usr/share/java/java_defaults.mk +export JAVA_SOURCE_VERSION = $(java_compat_level) +export JAVA_TARGET_VERSION = $(java_compat_level) + %: dh $@ View it on GitLab: https://salsa.debian.org/java-team/qpid-proton-j-extensions/-/compare/c5482511ac82ff8d4f3283852a26d62184b2101d...d9e6acd5733cb7650b1e3081fc2cac05f3335637 -- View it on GitLab: https://salsa.debian.org/java-team/qpid-proton-j-extensions/-/compare/c5482511ac82ff8d4f3283852a26d62184b2101d...d9e6acd5733cb7650b1e3081fc2cac05f3335637 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