Emmanuel Bourg pushed to branch master at Debian Java Maintainers / groovy
Commits: ad2027ed by Emmanuel Bourg at 2026-11-18T14:44:22+01:00 Fixed the reproducibility of the links in the groovydoc package descriptions - - - - - 3 changed files: - debian/changelog - + debian/patches/26_reproducible_groovydoc_package_links.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +groovy (2.5.23-3) unstable; urgency=medium + + * Team upload. + * Fixed the reproducibility of the links in the groovydoc package descriptions + + -- Emmanuel Bourg <[email protected]> Wed, 18 Nov 2026 10:48:07 +0100 + groovy (2.5.23-2) unstable; urgency=medium * Team upload. ===================================== debian/patches/26_reproducible_groovydoc_package_links.patch ===================================== @@ -0,0 +1,27 @@ +Description: Process the source files in a sorted order to make the links in the package descriptions reproducible + The {@link} tags of a package.html or package-info file were resolved against + the classes already processed, the links thus depended on the order of the + source files. The files are now sorted, with the package descriptions last. +Author: Emmanuel Bourg <[email protected]> +Forwarded: https://github.com/apache/groovy/pull/3312 +--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java ++++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyRootDocBuilder.java +@@ -166,6 +166,18 @@ + } + } + ++ // the files are sorted to be processed in a reproducible order, the package descriptions last once all the classes they may link to are known ++ filenames.sort(new java.util.Comparator<String>() { ++ public int compare(String filename1, String filename2) { ++ int result = Boolean.compare(isPackageInfo(filename1), isPackageInfo(filename2)); ++ return result != 0 ? result : filename1.compareTo(filename2); ++ } ++ ++ private boolean isPackageInfo(String filename) { ++ return filename.endsWith("package.html") || filename.endsWith("package-info.java") || filename.endsWith("package-info.groovy"); ++ } ++ }); ++ + for (String filename : filenames) { + File srcFile = new File(filename); + if (srcFile.exists()) { ===================================== debian/patches/series ===================================== @@ -14,3 +14,4 @@ failOnError.patch 23_jarjar_compatibility.patch 24_groovy_all_jar.patch 25_GROOVY-11954.patch +26_reproducible_groovydoc_package_links.patch View it on GitLab: https://salsa.debian.org/java-team/groovy/-/commit/ad2027ed66ca84250347d1df7dd8a4b37907f555 -- View it on GitLab: https://salsa.debian.org/java-team/groovy/-/commit/ad2027ed66ca84250347d1df7dd8a4b37907f555 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

