(groovy) branch master updated: remove excess manifest attributes

[emilles]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 50500bc543 remove excess manifest attributes
50500bc543 is described below

commit 50500bc543a8b352a36fa591f215dbc9a4430b59
Author: Eric Milles <eric.mil...@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 0aa05d1bad..f825a59371 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-core.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-core.gradle
@@ -118,7 +118,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'
+                )
             }
         }
     }