diff -Nru gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/ExtractDslMetaDataTask.groovy gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/ExtractDslMetaDataTask.groovy --- gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/ExtractDslMetaDataTask.groovy 2012-02-26 19:51:24.000000000 +0100 +++ gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/ExtractDslMetaDataTask.groovy 2012-09-21 20:33:53.398721824 +0200 @@ -15,7 +15,7 @@ */ package org.gradle.build.docs.dsl -import groovyjarjarantlr.collections.AST +import antlr.collections.AST import org.codehaus.groovy.antlr.AntlrASTProcessor import org.codehaus.groovy.antlr.SourceBuffer import org.codehaus.groovy.antlr.UnicodeEscapingReader diff -Nru gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/SourceMetaDataVisitor.java gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/SourceMetaDataVisitor.java --- gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/SourceMetaDataVisitor.java 2011-06-23 21:14:12.000000000 +0200 +++ gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/SourceMetaDataVisitor.java 2012-09-21 20:33:53.400721713 +0200 @@ -15,7 +15,7 @@ */ package org.gradle.build.docs.dsl; -import groovyjarjarantlr.collections.AST; +import antlr.collections.AST; import org.apache.commons.lang.StringUtils; import org.codehaus.groovy.antlr.GroovySourceAST; import org.codehaus.groovy.antlr.LineColumn; diff -Nru gradle-1.0/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java --- gradle-1.0/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java 2012-04-25 01:27:12.000000000 +0200 +++ gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java 2012-09-21 20:33:53.401721658 +0200 @@ -19,7 +19,7 @@ import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyCodeSource; import groovy.lang.Script; -import groovyjarjarasm.asm.ClassWriter; +import org.objectweb.asm.ClassWriter; import org.apache.commons.lang.StringUtils; import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.ast.stmt.ReturnStatement; @@ -90,7 +90,7 @@ // Groovy will only put the filename into the class, but that does not help a debugger for Gradle // because it does not know where Gradle scripts might live. @Override - protected groovyjarjarasm.asm.ClassVisitor createClassVisitor() { + protected org.objectweb.asm.ClassVisitor createClassVisitor() { return new ClassWriter(ClassWriter.COMPUTE_MAXS) { // ignore the sourcePath that is given by Groovy (this is only the filename) and instead // insert the full path if our script source has a source file diff -Nru gradle-1.0/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy gradle-1.0-gil/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy --- gradle-1.0/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy 2011-06-23 21:14:12.000000000 +0200 +++ gradle-1.0-gil/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy 2012-09-21 20:33:53.402721605 +0200 @@ -18,8 +18,8 @@ package org.gradle.process.internal.child -import groovyjarjarasm.asm.ClassVisitor -import groovyjarjarasm.asm.ClassWriter +import org.objectweb.asm.ClassVisitor +import org.objectweb.asm.Writer import java.util.concurrent.atomic.AtomicInteger import org.codehaus.groovy.ast.ClassNode import org.codehaus.groovy.control.CompilationUnit