[Git][java-team/ca-certificates-java][master] [ Vladimir Petko ]

[Matthias Klose (@doko)]

Matthias Klose pushed to branch master at Debian Java Maintainers / ca-certificates-java


Commits:
4b822059 by Matthias Klose at 2024-01-18T10:46:55+01:00
  [ Vladimir Petko ]
  * 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: #1057495.

  [ Matthias Klose ]
  * Builld-depend on java-common.

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+ca-certificates-java (20240118) UNRELEASED; urgency=medium
+
+  [ Vladimir Petko ]
+  * 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: #1057495.
+
+  [ Matthias Klose ]
+  * Builld-depend on java-common.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 18 Jan 2024 10:40:28 +0100
+
 ca-certificates-java (20230710) unstable; urgency=medium
 
   * Add apt-utils to the test dependencies.


=====================================
debian/control
=====================================
@@ -8,6 +8,7 @@ Build-Depends:
  debhelper-compat (= 13),
  dh-sequence-javahelper,
  default-jdk-headless,
+ java-common,
  junit4,
 Rules-Requires-Root: no
 Standards-Version: 4.6.2


=====================================
debian/rules
=====================================
@@ -1,11 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/java/java_defaults.mk
+
 %:
 	dh $@
 
 override_dh_auto_build:
 	mkdir target
-	jh_build --no-javadoc --javacopts="-source 1.7 -target 1.7" \
+	jh_build --no-javadoc --javacopts="-source $(java_compat_level) -target $(java_compat_level)" \
 	         target/ca-certificates-java.jar \
 	         src/main/java \
 	         --main=org.debian.security.UpdateCertificates
@@ -13,7 +15,7 @@ override_dh_auto_build:
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Build the tests
-	jh_build --no-javadoc --javacopts="-source 1.7 -target 1.7 -cp target/ca-certificates-java.jar:/usr/share/java/junit4.jar" \
+	jh_build --no-javadoc --javacopts="-source $(java_compat_level) -target $(java_compat_level) -cp target/ca-certificates-java.jar:/usr/share/java/junit4.jar" \
 	         target/ca-certificates-java-tests.jar \
 	         src/test/java
 



View it on GitLab: https://salsa.debian.org/java-team/ca-certificates-java/-/commit/4b82205964da2b96de562a2b8e385a7ddebd096c

-- 
View it on GitLab: https://salsa.debian.org/java-team/ca-certificates-java/-/commit/4b82205964da2b96de562a2b8e385a7ddebd096c
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/20240118/405b9125/attachment.htm>