groovy git commit: minor refactor for build

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

groovy git commit: minor refactor for build

paulk
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X 496dbaa4d -> d39107bb9


minor refactor for build


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

Branch: refs/heads/GROOVY_2_6_X
Commit: d39107bb9b5b0adad42fbabf518e8ce8de0f90dc
Parents: 496dbaa
Author: paulk <[hidden email]>
Authored: Wed Sep 13 12:49:25 2017 +1000
Committer: paulk <[hidden email]>
Committed: Wed Sep 13 12:49:25 2017 +1000

----------------------------------------------------------------------
 build.gradle                                    |  5 +----
 gradle/assemble.gradle                          | 10 ++++-----
 gradle/docs.gradle                              |  2 +-
 .../META-INF/groovy-release-info.properties     | 23 --------------------
 .../org.codehaus.groovy.source.Extensions       | 22 -------------------
 ....codehaus.groovy.transform.ASTTransformation | 20 -----------------
 .../META-INF/groovy-release-info.properties     | 23 ++++++++++++++++++++
 .../org.codehaus.groovy.source.Extensions       | 22 +++++++++++++++++++
 ....codehaus.groovy.transform.ASTTransformation | 20 +++++++++++++++++
 9 files changed, 71 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index b7ec76a..832f1cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -289,10 +289,7 @@ sourceSets {
             }
         }
         resources {
-            srcDirs = ['src/main', 'src/resources']
-            include 'META-INF/services/*',
-                    'META-INF/groovy-release-info.properties',
-                    'groovy/grape/*.xml'
+            srcDirs = ['src/resources']
         }
     }
     test {

http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 3fdfd31..b6581c4 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -141,14 +141,12 @@ jar {
             include('antlr2-license.txt')
         }
         from("$projectDir/notices/NOTICE-JARJAR")
-        from('src/main/META-INF/groovy-release-info.properties') {
+        from('src/resources/META-INF/groovy-release-info.properties') {
             filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
         }
         rename { String filename -> filename == 'LICENSE-JARJAR' ? 'LICENSE' : filename == 'NOTICE-JARJAR' ? 'NOTICE' : filename }
     }
-
-    exclude '**/package-info.class', 'META-INF/groovy-release-info.properties'
-
+    exclude '**/package-info.class'
 }
 
 allprojects {
@@ -276,12 +274,12 @@ subprojects { sp ->
             } else {
                 from "${rootProject.projectDir}/notices/NOTICE-BASE"
             }
-            from("${rootProject.projectDir}/src/main/META-INF/groovy-release-info.properties") {
+            from("${rootProject.projectDir}/src/resources/META-INF/groovy-release-info.properties") {
                 filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
             }
             rename { String filename -> filename == 'LICENSE-BASE' ? 'LICENSE' : filename == 'NOTICE-BASE' ? 'NOTICE' : filename }
         }
-        exclude '**/package-info.class', 'META-INF/groovy-release-info.properties'
+        exclude '**/package-info.class'
     }
 }
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 905d06a..f9992ba 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -114,7 +114,7 @@ groovydocAll groovydocSpec
 task docProjectVersionInfo(type: Copy) {
     destinationDir = file("${project(':groovy-docgenerator').buildDir}/classes/main")
     into('META-INF') {
-        from('src/main/META-INF/groovy-release-info.properties') {
+        from('src/resources/META-INF/groovy-release-info.properties') {
             filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
         }
     }

http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/src/main/META-INF/groovy-release-info.properties
----------------------------------------------------------------------
diff --git a/src/main/META-INF/groovy-release-info.properties b/src/main/META-INF/groovy-release-info.properties
deleted file mode 100644
index 7eae8ae..0000000
--- a/src/main/META-INF/groovy-release-info.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-
-ImplementationVersion=#ImplementationVersion#
-BundleVersion=#BundleVersion#
-BuildDate=#BuildDate#
-BuildTime=#BuildTime#
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/src/main/META-INF/services/org.codehaus.groovy.source.Extensions
----------------------------------------------------------------------
diff --git a/src/main/META-INF/services/org.codehaus.groovy.source.Extensions b/src/main/META-INF/services/org.codehaus.groovy.source.Extensions
deleted file mode 100644
index 2e9df17..0000000
--- a/src/main/META-INF/services/org.codehaus.groovy.source.Extensions
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Format: one extension on each line without the leading "*."
-# Listed below are default groovy source file extensions.
-
-# NOTE: This implementation of supporting multiple file extensions is experimental and
-# the exact implementation details may vary when modularization gets introduced in
-# groovy 2.0. However, in terms of the behavior, this support will remain intact.
-groovy
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
----------------------------------------------------------------------
diff --git a/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
deleted file mode 100644
index 63a37f4..0000000
--- a/src/main/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# global transformation to handle @Grab annotation
-groovy.grape.GrabAnnotationTransformation
-
-#global transformation for AST Builder
-org.codehaus.groovy.ast.builder.AstBuilderTransformation

http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/src/resources/META-INF/groovy-release-info.properties
----------------------------------------------------------------------
diff --git a/src/resources/META-INF/groovy-release-info.properties b/src/resources/META-INF/groovy-release-info.properties
new file mode 100644
index 0000000..d33358c
--- /dev/null
+++ b/src/resources/META-INF/groovy-release-info.properties
@@ -0,0 +1,23 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+ImplementationVersion=#ImplementationVersion#
+BundleVersion=#BundleVersion#
+BuildDate=#BuildDate#
+BuildTime=#BuildTime#
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/src/resources/META-INF/services/org.codehaus.groovy.source.Extensions
----------------------------------------------------------------------
diff --git a/src/resources/META-INF/services/org.codehaus.groovy.source.Extensions b/src/resources/META-INF/services/org.codehaus.groovy.source.Extensions
new file mode 100644
index 0000000..c17fe8b
--- /dev/null
+++ b/src/resources/META-INF/services/org.codehaus.groovy.source.Extensions
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: one extension on each line without the leading "*."
+# Listed below are default groovy source file extensions.
+
+# NOTE: This implementation of supporting multiple file extensions is experimental and
+# the exact implementation details may vary when modularization gets introduced in
+# groovy 2.0. However, in terms of the behavior, this support will remain intact.
+groovy
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/groovy/blob/d39107bb/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
----------------------------------------------------------------------
diff --git a/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
new file mode 100644
index 0000000..734b814
--- /dev/null
+++ b/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# global transformation to handle @Grab annotation
+groovy.grape.GrabAnnotationTransformation
+
+#global transformation for AST Builder
+org.codehaus.groovy.ast.builder.AstBuilderTransformation