update to OpenJDK 21, Gradle 8.4

gradle-plugin-asciidoctor/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-asciidoctor
-version = 3.0.0
+version = 3.0.1

gradle-plugin-docker/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-docker
-version = 3.0.0
+version = 3.0.1

gradle-plugin-git/build.gradle

@@ -13,7 +13,7 @@ dependencies {
     api libs.groovy.git
     testImplementation gradleTestKit()
     testImplementation  libs.spock.core
-    testImplementation libs.junit4
+    testImplementation testLibs.junit4
 }
 
 if (project.hasProperty('gradle.publish.key')) {

gradle-plugin-git/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-docker
-version = 3.0.0
+version = 3.0.1

gradle-plugin-jacc/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-jacc
-version = 3.0.0
+version = 3.0.1

gradle-plugin-jacc/src/main/groovy/org/xbib/gradle/plugin/jacc/JaccTask.groovy

@@ -26,8 +26,12 @@ class JaccTask extends DefaultTask {
 
     static String getPackageName(File file) {
         String string = file.readLines().find { line ->
-            line.startsWith('package')
+            line.startsWith('package ') || line.startsWith('%package ')
         }
-        return string == null ? '' : string.substring(8, string.length() - 1)
+        if (string == null) {
+            return ''
+        }
+        int pos = string.indexOf(' ')
+        string = string.substring(pos + 1).replace(';', '')
     }
 }

gradle-plugin-jacc/src/test/groovy/org/xbib/gradle/plugin/jacc/JaccPluginTest.groovy

@@ -56,10 +56,12 @@ sourceSets {
                 .build()
         assertEquals(TaskOutcome.SUCCESS, result.task(":build").getOutcome())
 
-        File file = new File("${System.getProperty('user.dir')}/build/my-generated-sources/jacc")
+        File file = new File("${System.getProperty('user.dir')}/build/my-generated-sources/jacc/org/xbib/gradle/plugin/jacc/calc")
         if (file.exists()) {
             List<File> list = Arrays.asList(file.listFiles())
             assertEquals(2, list.size())
+        } else {
+            fail()
         }
     }
 }

gradle-plugin-jacc/src/test/jacc/simpleCalc.jacc

@@ -6,6 +6,7 @@
 //     ... enter arithmetic expressions ... hit EOF to terminate
 //
 
+%package org.xbib.gradle.plugin.jacc.calc
 %class     Calc
 %interface CalcTokens
 %semantic  int : yylval

gradle-plugin-jflex/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-jflex
-version = 3.0.0
+version = 3.0.1

gradle-plugin-rpm/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-rpm
-version = 3.0.1
+version = 3.0.2

gradle-plugin-shadow/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-shadow
-version = 3.0.0
+version = 3.0.1

gradle-plugin-shadow/src/main/groovy/org/xbib/gradle/plugin/shadow/internal/Clazzpath.groovy

@@ -1,5 +1,6 @@
 package org.xbib.gradle.plugin.shadow.internal
 
+import groovy.io.FileType
 import org.objectweb.asm.ClassReader
 
 import java.util.jar.JarEntry
@@ -53,14 +54,14 @@ class Clazzpath {
         } else if (Files.isDirectory(path)) {
             String prefix = Utils.separatorsToUnix(Utils.normalize(path.toString() + File.separatorChar))
             List<Resource> list = []
-            path.traverse { p ->
+            path.traverse(type: FileType.FILES, nameFilter: ~/.*\.class$/) { p ->
                 if (Files.isRegularFile(p) && isValidResourceName(p.getFileName().toString())) {
-                    list << new Resource(p.toString().substring(prefix.length())) {
+                    list.add(new Resource(p.toString().substring(prefix.length())) {
                         @Override
                         InputStream getInputStream() throws IOException {
                             Files.newInputStream(p)
                         }
-                    }
+                    })
                 }
             }
             return addClazzpathUnit(list, s, true)

gradle-plugin-shadow/src/main/groovy/org/xbib/gradle/plugin/shadow/internal/ClazzpathUnit.groovy

@@ -8,7 +8,9 @@ class ClazzpathUnit {
 
     private final Map<String, Clazz> dependencies
 
-    ClazzpathUnit(String s, Map<String, Clazz> clazzes, Map<String, Clazz> dependencies) {
+    ClazzpathUnit(String s,
+                  Map<String, Clazz> clazzes,
+                  Map<String, Clazz> dependencies) {
         this.s = s
         this.clazzes = clazzes
         this.dependencies = dependencies

gradle-plugin-shadow/src/main/groovy/org/xbib/gradle/plugin/shadow/tasks/ShadowCopyAction.groovy

@@ -4,6 +4,7 @@ import org.gradle.api.Action
 import org.gradle.api.GradleException
 import org.gradle.api.UncheckedIOException
 import org.gradle.api.file.FileCopyDetails
+import org.gradle.api.file.FilePermissions
 import org.gradle.api.file.FileTreeElement
 import org.gradle.api.file.RelativePath
 import org.gradle.api.internal.DocumentationRegistry
@@ -411,6 +412,7 @@ class ShadowCopyAction implements CopyAction {
     class RelativeArchivePath extends RelativePath {
 
         ZipEntry entry
+
         FileCopyDetails details
 
         RelativeArchivePath(ZipEntry entry, FileCopyDetails fileDetails) {
@@ -472,7 +474,6 @@ class ShadowCopyAction implements CopyAction {
 
         @Override
         void copyTo(OutputStream outputStream) {
-
         }
 
         @Override
@@ -499,5 +500,10 @@ class ShadowCopyAction implements CopyAction {
         int getMode() {
             return archivePath.entry.unixMode
         }
+
+        @Override
+        FilePermissions getPermissions() {
+            return archivePath.details.permissions
+        }
     }
 }

gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/internal/DependencyUtilsTest.groovy

@@ -13,6 +13,7 @@ class DependencyUtilsTest {
     @Test
     void testShouldFindDependenciesOfClassObject() throws Exception {
         Collection<String> dependencies = getDependenciesOfClass(Object).sort()
+        // may vary from JDK to JDK
         Collection<String> expectedDependencies = Arrays.asList(
                 "java.lang.Class",
                 "java.lang.CloneNotSupportedException",
@@ -23,6 +24,7 @@ class DependencyUtilsTest {
                 "java.lang.Object",
                 "java.lang.String",
                 "java.lang.StringBuilder",
+                "java.lang.Thread",
                 "java.lang.Throwable")
                 .sort()
         // we do not care about jdk.internal classes, they vary between JDK versions and even JVMs