Tony Mancill pushed to branch master at Debian Java Maintainers / groovy
Commits: d65f83b3 by tony mancill at 2022-10-16T20:26:55-07:00 Correct servlet-api JAR symlink (Closes: #1021864) - - - - - effb692b by tony mancill at 2022-10-16T20:50:28-07:00 Use a versionless symlink for jsp-api.jar - - - - - b07118fb by tony mancill at 2022-10-16T21:01:00-07:00 Update javadoc links for libservlet-api-java-doc - - - - - b3308270 by tony mancill at 2022-10-16T21:26:57-07:00 Refresh patches - - - - - f3fde3d3 by tony mancill at 2022-10-16T21:26:57-07:00 Prepare changelog for upload - - - - - 5 changed files: - debian/changelog - debian/groovy.links - debian/patches/10_fix_javadoc_links.patch - debian/patches/13_GROOVY_8253.patch - debian/patches/failOnError.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +groovy (2.4.21-7) unstable; urgency=medium + + * Team upload. + * Correct servlet-api JAR symlink (Closes: #1021864) + * Use a versionless symlink for jsp-api.jar + * Update javadoc links for libservlet-api-java-doc + + -- tony mancill <tmanc...@debian.org> Sun, 16 Oct 2022 21:02:21 -0700 + groovy (2.4.21-6) unstable; urgency=medium * Team upload. ===================================== debian/groovy.links ===================================== @@ -22,8 +22,8 @@ /usr/share/java/jansi.jar /usr/share/groovy/lib/jansi.jar /usr/share/java/jcommander.jar /usr/share/groovy/lib/jcommander.jar /usr/share/java/jline2.jar /usr/share/groovy/lib/jline2.jar -/usr/share/java/jsp-api-2.3.jar /usr/share/groovy/lib/jsp-api-2.3.jar +/usr/share/java/jsp-api.jar /usr/share/groovy/lib/jsp-api.jar /usr/share/java/junit4.jar /usr/share/groovy/lib/junit4.jar /usr/share/java/qdox.jar /usr/share/groovy/lib/qdox.jar -/usr/share/java/servlet-api-3.1.jar /usr/share/groovy/lib/servlet-api-3.1.jar +/usr/share/java/servlet-api.jar /usr/share/groovy/lib/servlet-api.jar /usr/share/java/xstream.jar /usr/share/groovy/lib/xstream.jar ===================================== debian/patches/10_fix_javadoc_links.patch ===================================== @@ -1,6 +1,7 @@ Description: Use local javadoc links to avoid a build failure with Java 10 Author: Emmanuel Bourg <ebo...@apache.org> Forwarded: not-needed +Last-Update: 2022-10-16 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -33,9 +33,9 @@ def javadocSpec = { @@ -11,11 +12,11 @@ Forwarded: not-needed - 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'http://junit.org/junit4/javadoc/latest/', - 'http://docs.oracle.com/javaee/6/api/', 'http://www.antlr2.org/javadoc/') + links('file:///usr/share/doc/ant/api/', 'file:///usr/share/doc/default-jdk/api/', -+ 'file:///usr/share/doc/libservlet3.1-java-doc/api', ++ 'file:///usr/share/doc/libservlet-api-java/api', + 'file:///usr/share/doc/junit4/api/') } } - + @@ -53,12 +53,10 @@ def groovydocSpec = { overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html')) } @@ -26,7 +27,7 @@ Forwarded: not-needed - link 'http://junit.org/junit4/javadoc/latest/', 'org.junit.', 'junit.' - link 'http://www.antlr2.org/javadoc/', 'antlr.' - link 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.' -+ link 'file:///usr/share/doc/libservlet3.1-java-doc/api', 'javax.servlet.', 'javax.management.' ++ link 'file:///usr/share/doc/libservlet-api-java/api', 'javax.servlet.', 'javax.management.' + link 'file:///usr/share/doc/default-jdk/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' + link 'file:///usr/share/doc/ant/api/', 'org.apache.tools.ant.' + link 'file:///usr/share/doc/junit4/api/', 'org.junit.' ===================================== debian/patches/13_GROOVY_8253.patch ===================================== @@ -6,7 +6,7 @@ Forwarded: not-needed --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle -@@ -297,7 +297,7 @@ +@@ -300,7 +300,7 @@ def staticExtensionClasses = [] modules().collect { ===================================== debian/patches/failOnError.patch ===================================== @@ -7,13 +7,11 @@ Bug-Debian: https://bugs.debian.org/922755 gradle/docs.gradle | 1 + 1 file changed, 1 insertion(+) -diff --git a/gradle/docs.gradle b/gradle/docs.gradle -index 9088a73..51eaaf5 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle -@@ -36,6 +36,7 @@ def javadocSpec = { +@@ -36,6 +36,7 @@ links('file:///usr/share/doc/ant/api/', 'file:///usr/share/doc/default-jdk/api/', - 'file:///usr/share/doc/libservlet3.1-java-doc/api', + 'file:///usr/share/doc/libservlet-api-java/api', 'file:///usr/share/doc/junit4/api/') + failOnError = false } View it on GitLab: https://salsa.debian.org/java-team/groovy/-/compare/baf2c42ccbfad6eb3c517703fab6b429d3b320fe...f3fde3d3141f4354a563ea6f464059c17a11a8ab -- View it on GitLab: https://salsa.debian.org/java-team/groovy/-/compare/baf2c42ccbfad6eb3c517703fab6b429d3b320fe...f3fde3d3141f4354a563ea6f464059c17a11a8ab You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits