[Git][java-team/lz4-java][master] 4 commits: Use java_compat_level variable provided by java-common to adjust...

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / lz4-java


Commits:
2bd257a8 by Vladimir Petko at 2023-11-23T15:03:23+13:00
Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java.

- - - - -
838403cc by Vladimir Petko at 2023-11-23T15:07:33+13:00
d/control: require updated libmvel-java

- - - - -
d86e3451 by Vladimir Petko at 2023-11-23T15:07:49+13:00
changelog

- - - - -
ef5dcbba by Tony Mancill at 2023-11-24T16:55:52+00:00
Merge branch 'master' into 'master'

Resolve Java 21 FTBFS

See merge request java-team/lz4-java!3
- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+lz4-java (1.8.0-4) UNRELEASED; urgency=medium
+
+  * Resolve Java 21 FTBFS (Closes: #1053059).
+    - d/rules: use java_compat_level variable provided by java-common
+      to adjust -source/-target level to the minimum required by the
+      default Java.
+    - d/control: require updated libmvel-java.
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Thu, 23 Nov 2023 15:06:25 +1300
+
 lz4-java (1.8.0-3) unstable; urgency=medium
 
   * Skip tests on slow architectures to address FTBFS (Closes: #1015885)


=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends:
  junit4,
  libcarrotsearch-randomizedtesting-java (>= 2.1.17-4~),
  liblz4-dev,
- libmvel-java,
+ libmvel-java (>= 2.4.4-2~),
  librhino-java (>= 1.7.7.2-3~),
  libxxhash-dev,
  lz4,


=====================================
debian/rules
=====================================
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-
+include /usr/share/java/java_defaults.mk
 export JAVA_HOME := /usr/lib/jvm/default-java
 
 DPKG_EXPORT_BUILDFLAGS = 1
@@ -18,7 +18,7 @@ override_dh_auto_build-indep:
 	#mv dist/lz4-pure-java-*.pom dist/lz4-pure-java.pom
 
 override_dh_auto_build-arch:
-	dh_auto_build -- compile-java
+	dh_auto_build -- compile-java -Djavac.source=$(java_compat_level) -Djavac.target=$(java_compat_level)
 	gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
 	    -I$(JAVA_HOME)/include/ \
 	    -I$(JAVA_HOME)/include/linux \



View it on GitLab: https://salsa.debian.org/java-team/lz4-java/-/compare/01b5f45a7502458f6e3f45032438d6f27ff110bb...ef5dcbba45db80f348d0f430f944cc0d65a9f920

-- 
View it on GitLab: https://salsa.debian.org/java-team/lz4-java/-/compare/01b5f45a7502458f6e3f45032438d6f27ff110bb...ef5dcbba45db80f348d0f430f944cc0d65a9f920
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/20231124/f7b22f87/attachment.htm>