File 0007-Fix-missing-extension-definitions.patch of Package groovy (Revision 379b306c2e5872ad68cb7e21c0033c1c)
Currently displaying revision 379b306c2e5872ad68cb7e21c0033c1c , Show latest
40
1
From 2db1f5baf0c1647cc971f86cf4c2ee9d40146d5c Mon Sep 17 00:00:00 2001
2
From: Michael Simacek <msimacek@redhat.com>
3
Date: Mon, 4 Jun 2018 16:00:28 +0200
4
Subject: [PATCH 7/7] Fix missing extension definitions
5
6
---
7
.../codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy | 2 +-
8
gradle/assemble.gradle | 2 +-
9
2 files changed, 2 insertions(+), 2 deletions(-)
10
11
diff --git a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
12
index a5e716f..679b083 100644
13
--- a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
14
+++ b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
15
16
17
18
private File computeDescriptorFile() {
19
- def metaInfDir = new File("${project.buildDir}/classes/main/META-INF/services")
20
+ def metaInfDir = new File("${project.buildDir}/resources/main/META-INF/services")
21
return new File(metaInfDir, "org.codehaus.groovy.runtime.ExtensionModule")
22
}
23
24
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
25
index 1b5ded9..6356238 100644
26
--- a/gradle/assemble.gradle
27
+++ b/gradle/assemble.gradle
28
29
def staticExtensionClasses = []
30
31
modules().collect {
32
- new File("${it.buildDir}/classes/main/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule")
33
+ new File("${it.buildDir}/resources/main/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule")
34
}.findAll { it.exists() }.each {
35
def props = new Properties()
36
props.load(it.newInputStream())
37
--
38
2.17.1
39
40