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 ee67ad47d6143331d010b24a3cdd1c0718880851 Author: Eric Milles <[email protected]> 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..36004228b6 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': '*', + 'Eclipse-BuddyPolicy' : 'dependent', + 'Main-Class' : 'groovy.ui.GroovyMain' + ) } } }
