You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2025/03/20 20:48:22 UTC
(groovy) branch GROOVY-11571 updated (ee67ad47d6 -> 072fa9b62a)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY-11571
in repository https://gitbox.apache.org/repos/asf/groovy.git
discard ee67ad47d6 remove excess manifest attributes
new 072fa9b62a remove excess manifest attributes
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ee67ad47d6)
\
N -- N -- N refs/heads/GROOVY-11571 (072fa9b62a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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/org/apache/groovy/gradle/GroovyLibraryExtension.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(groovy) 01/01: remove excess manifest attributes
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY-11571
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 072fa9b62a40e14cd5806eb3bd6878653e3706af
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Mar 20 15:32:31 2025 -0500
remove excess manifest attributes
---
build-logic/src/main/groovy/org.apache.groovy-core.gradle | 2 +-
.../groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-core.gradle b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
index e07408deb4..0f201e9e83 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-core.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
@@ -119,7 +119,7 @@ tasks.named('jarjar') { JarJarTask jjt ->
jjt.withManifest {
instruction '-nouses', 'true'
instruction 'Export-Package', "*;version=${groovyBundleVersion}"
- instruction 'Eclipse-ExtensibleAPI', 'true'
+ instruction 'Eclipse-ExtensibleAPI', 'true' // GROOVY-8713, GROOVY-11582
}
}
diff --git a/build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy b/build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
index acd7be5a44..b9d1c6b31b 100644
--- a/build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
+++ b/build-logic/src/main/groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy
@@ -211,8 +211,6 @@ class GroovyLibraryExtension {
'Bundle-Vendor' : 'The Apache Software Foundation',
'Bundle-Version' : groovyBundleVersion,
'Bundle-License' : 'Apache-2.0',
- 'DynamicImport-Package' : '*',
- 'Eclipse-BuddyPolicy' : 'dependent',
'Specification-Title' : 'Groovy: a powerful, multi-faceted language for the JVM',
'Specification-Vendor' : 'The Apache Software Foundation',
'Specification-Version' : groovyBundleVersion,
@@ -221,7 +219,11 @@ class GroovyLibraryExtension {
'Implementation-Version': groovyBundleVersion
)
if (projectName == 'groovy') {
- attributes('Main-Class': 'groovy.ui.GroovyMain')
+ attributes(
+ 'DynamicImport-Package': '*', // GROOVY-3192
+ 'Eclipse-BuddyPolicy' : 'dependent', // GROOVY-5571
+ 'Main-Class' : 'groovy.ui.GroovyMain'
+ )
}
}
}