Markus Koschany pushed to branch master at Debian Java Maintainers / gradle
Commits: e0ae4bd7 by Markus Koschany at 2022-09-29T23:25:52+02:00 Update normalize-classpath.patch and add jansi1.jar to the CLASSPATH. Closes: #1020952 Thanks: Fab Stz for the report. - - - - - 1090dd8b by Markus Koschany at 2022-09-29T23:27:26+02:00 Update changelog - - - - - 2 changed files: - debian/changelog - debian/patches/normalize-classpath.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +gradle (4.4.1-16) unstable; urgency=medium + + * Team upload. + * Update normalize-classpath.patch and add jansi1.jar to the CLASSPATH.. + Thanks to Fab Stz for the report. (Closes: #1020952) + + -- Markus Koschany <[email protected]> Thu, 29 Sep 2022 23:26:57 +0200 + gradle (4.4.1-15) unstable; urgency=medium [ 殷啟聰 | Kai-Chung Yan ] ===================================== debian/patches/normalize-classpath.patch ===================================== @@ -1,17 +1,24 @@ -From: Markus Koschany <[email protected]> -From: Kai-Chung Yan -Subject: Normalize the generated classpath in every JAR - Gradle uses its own class loading mechanism which uses a dedicated classpath - file stored in every JAR. The JAR names are really names, not paths, so they - need to be normalized so that Gradle can search `/usr/share/java` for them. - . - This patch also sorts the generated classpath to improve reproducibility. - . - One bug of this patch is that the Groovy version is hard-coded, but it seems - not to affect the actual result of running `gradle --version`. +From: Debian Java Maintainers <[email protected]> +Date: Thu, 29 Sep 2022 23:22:31 +0200 +Subject: Normalize the generated classpath in every JAR Gradle uses its own + class loading mechanism which uses a dedicated classpath file stored in + every JAR. The JAR names are really names, not paths, + so they need to be normalized so that Gradle can search `/usr/share/java` + for them. . This patch also sorts the generated classpath to improve + reproducibility. . One bug of this patch is that the Groovy version is + hard-coded, + but it seems not to affect the actual result of running `gradle --version`. + +--- + .../org/gradle/build/ClasspathManifest.groovy | 45 +++++++++++++++++++++- + .../gradle/api/internal/plugins/GroovyJarFile.java | 4 +- + 2 files changed, 45 insertions(+), 4 deletions(-) + +diff --git a/buildSrc/src/main/groovy/org/gradle/build/ClasspathManifest.groovy b/buildSrc/src/main/groovy/org/gradle/build/ClasspathManifest.groovy +index b500e84..11f223c 100644 --- a/buildSrc/src/main/groovy/org/gradle/build/ClasspathManifest.groovy +++ b/buildSrc/src/main/groovy/org/gradle/build/ClasspathManifest.groovy -@@ -49,14 +49,14 @@ +@@ -49,14 +49,14 @@ class ClasspathManifest extends DefaultTask { String getRuntime() { return input.fileCollection { (it instanceof ExternalDependency) || (it instanceof FileCollectionDependency) @@ -28,7 +35,7 @@ Subject: Normalize the generated classpath in every JAR } Properties createProperties() { -@@ -73,4 +73,42 @@ +@@ -73,4 +73,45 @@ class ClasspathManifest extends DefaultTask { def generate() { ReproduciblePropertiesWriter.store(createProperties(), manifestFile) } @@ -58,6 +65,9 @@ Subject: Normalize the generated classpath in every JAR + if (name.startsWith('javax.inject-')) { + return 'atinject-jsr330-api.jar' + } ++ if (name.startsWith('jansi-')) { ++ return 'jansi1.jar' ++ } + if (name.startsWith('geronimo-interceptor_3.0_spec-')) { + return 'geronimo-interceptor-3.0-spec.jar' + } @@ -71,9 +81,11 @@ Subject: Normalize the generated classpath in every JAR + return name.replaceAll('-[\\d\\.]*x\\.jar\\z', '.jar') + } } +diff --git a/subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java b/subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java +index 5b73299..e3799bc 100644 --- a/subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java +++ b/subprojects/plugins/src/main/java/org/gradle/api/internal/plugins/GroovyJarFile.java -@@ -23,7 +23,7 @@ +@@ -23,7 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class GroovyJarFile { @@ -82,7 +94,7 @@ Subject: Normalize the generated classpath in every JAR private final File file; private final Matcher matcher; -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ public class GroovyJarFile { } public VersionNumber getVersion() { View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/6c12d183cd32fd240e7ec7ebe78b6b566d25d1f5...1090dd8b4bcf25e8b808f61b0582ce825fbacbda -- View it on GitLab: https://salsa.debian.org/java-team/gradle/-/compare/6c12d183cd32fd240e7ec7ebe78b6b566d25d1f5...1090dd8b4bcf25e8b808f61b0582ce825fbacbda You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
