[groovy] branch master updated (7d4e69d -> 4540b1e)

classic Classic list List threaded Threaded
20 messages Options
12
Reply | Threaded
Open this post in threaded view
|

[groovy] branch master updated (7d4e69d -> 4540b1e)

paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.


    from 7d4e69d  GROOVY-8647: Split package renaming (groovy-console update startup scripts)
     new cacf58d  Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename source-file to temp
     new ca374bf  Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename file to target-name
     new 008848a  Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - resolve conflict and keep both files
     new f648f1f  Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - restore name of source-file
     new c4652f8  Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename source-file to temp
     new f757c5d  Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename file to target-name
     new 572eaf1  Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - resolve conflict and keep both files
     new 7df547f  Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - restore name of source-file
     new 45df810  Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - rename source-file to temp
     new 3b0199f  Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - rename file to target-name
     new e8d7f94  Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - resolve conflict and keep both files
     new 60cd00d  Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - restore name of source-file
     new 2cbcfc8  Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - rename source-file to temp
     new 39de5e7  Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - rename file to target-name
     new fd1757d  Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - resolve conflict and keep both files
     new a7078f3  Split history main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java to main/java/org/apache/groovy/swing/extensions - restore name of source-file
     new 6f2a368  GROOVY-8647: Split package renaming (groovy-swing)
     new d8eeaff  GROOVY-8647: Split package renaming (groovy-test)
     new 4540b1e  GROOVY-8647: Split package renaming (groovy-ant)

The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../groovy/{util => ant}/FileNameFinder.groovy     |  2 +-
 .../main/groovy/groovy/util/FileNameFinder.groovy  |  3 +
 .../main/java/groovy/{util => ant}/AntBuilder.java |  3 +-
 .../src/main/java/groovy/util/AntBuilder.java      |  2 +
 .../main/java/org/codehaus/groovy/ant/Groovy.java  |  2 +-
 .../main/java/org/codehaus/groovy/ant/Groovyc.java |  2 +-
 .../{org/codehaus/groovy => groovy/ant}/antlib.xml |  0
 .../spec/test/builder/AntBuilderSpecTest.groovy    |  2 +-
 subprojects/groovy-swing/build.gradle              |  2 +-
 .../groovy/swing/extensions/SwingExtensions.java}  |  5 +-
 .../groovy/runtime/SwingGroovyMethods.java         | 72 ++++++++++++++++++++++
 .../groovy/util/JavadocAssertionTestSuite.groovy   |  2 +-
 .../test/{transform => }/NotYetImplemented.java    |  2 +-
 .../src/main/java/groovy/util/AllTestSuite.java    |  2 +-
 .../NotYetImplementedASTTransformation.java        |  2 +-
 .../NotYetImplementedTransformTest.groovy          | 12 ++--
 16 files changed, 97 insertions(+), 18 deletions(-)
 copy subprojects/groovy-ant/src/main/groovy/groovy/{util => ant}/FileNameFinder.groovy (98%)
 copy subprojects/groovy-ant/src/main/java/groovy/{util => ant}/AntBuilder.java (99%)
 copy subprojects/groovy-ant/src/main/resources/{org/codehaus/groovy => groovy/ant}/antlib.xml (100%)
 copy subprojects/groovy-swing/src/main/java/org/{codehaus/groovy/runtime/SwingGroovyMethods.java => apache/groovy/swing/extensions/SwingExtensions.java} (99%)
 rename subprojects/groovy-test/src/main/java/groovy/test/{transform => }/NotYetImplemented.java (98%)

Reply | Threaded
Open this post in threaded view
|

[groovy] 01/19: Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename file to target-name

paulk
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 ca374bf4ccc5546889de07d4cf12405e03b0008a
Author: Paul King <[hidden email]>
AuthorDate: Wed May 15 19:53:17 2019 +1000

    Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename file to target-name
---
 .../groovy-ant/src/main/groovy/groovy/{util => ant}/FileNameFinder.groovy | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy b/subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy
similarity index 100%
rename from subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
rename to subprojects/groovy-ant/src/main/groovy/groovy/ant/FileNameFinder.groovy

Reply | Threaded
Open this post in threaded view
|

[groovy] 02/19: Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename source-file to temp

paulk
In reply to this post by paulk
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 cacf58dc4935635350c5c9e5c7972dad7649127d
Author: Paul King <[hidden email]>
AuthorDate: Wed May 15 19:53:17 2019 +1000

    Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - rename source-file to temp
---
 .../src/{main/groovy/groovy/util/FileNameFinder.groovy => temp}           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy b/subprojects/groovy-ant/src/temp
similarity index 100%
rename from subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
rename to subprojects/groovy-ant/src/temp

Reply | Threaded
Open this post in threaded view
|

[groovy] 03/19: Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - resolve conflict and keep both files

paulk
In reply to this post by paulk
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 008848a0944854d0aeb26e34ca85c7c84b6da44f
Merge: cacf58d ca374bf
Author: Paul King <[hidden email]>
AuthorDate: Wed May 15 19:53:18 2019 +1000

    Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - resolve conflict and keep both files

 .../main/groovy/groovy/ant/FileNameFinder.groovy   | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)

Reply | Threaded
Open this post in threaded view
|

[groovy] 04/19: Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - restore name of source-file

paulk
In reply to this post by paulk
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 f648f1ffff476d0324dacbd284cd07a292a50b66
Author: Paul King <[hidden email]>
AuthorDate: Wed May 15 19:53:18 2019 +1000

    Split history main/groovy/groovy/util/FileNameFinder.groovy to main/groovy/groovy/ant - restore name of source-file
---
 .../src/{temp => main/groovy/groovy/util/FileNameFinder.groovy}           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-ant/src/temp b/subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy
similarity index 100%
rename from subprojects/groovy-ant/src/temp
rename to subprojects/groovy-ant/src/main/groovy/groovy/util/FileNameFinder.groovy

Reply | Threaded
Open this post in threaded view
|

[groovy] 05/19: Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename file to target-name

paulk
In reply to this post by paulk
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 f757c5dd85ad270201554f253deea34a40cb87b3
Author: Paul King <[hidden email]>
AuthorDate: Wed May 15 19:54:15 2019 +1000

    Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename file to target-name
---
 subprojects/groovy-ant/src/main/java/groovy/{util => ant}/AntBuilder.java | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java b/subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java
similarity index 100%
rename from subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
rename to subprojects/groovy-ant/src/main/java/groovy/ant/AntBuilder.java

Reply | Threaded
Open this post in threaded view
|

[groovy] 06/19: Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename source-file to temp

paulk
In reply to this post by paulk
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 c4652f89a61b3d259851bb31412fe558c81a9fd8
Author: Paul King <[hidden email]>
AuthorDate: Wed May 15 19:54:15 2019 +1000

    Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - rename source-file to temp
---
 .../groovy-ant/src/{main/java/groovy/util/AntBuilder.java => temp}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java b/subprojects/groovy-ant/src/temp
similarity index 100%
rename from subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
rename to subprojects/groovy-ant/src/temp

Reply | Threaded
Open this post in threaded view
|

[groovy] 07/19: Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - resolve conflict and keep both files

paulk
In reply to this post by paulk
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 572eaf158526afb5f8d1f82218368b51ad79390a
Merge: c4652f8 f757c5d
Author: Paul King <[hidden email]>
AuthorDate: Wed May 15 19:54:16 2019 +1000

    Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - resolve conflict and keep both files

 .../src/main/java/groovy/ant/AntBuilder.java       | 512 +++++++++++++++++++++
 1 file changed, 512 insertions(+)

Reply | Threaded
Open this post in threaded view
|

[groovy] 08/19: Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - restore name of source-file

paulk
In reply to this post by paulk
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 7df547f935e6e2b552a27235fdde3547d608f450
Author: Paul King <[hidden email]>
AuthorDate: Wed May 15 19:54:16 2019 +1000

    Split history main/java/groovy/util/AntBuilder.java to main/java/groovy/ant - restore name of source-file
---
 .../groovy-ant/src/{temp => main/java/groovy/util/AntBuilder.java}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-ant/src/temp b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java
similarity index 100%
rename from subprojects/groovy-ant/src/temp
rename to subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java

Reply | Threaded
Open this post in threaded view
|

[groovy] 09/19: Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - rename file to target-name

paulk
In reply to this post by paulk
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 3b0199f93e9ffdce589a02eb31fee495706ee057
Author: Paul King <[hidden email]>
AuthorDate: Wed May 15 20:12:33 2019 +1000

    Split history main/resources/org/codehaus/groovy/antlib.xml to main/resources/groovy/ant - rename file to target-name
---
 .../src/main/resources/{org/codehaus/groovy => groovy/ant}/antlib.xml     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml b/subprojects/groovy-ant/src/main/resources/groovy/ant/antlib.xml
similarity index 100%
rename from subprojects/groovy-ant/src/main/resources/org/codehaus/groovy/antlib.xml
rename to subprojects/groovy-ant/src/main/resources/groovy/ant/antlib.xml

12