You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/03/05 10:15:43 UTC
[groovy] branch GROOVY_4_0_X updated (94d18b0 -> 72fa01e)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 94d18b0 GROOVY-10519: v9 ClassFinder closes existing FileSystems that it doesn't own
new 0a7d878 Revert "jarjar experiment"
new c098011 Revert "jarjar experiment"
new 596aa2e Revert "jarjar experiment"
new 72fa01e rollback to 1.8.0 of jarjar
The 4 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:
buildSrc/src/main/groovy/org.apache.groovy-common.gradle | 3 +--
gradle/verification-metadata.xml | 6 +++++-
.../org.codehaus.groovy.transform.ASTTransformation | 16 ++++++++++++++++
.../org.codehaus.groovy.transform.ASTTransformation | 16 ++++++++++++++++
.../org.codehaus.groovy.transform.ASTTransformation | 16 ++++++++++++++++
.../org.codehaus.groovy.transform.ASTTransformation | 16 ++++++++++++++++
versions.properties | 2 +-
7 files changed, 71 insertions(+), 4 deletions(-)
[groovy] 04/04: rollback to 1.8.0 of jarjar
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 72fa01eb5644affd1d53ba9138dedcc215a63b85
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Mar 5 20:15:34 2022 +1000
rollback to 1.8.0 of jarjar
---
gradle/verification-metadata.xml | 6 +++++-
versions.properties | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 701c476..ca30e5e 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -148,7 +148,6 @@
<trusted-key id="9d0a56aaa0d60e0c0c7dccc0b4c70893b62babe8" group="org.apache.logging.log4j"/>
<trusted-key id="9d23533896a9784703585b6286e02c5a42196ca8" group="log4j" name="log4j" version="1.2.17"/>
<trusted-key id="9ffed7a118d45a44e4a1e47130e6f80434a72a7f" group="^org[.]apache[.]maven($|([.].*))" regex="true"/>
- <trusted-key id="a1fe765b15233ead18fa6abb93e55cb567b5c626" group="org.pantsbuild" name="jarjar" version="1.7.2"/>
<trusted-key id="a413f67d71beec23add0ce0acb43338e060cf9fa" group="org.jacoco"/>
<trusted-key id="a5bd02b93e7a40482eb1d66a5f69ad087600b22c" group="org.ow2.asm"/>
<trusted-key id="a778fde933a96dda827840d8e2b3d84202b812d9" group="org.assertj"/>
@@ -293,6 +292,11 @@
<pgp value="ea313384ca0eba950ea017e937890e298d9a2bfa"/>
</artifact>
</component>
+ <component group="com.eed3si9n.jarjar" name="jarjar" version="1.8.0">
+ <artifact name="jarjar-1.8.0.jar">
+ <pgp value="ea313384ca0eba950ea017e937890e298d9a2bfa"/>
+ </artifact>
+ </component>
<component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.42.0">
<artifact name="gradle-versions-plugin-0.42.0.jar">
<sha512 value="1abeee4aa1a033f7a38333846b8b65ad6a859f1a3f4420f193a5a47a096eee032d2f769b1bd79a05f752ec3139a256cee9eed36984b5078cff651dac0412d352" origin="Generated by Gradle because artifact wasn't signed"/>
diff --git a/versions.properties b/versions.properties
index 70ce3b5..94610db 100644
--- a/versions.properties
+++ b/versions.properties
@@ -29,7 +29,7 @@ gpars=1.2.1
ivy=2.5.0
jansi=2.4.0
jackson=2.13.1
-jarjar=1.8.1
+jarjar=1.8.0
javaParser=3.24.0
jline=2.14.6
jmh=1.27
[groovy] 02/04: Revert "jarjar experiment"
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit c09801176fa53c628a8ffacb5b06fafc5bfed438
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Mar 5 20:14:18 2022 +1000
Revert "jarjar experiment"
This reverts commit bfdbb94bce37839fecc108d47d0c5f22504825c5.
---
.../org.codehaus.groovy.transform.ASTTransformation | 16 ++++++++++++++++
.../org.codehaus.groovy.transform.ASTTransformation | 16 ++++++++++++++++
.../org.codehaus.groovy.transform.ASTTransformation | 16 ++++++++++++++++
3 files changed, 48 insertions(+)
diff --git a/subprojects/groovy-astbuilder/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/subprojects/groovy-astbuilder/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
index a7f532f..94f88b4 100644
--- a/subprojects/groovy-astbuilder/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
+++ b/subprojects/groovy-astbuilder/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
@@ -1 +1,17 @@
+# 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 for AST Builder
org.apache.groovy.ast.builder.AstBuilderTransformation
diff --git a/subprojects/groovy-contracts/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/subprojects/groovy-contracts/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
index d9a4cec..a5c12e0 100644
--- a/subprojects/groovy-contracts/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
+++ b/subprojects/groovy-contracts/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
@@ -1,2 +1,18 @@
+# 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 xforms for groovy-contracts
org.apache.groovy.contracts.ast.GContractsASTTransformation
org.apache.groovy.contracts.ast.ClosureExpressionEvaluationASTTransformation
\ No newline at end of file
diff --git a/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
index faa45b3..e080e18 100644
--- a/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
+++ b/subprojects/groovy-macro/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
@@ -1,2 +1,18 @@
+# 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 for macro support
org.codehaus.groovy.macro.transform.MacroTransformation
org.codehaus.groovy.macro.transform.MacroClassTransformation
[groovy] 03/04: Revert "jarjar experiment"
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 596aa2eeb0f17a2bb6a815eb5248d144042b33de
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Mar 5 20:14:43 2022 +1000
Revert "jarjar experiment"
This reverts commit 129b277bb89eb600744d89ae42ca8c117adbd246.
---
buildSrc/src/main/groovy/org.apache.groovy-common.gradle | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle b/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
index 1863e2a..cb9ceeb 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
@@ -66,7 +66,6 @@ tasks.named('rat') {
'**/jquery-2.1.1.min.js', // MIT license as per NOTICE/LICENSE files
'.classpath', '.project', '.settings/**', 'bin/**', // Eclipse files
'bootstrap/settings.gradle', // empty file
- '.jqwik-database',
- '**/org.codehaus.groovy.transform.ASTTransformation'
+ '.jqwik-database'
]
}
[groovy] 01/04: Revert "jarjar experiment"
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0a7d878dd18f01c93de2bd0ee92486ac6065f502
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Mar 5 20:13:44 2022 +1000
Revert "jarjar experiment"
This reverts commit bbd7554d4672caffeab8fda9e3bc709e6a062054.
---
.../org.codehaus.groovy.transform.ASTTransformation | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
index 447988f..3836360 100644
--- a/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
+++ b/src/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation
@@ -1 +1,17 @@
+# 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