[2/3] groovy git commit: Fix JarJarTask's fully qualified class name

[sunlan]

Fix JarJarTask's fully qualified class name

(cherry picked from commit bee0b2f)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/40678aa5
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/40678aa5
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/40678aa5

Branch: refs/heads/GROOVY_2_5_X
Commit: 40678aa5937402cffcb6db6913e7d15f78f14a8f
Parents: e39a2e7
Author: sunlan <sun...@apache.org>
Authored: Sat Nov 25 01:47:12 2017 +0800
Committer: sunlan <sun...@apache.org>
Committed: Sat Nov 25 22:15:54 2017 +0800

----------------------------------------------------------------------
 gradle/assemble.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/40678aa5/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index fe0c514..b088780 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -22,6 +22,7 @@ apply plugin: 'osgi'
 
 group = 'org.codehaus.groovy'
 archivesBaseName = 'groovy'
+jarjarTaskClassName = 'org.pantsbuild.jarjar.JarJarTask'
 
 ext.srcSpec = copySpec {
     from(projectDir) {
@@ -173,7 +174,7 @@ allprojects {
             boolean isRoot = project == rootProject
             def gradleProject = project
             ant {
-                taskdef name: 'jarjar', classname: 
'com.tonicsystems.jarjar.JarJarTask', classpath: 
rootProject.configurations.tools.asPath
+                taskdef name: 'jarjar', classname: jarjarTaskClassName, 
classpath: rootProject.configurations.tools.asPath
                 jarjar(jarfile: targetTmp) {
                     zipfileset(
                             src: jar.archivePath,
@@ -243,7 +244,7 @@ allprojects {
             doFirst {
                 from zipTree(target)
                 ant {
-                    taskdef name: 'jarjar', classname: 
'com.tonicsystems.jarjar.JarJarTask', classpath: 
rootProject.configurations.tools.asPath
+                    taskdef name: 'jarjar', classname: jarjarTaskClassName, 
classpath: rootProject.configurations.tools.asPath
                     jarjar(jarfile: target) {
                         zipfileset(dir: "$rootProject.projectDir/notices/", 
includes: isRootProject ? 'NOTICE-GROOIDJARJAR' : 'NOTICE-GROOID', fullpath: 
'META-INF/NOTICE')
                         zipfileset(src: jarjar.archivePath, excludes: 
'META-INF/NOTICE')
@@ -413,7 +414,7 @@ task jarAll(type: Jar, dependsOn: replaceJarWithJarJar) {
 
         def archivePathTmp = new File("${archivePath}.1.tmp")
         ant {
-            taskdef name: 'jarjar', classname: 
'com.tonicsystems.jarjar.JarJarTask', classpath: configurations.tools.asPath
+            taskdef name: 'jarjar', classname: jarjarTaskClassName, classpath: 
configurations.tools.asPath
             jarjar(jarfile: archivePathTmp, manifest: 
"$owner.ext.metaInfDir/MANIFEST.MF") {
                 zipfileset(dir: "$owner.ext.metaInfDir", prefix: 'META-INF')
                 zipfileset(src: jar.archivePath, 
excludes:'META-INF/NOTICE,META-INF/LICENSE')