[Git][java-team/xml-commons-external][master] 4 commits: d/rules: use java_compat_level variable provided by java-common to adjust...

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / xml-commons-external


Commits:
6e1418cb by Vladimir Petko at 2023-11-20T15:11:37+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 (Closes: #1052589)

- - - - -
38d72ca8 by Vladimir Petko at 2023-11-20T15:11:47+13:00
chngelog

- - - - -
8133b628 by Tony Mancill at 2023-11-20T05:54:02+00:00
Update bug number in changelog to 1052617

See:  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052617
- - - - -
7e584d5c by Tony Mancill at 2023-11-20T05:56:06+00:00
Merge branch 'master' into 'master'

Fix Java 21 FTBFS

See merge request java-team/xml-commons-external!1
- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+xml-commons-external (1.4.01-6) UNRELEASED; urgency=medium
+
+  * d/rules: use java_compat_level variable provided by java-common to
+    adjust -source/-target level to the minimum required by the default
+    Java (Closes: #1052617).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Mon, 20 Nov 2023 15:10:55 +1300
+
 xml-commons-external (1.4.01-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/java/java_defaults.mk
 include /usr/share/dpkg/pkg-info.mk
 
 %:
@@ -8,7 +9,7 @@ include /usr/share/dpkg/pkg-info.mk
 override_dh_auto_build:
 	# Build all classes
 	mkdir classes
-	javac -source 7 -target 7 -d classes `find org/ javax/ -name '*.java'`
+	javac -source $(java_compat_level) -target $(java_compat_level) -d classes `find org/ javax/ -name '*.java'`
 
 	# Build xml-apis-ext and xml-apis jar
 	(cd classes/; jar -cvfm ../xml-apis-ext.jar ../manifest.commons \



View it on GitLab: https://salsa.debian.org/java-team/xml-commons-external/-/compare/402aa6078aa7fc3b3a647305cf3f855fe3045f25...7e584d5ca6e58e9dde9d01957a668a8293b17fd4

-- 
View it on GitLab: https://salsa.debian.org/java-team/xml-commons-external/-/compare/402aa6078aa7fc3b3a647305cf3f855fe3045f25...7e584d5ca6e58e9dde9d01957a668a8293b17fd4
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20231120/0a0bfdc2/attachment.htm>