Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Add patch for GROOVY-8253 (Debian #929460)
· 5b64665c
Tony Mancill
authored
Jul 29, 2019
5b64665c
interim changelog
· 78dacf4b
Tony Mancill
authored
Jul 29, 2019
78dacf4b
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
78dacf4b
groovy (2.4.17-2) UNRELEASED; urgency=medium
* Team upload.
* Add patch to fix groovyConsole exception. (Closes: #929460)
-- tony mancill <tmancill@debian.org> Mon, 29 Jul 2019 18:10:45 -0700
groovy (2.4.17-1) unstable; urgency=medium
* Team upload.
...
...
debian/patches/13_GROOVY_8253.patch
0 → 100644
View file @
78dacf4b
Description: fixes failure of groovyConsole to launch
https://issues.apache.org/jira/browse/GROOVY-8253
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=929460
Origin: https://github.com/apache/groovy/commit/35aba7c0cf710b1337935f266ac6e6e6bef82c92
Forwarded: not-needed
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -297,7 +297,7 @@
def staticExtensionClasses = []
modules().collect {
- new File("${it.buildDir}/classes/main/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule")
+ new File("${it.buildDir}/resources/main/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule")
}.findAll { it.exists() }.each {
def props = new Properties()
props.load(it.newInputStream())
--- a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
+++ b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
@@ -36,7 +36,7 @@
private File computeDescriptorFile() {
- def metaInfDir = new File("${project.buildDir}/classes/main/META-INF/services")
+ def metaInfDir = new File("${project.buildDir}/resources/main/META-INF/services")
return new File(metaInfDir, "org.codehaus.groovy.runtime.ExtensionModule")
}
debian/patches/series
View file @
78dacf4b
...
...
@@ -12,3 +12,4 @@ transition_Gradle_3.1.patch
11_language_level.patch
12_java11_compatibility.patch
failOnError.patch
13_GROOVY_8253.patch