[Git][java-team/groovy][master] 2 commits: Add patch to address FTBFS with Java 21 (Closes: #1057686)

[Tony Mancill (@tmancill)]

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


Commits:
84edbb36 by tony mancill at 2023-12-07T21:40:35-08:00
Add patch to address FTBFS with Java 21 (Closes: #1057686)

- - - - -
4db6aa2b by tony mancill at 2023-12-07T21:41:14-08:00
Prepare changelog for upload

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/17_javadoc_with_java21.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+groovy (2.4.21-10) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch to address FTBFS with Java 21 (Closes: #1057686)
+
+ -- tony mancill <tmancill at debian.org>  Thu, 07 Dec 2023 21:40:46 -0800
+
 groovy (2.4.21-9) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/17_javadoc_with_java21.patch
=====================================
@@ -0,0 +1,22 @@
+--- a/gradle/docs.gradle
++++ b/gradle/docs.gradle
+@@ -32,7 +32,7 @@
+         version = true
+         overview = rootProject.file('src/main/overviewj.html')
+         footer = doc.footer
+-        source = rootProject.useIndy()?'1.7':'1.6'
++        source = rootProject.useIndy()?'8':'8'
+         links('file:///usr/share/doc/ant/api/', 'file:///usr/share/doc/default-jdk/api/',
+               'file:///usr/share/doc/libservlet-api-java/api',
+               'file:///usr/share/doc/junit4/api/')
+@@ -116,8 +116,8 @@
+     outputs.dir destinationDir
+ }
+ 
+-if (JavaVersion.current().isJava7Compatible()) {
+-    javadocAll.options.source = '1.7'
++if (JavaVersion.current().isJava8Compatible()) {
++    javadocAll.options.source = '8'
+     javadocAll.options.noTimestamp()
+ }
+ 


=====================================
debian/patches/series
=====================================
@@ -17,3 +17,4 @@ failOnError.patch
 remove-GroovyDoc-JANSI-dependency.patch
 update-to-JLine2-2.13.patch
 16_fix_type_inference.patch
+17_javadoc_with_java21.patch



View it on GitLab: https://salsa.debian.org/java-team/groovy/-/compare/87b3ef7452a0bf702b5eaa887c4859127d8404be...4db6aa2b2dbefb251b80c7ec91776ec0db85c4a0

-- 
View it on GitLab: https://salsa.debian.org/java-team/groovy/-/compare/87b3ef7452a0bf702b5eaa887c4859127d8404be...4db6aa2b2dbefb251b80c7ec91776ec0db85c4a0
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/20231208/89b90b9c/attachment.htm>