[Git][java-team/groovy][master] 2 commits: Add patch for GROOVY-8253 (Debian #929460)

[Tony Mancill]

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


Commits:
5b64665c by tony mancill at 2019-07-30T04:41:43Z
Add patch for GROOVY-8253 (Debian #929460)

- - - - -
78dacf4b by tony mancill at 2019-07-30T04:59:50Z
interim changelog

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/13_GROOVY_8253.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+groovy (2.4.17-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add patch to fix groovyConsole exception. (Closes: #929460)
+
+ -- tony mancill <tmancill at 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,0 +1,28 @@
+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
=====================================
@@ -12,3 +12,4 @@ transition_Gradle_3.1.patch
 11_language_level.patch
 12_java11_compatibility.patch
 failOnError.patch
+13_GROOVY_8253.patch



View it on GitLab: https://salsa.debian.org/java-team/groovy/compare/45b32cc395182543dbce9be861970485a6321ee9...78dacf4b090477f82ee91f85878fd800c41e151e

-- 
View it on GitLab: https://salsa.debian.org/java-team/groovy/compare/45b32cc395182543dbce9be861970485a6321ee9...78dacf4b090477f82ee91f85878fd800c41e151e
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/20190730/8f519d00/attachment.html>