This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 4540b1ea8f3cab092190fce10fba871d764f4757 Author: Paul King <[email protected]> AuthorDate: Wed May 15 23:39:10 2019 +1000 GROOVY-8647: Split package renaming (groovy-ant) --- .../groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy | 2 +- .../groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy | 3 +++ subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java | 3 ++- subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java | 2 ++ .../groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java | 2 +- .../groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java | 2 +- subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy | 2 +- 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy b/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy index 9fa5b0e..cf8a79d 100644 --- a/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy +++ b/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util +package groovy.ant /** * Find files according to a base directory and an includes and excludes pattern. diff --git a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy b/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy index 9fa5b0e..c751d30 100644 --- a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy +++ b/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy @@ -18,10 +18,13 @@ */ package groovy.util +import groovy.ant.AntBuilder + /** * Find files according to a base directory and an includes and excludes pattern. * The include and exclude patterns conform to Ant's fileset pattern conventions. */ +@Deprecated class FileNameFinder implements IFileNameFinder { List<String> getFileNames(String basedir, String pattern) { diff --git a/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java b/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java index 63123d9..166fa66 100644 --- a/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java +++ b/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java @@ -16,8 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package groovy.util; +package groovy.ant; +import groovy.util.BuilderSupport; import groovy.xml.QName; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildLogger; diff --git a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java index 63123d9..988140d 100644 --- a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java +++ b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java @@ -63,6 +63,7 @@ import java.util.logging.Logger; * your classpath - see the <a href="http://ant.apache.org/manual/install.html#librarydependencies";>library * dependencies</a> for more details. */ +@Deprecated public class AntBuilder extends BuilderSupport { private final Logger log = Logger.getLogger(getClass().getName()); @@ -493,6 +494,7 @@ public class AntBuilder extends BuilderSupport { * Would be nice to retrieve location information (from AST?). * In a first time, without info */ +@Deprecated class AntBuilderLocator implements Locator { public int getColumnNumber() { return 0; diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java index f235771..a0931d0 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.ant; +import groovy.ant.AntBuilder; import groovy.lang.Binding; import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyShell; import groovy.lang.MissingMethodException; import groovy.lang.Script; -import groovy.util.AntBuilder; import org.apache.groovy.io.StringBuilderWriter; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java index 899536d..9feb055 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java @@ -163,7 +163,7 @@ import java.util.StringTokenizer; * <p> * Based on the implementation of the Javac task in Apache Ant. * <p> - * Can also be used from {@link groovy.util.AntBuilder} to allow the build file to be scripted in Groovy. + * Can also be used from {@link groovy.ant.AntBuilder} to allow the build file to be scripted in Groovy. */ public class Groovyc extends MatchingTask { private static final URL[] EMPTY_URL_ARRAY = new URL[0]; diff --git a/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy b/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy index 40a6c55..40c38aa 100644 --- a/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy +++ b/subprojects/groovy-ant/src/spec/test/builder/AntBuilderSpecTest.groovy @@ -32,7 +32,7 @@ class AntBuilderSpecTest extends AntTestCase { // end::create_zip_builder[] */ // tag::example_echo[] - def ant = new AntBuilder() // <1> + def ant = new groovy.ant.AntBuilder() // <1> ant.echo('hello from Ant!') // <2> // end::example_echo[] }
