[Git][java-team/apiguardian][master] 4 commits: Patch build system JDK detection for Java > 11 (Closes: #1011536)

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / apiguardian


Commits:
5e45ef3b by tony mancill at 2022-05-25T20:52:18-07:00
Patch build system JDK detection for Java > 11 (Closes: #1011536)

- - - - -
12c5a11c by tony mancill at 2022-05-25T20:52:18-07:00
Bump Standards-Version to 4.6.1

- - - - -
9e2cb22c by tony mancill at 2022-05-25T20:52:18-07:00
Freshen years in debian/copyright

- - - - -
d4804249 by tony mancill at 2022-05-25T20:52:18-07:00
Prepare changelog for upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/04-build-on-java-17.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+apiguardian (1.1.0-4) unstable; urgency=medium
+
+  * Team upload.
+  * Patch build system JDK detection for Java > 11 (Closes: #1011536)
+  * Bump Standards-Version to 4.6.1
+
+ -- tony mancill <tmancill at debian.org>  Wed, 25 May 2022 20:22:50 -0700
+
 apiguardian (1.1.0-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Build-Depends:
  default-jdk,
  gradle-debian-helper,
  maven-repo-helper
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/apiguardian.git
 Vcs-Browser: https://salsa.debian.org/java-team/apiguardian
 Homepage: https://github.com/apiguardian-team/apiguardian


=====================================
debian/copyright
=====================================
@@ -10,7 +10,8 @@ Copyright: 2017-2019, Marc Philipp
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2019-2021, Emmanuel Bourg
+Copyright: 2019-2022, Emmanuel Bourg
+           2021-2022, tony mancill <tmancill at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0


=====================================
debian/patches/04-build-on-java-17.patch
=====================================
@@ -0,0 +1,26 @@
+Description: attempt build on Java versions >= 11
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011536
+Author: tony mancill <tmancill at debian.org>
+
+--- a/settings.gradle
++++ b/settings.gradle
+@@ -1,7 +1,7 @@
+ rootProject.name = 'apiguardian-api'
+ 
+ // Require Java 11
+-if (!JavaVersion.current().java11) {
++if (!JavaVersion.current().isJava11Compatible()) {
+     throw new GradleException('The @API Guardian build requires Java 11. ' +
+             "Currently executing with Java ${JavaVersion.current()}.")
+ }
+--- a/build.gradle
++++ b/build.gradle
+@@ -30,7 +30,7 @@
+ }
+ 
+ compileJava {
+-	options.compilerArgs = ['--release', '6']
++	options.compilerArgs = ['--release', '8']
+ }
+ 
+ task compileModule(type: JavaCompile) {


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 01-ignore-versioning-plugin.patch
 02-ignore-github-pages-plugin.patch
 03-reproducible-builds-timestamp.patch
+04-build-on-java-17.patch



View it on GitLab: https://salsa.debian.org/java-team/apiguardian/-/compare/cbde47a578e12e214579660acbc139bccebd0b34...d4804249e28fdc2f228bd56e88293298c34f77b3

-- 
View it on GitLab: https://salsa.debian.org/java-team/apiguardian/-/compare/cbde47a578e12e214579660acbc139bccebd0b34...d4804249e28fdc2f228bd56e88293298c34f77b3
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/20220526/6b140d9c/attachment.htm>