groovy git commit: Fix meta-inf found in wrong source set

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

groovy git commit: Fix meta-inf found in wrong source set

cchampeau
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_5_X ea1b71a9b -> 2ab917799


Fix meta-inf found in wrong source set


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

Branch: refs/heads/GROOVY_2_5_X
Commit: 2ab917799029e32bb4113abf30cf9cc1538e226c
Parents: ea1b71a
Author: Cedric Champeau <[hidden email]>
Authored: Wed Dec 13 09:24:24 2017 +0100
Committer: Cedric Champeau <[hidden email]>
Committed: Wed Dec 13 09:25:09 2017 +0100

----------------------------------------------------------------------
 .../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 +++++++++++++++++
 6 files changed, 65 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/2ab91779/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/2ab91779/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/2ab91779/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/2ab91779/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..7eae8ae
--- /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/2ab91779/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..2e9df17
--- /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/2ab91779/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..63a37f4
--- /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