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 2023/01/31 02:47:17 UTC
[groovy] branch master updated: GROOVY-10881: FastStringUtils does not work in an OSGi environment (additional tweaks)
This is an automated email from the ASF dual-hosted git repository.
paulk 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 4da23bafae GROOVY-10881: FastStringUtils does not work in an OSGi environment (additional tweaks)
4da23bafae is described below
commit 4da23bafae8498a5a9782e34605169eb8a348699
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Jan 31 12:45:16 2023 +1000
GROOVY-10881: FastStringUtils does not work in an OSGi environment (additional tweaks)
---
build-logic/src/main/groovy/org.apache.groovy-base.gradle | 3 ++-
.../groovy/org/apache/groovy/gradle/GroovyLibraryExtension.groovy | 4 +---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
index 867ab300fa..e73f90c3ca 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -202,8 +202,9 @@ tasks.register("jarjar", JarJarTask) {
outputFile = tasks.named('jar').flatMap { layout.buildDirectory.file("libs/${it.archiveBaseName.get()}-${it.archiveVersion.get()}${it.archiveClassifier.get() ? '-' + it.archiveClassifier.get() : ''}.jar") }
withManifest {
+ def extras = project.name == 'groovy' ? ['Main-Class': 'groovy.ui.GroovyMain'] : [:]
def moduleName = "org.apache.${project.name.replace('-', '.')}"
- attributes('Automatic-Module-Name': moduleName)
+ attributes('Automatic-Module-Name': moduleName, 'Bundle-Name': 'Groovy module: ' + project.name, *:extras)
groovyLibrary.configureManifest(it, excludedFromManifest)
classpath = configurations.runtimeClasspath
}
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 864ea10fb3..83b58617ca 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
@@ -208,14 +208,12 @@ class GroovyLibraryExtension {
'Implementation-Version': groovyBundleVersion,
'Implementation-Vendor': 'The Apache Software Foundation',
'Bundle-ManifestVersion': '2',
- 'Bundle-Name': 'Groovy Runtime',
'Bundle-Description': 'Groovy Runtime',
'Bundle-Version': groovyBundleVersion,
'Bundle-Vendor': 'The Apache Software Foundation',
'Bundle-ClassPath': '.',
'Eclipse-BuddyPolicy': 'dependent',
- 'DynamicImport-Package': '*',
- 'Main-Class': 'groovy.ui.GroovyMain')
+ 'DynamicImport-Package': '*')
}
}