You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/10/13 11:33:48 UTC
[1/2] groovy git commit: GROOVY-8332: Packaging issue for
Antlr4-related jars
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X c4e5e2250 -> 027a190bf
GROOVY-8332: Packaging issue for Antlr4-related jars
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/027a190b
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/027a190b
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/027a190b
Branch: refs/heads/GROOVY_2_6_X
Commit: 027a190bffecb24752da885d179a894aa1d4ba92
Parents: 3dd358a
Author: paulk <pa...@asert.com.au>
Authored: Fri Oct 13 21:23:45 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Oct 13 21:33:34 2017 +1000
----------------------------------------------------------------------
gradle/assemble.gradle | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/027a190b/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index d34be8c..0e074e5 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -187,8 +187,10 @@ allprojects {
file.name.startsWith(it)
} && ['asm-attr', 'asm-util', 'asm-analysis'].every { !file.name.startsWith(it) }
}.each { jarjarFile ->
- // GROOVY-7386 : excludes needed below to stop copy of incorrect maven meta info
- zipfileset(src: jarjarFile, excludes: 'META-INF/maven/commons-cli/commons-cli/*,META-INF/*')
+ // explanation of excludes:
+ // GROOVY-7386: stop copy of incorrect maven meta info
+ // GROOVY-8332: stop copy of annotation processor which is for some reason included in antlr runtime artifact
+ zipfileset(src: jarjarFile, excludes: 'META-INF/maven/commons-cli/commons-cli/*,META-INF/*,META-INF/services/javax.annotation.processing.Processor')
}
zipfileset(src: configurations.runtime.files.find { file -> file.name.startsWith('asm-util') },
[2/2] groovy git commit: remove out of date comment
Posted by pa...@apache.org.
remove out of date comment
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/3dd358ae
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/3dd358ae
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/3dd358ae
Branch: refs/heads/GROOVY_2_6_X
Commit: 3dd358aeb20d66bea781a6451b49a632bcbace6a
Parents: c4e5e22
Author: paulk <pa...@asert.com.au>
Authored: Thu Oct 12 23:12:46 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Oct 13 21:33:34 2017 +1000
----------------------------------------------------------------------
.../groovy-test/src/main/java/groovy/util/GroovyTestCase.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/3dd358ae/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java b/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java
index a72d839..df563f1 100644
--- a/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java
+++ b/subprojects/groovy-test/src/main/java/groovy/util/GroovyTestCase.java
@@ -203,7 +203,6 @@ public class GroovyTestCase extends TestCase {
GroovyAssert.assertScript(script);
}
- // TODO should this be synchronised?
protected String getTestClassName() {
return TEST_SCRIPT_NAME_PREFIX + getMethodName() + (scriptFileNameCounter.getAndIncrement()) + ".groovy";
}