[groovy] branch master updated: GROOVY-10881: FastStringUtils does not work in an OSGi environment

[pa...@apache.org]

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 c8ba5ba810 GROOVY-10881: FastStringUtils does not work in an OSGi environment
c8ba5ba810 is described below

commit c8ba5ba810edc5c593f42475ffe0d47fd970d61c
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Jan 25 18:53:55 2023 +1000

    GROOVY-10881: FastStringUtils does not work in an OSGi environment
---
 build-logic/src/main/groovy/org.apache.groovy-library.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-logic/src/main/groovy/org.apache.groovy-library.gradle b/build-logic/src/main/groovy/org.apache.groovy-library.gradle
index 136c63c836..88fb20af61 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-library.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-library.gradle
@@ -36,8 +36,8 @@ tasks.named('jarjar') { JarJarTask it ->
         version = groovyBundleVersion
         instruction '-nouses', 'true'
         instruction 'Export-Package', "*;version=${groovyBundleVersion}"
-        def folder = new File( "${projectDir}/subprojects/${symbolicName}/src/main/resources/META-INF/services" )
-        if( folder.exists() ) {
+        def folder = file("${projectDir}/src/main/resources/META-INF/services")
+        if (folder.exists()) {
             if (folder.listFiles().count { it.name ==~ /^(?!(org.codehaus.groovy.transform.ASTTransformation)$).*$/ } > 0) {
                 instruction 'Require-Capability', 'osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"'
                 instruction 'Require-Capability', 'osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)"'
@@ -48,4 +48,4 @@ tasks.named('jarjar') { JarJarTask it ->
             }
         }
     }
-}
\ No newline at end of file
+}