Merge pull request #468 from nebula-plugins/gradle-9-support

rpalcolea · web-flow · commit 07ae1b677e4d · 2025-06-26T16:58:55.000-07:00
Gradle 9.x support
diff --git a/.github/workflows/nebula.yml b/.github/workflows/nebula.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         # test against latest update of some major Java version(s), as well as specific LTS version(s)
-        java: [8, 17, 21]
+        java: [17, 21]
     name: Gradle Build without Publish
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            8
+            17
             ${{ matrix.java }}
           java-package: jdk
       - uses: actions/cache@v4
@@ -75,7 +75,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            8
+            17
             21
           java-package: jdk
       - uses: actions/cache@v4
@@ -120,7 +120,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            8
+            17
             21
           java-package: jdk
       - uses: actions/cache@v4
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@
  *
  */
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '21.3.3'
+    id 'com.netflix.nebula.plugin-plugin' version '22.0.2'
     id 'java-library'
 }
 
@@ -46,7 +46,7 @@ dependencies {
         // Where logging goes is a runtime decision
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     }
-    api('org.vafer:jdeb:1.10') {
+    api('org.vafer:jdeb:1.14') {
         // Individual listing so that they translate into the pom file
         exclude group: 'org.apache.maven', module: 'maven-core'
         exclude group: 'org.apache.maven', module: 'maven-plugin-api'
@@ -66,10 +66,6 @@ tasks.withType(Javadoc) {
     options.links(javaApiUrl, groovyApiUrl)
 }
 
-test {
-    maxHeapSize = '384m'
-}
-
 gradlePlugin {
     plugins {
         ospackage {
diff --git a/gradle.lockfile b/gradle.lockfile
@@ -3,37 +3,41 @@
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath
 com.bmuschko:gradle-docker-plugin:3.2.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.luben:zstd-jni:1.5.6-3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.github.stefanbirkner:system-rules:1.19.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-test:10.6.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.6=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-test:11.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+commons-codec:commons-codec:1.17.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+commons-io:commons-io:2.16.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.airlift:aircompressor:0.27=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+javax.inject:javax.inject:1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit-dep:4.11=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.ant:ant-launcher:1.10.12=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.ant:ant:1.10.12=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.commons:commons-compress:1.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.commons:commons-lang3:3.9=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.maven.shared:maven-shared-utils:3.3.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.maven:maven-archiver:3.5.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.maven:maven-model:3.1.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.ant:ant-launcher:1.10.15=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.ant:ant:1.10.15=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.commons:commons-compress:1.26.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.commons:commons-lang3:3.14.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.maven:maven-archiver:3.6.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk15on:1.62=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.bouncycastle:bcprov-jdk15on:1.62=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:3.0.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.plexus:plexus-archiver:4.2.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.plexus:plexus-interpolation:1.26=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.plexus:plexus-io:3.2.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.codehaus.plexus:plexus-archiver:4.10.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.codehaus.plexus:plexus-interpolation:1.27=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.codehaus.plexus:plexus-io:3.5.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.iq80.snappy:snappy:0.4=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.redline-rpm:redline:1.2.10=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.5=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:1.7.36=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.sonatype.plexus:plexus-cipher:1.4=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.sonatype.plexus:plexus-sec-dispatcher:1.4=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.3-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-junit4:2.3-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.tukaani:xz:1.4=compileClasspath,integTestCompileClasspath,testCompileClasspath
-org.tukaani:xz:1.8=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-org.vafer:jdeb:1.10=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.tukaani:xz:1.9=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
+org.vafer:jdeb:1.14=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor,integTestAnnotationProcessor,testAnnotationProcessor
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/groovy/com/netflix/gradle/plugins/deb/Deb.groovy b/src/main/groovy/com/netflix/gradle/plugins/deb/Deb.groovy
@@ -20,6 +20,7 @@ import com.netflix.gradle.plugins.packaging.AbstractPackagingCopyAction
 import com.netflix.gradle.plugins.packaging.Dependency
 import com.netflix.gradle.plugins.packaging.SystemPackagingTask
 import com.netflix.gradle.plugins.utils.DeprecationLoggerUtils
+import groovy.transform.CompileDynamic
 import org.gradle.api.file.ProjectLayout
 import org.gradle.api.internal.ConventionMapping
 import org.gradle.api.internal.IConventionAware
@@ -31,7 +32,8 @@ import org.gradle.work.DisableCachingByDefault
 import javax.inject.Inject
 
 @DisableCachingByDefault
-class Deb extends SystemPackagingTask {
+@CompileDynamic
+abstract class Deb extends SystemPackagingTask {
 
     @Inject
     Deb(ProjectLayout projectLayout) {
diff --git a/src/main/groovy/com/netflix/gradle/plugins/docker/DockerCopyAction.groovy b/src/main/groovy/com/netflix/gradle/plugins/docker/DockerCopyAction.groovy
@@ -46,6 +46,6 @@ class DockerCopyAction extends AbstractPackagingCopyAction<SystemPackageDockerfi
 
     @Override
     protected void end() {
-        dockerfileInstructionManager.create(task.archivePath)
+        dockerfileInstructionManager.create(task.archiveFile.get().asFile)
     }
 }
diff --git a/src/main/groovy/com/netflix/gradle/plugins/docker/SystemPackageDockerfile.groovy b/src/main/groovy/com/netflix/gradle/plugins/docker/SystemPackageDockerfile.groovy
@@ -9,7 +9,7 @@ import org.gradle.work.DisableCachingByDefault
 import javax.inject.Inject
 
 @DisableCachingByDefault
-class SystemPackageDockerfile extends SystemPackagingTask {
+abstract class SystemPackageDockerfile extends SystemPackagingTask {
     private final DockerfileInstructionManager dockerfileInstructionManager
     private static final ARCHIVE_NAME = 'Dockerfile'
 
diff --git a/src/main/groovy/com/netflix/gradle/plugins/packaging/OsPackageAbstractArchiveTask.groovy b/src/main/groovy/com/netflix/gradle/plugins/packaging/OsPackageAbstractArchiveTask.groovy
@@ -1,12 +1,14 @@
 package com.netflix.gradle.plugins.packaging
 
+import groovy.transform.CompileDynamic
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.bundling.AbstractArchiveTask
 import org.gradle.work.DisableCachingByDefault
 
 import javax.annotation.Nullable
 
 @DisableCachingByDefault
+@CompileDynamic
 abstract class OsPackageAbstractArchiveTask extends AbstractArchiveTask {
 
     OsPackageAbstractArchiveTask() {
diff --git a/src/main/groovy/com/netflix/gradle/plugins/rpm/Rpm.groovy b/src/main/groovy/com/netflix/gradle/plugins/rpm/Rpm.groovy
@@ -19,6 +19,7 @@ package com.netflix.gradle.plugins.rpm
 import com.netflix.gradle.plugins.packaging.AbstractPackagingCopyAction
 import com.netflix.gradle.plugins.packaging.SystemPackagingTask
 import com.netflix.gradle.plugins.utils.DeprecationLoggerUtils
+import groovy.transform.CompileDynamic
 import org.gradle.api.file.ProjectLayout
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.Optional
@@ -34,7 +35,8 @@ import org.gradle.api.internal.IConventionAware
 import javax.inject.Inject
 
 @DisableCachingByDefault
-class Rpm extends SystemPackagingTask {
+@CompileDynamic
+abstract class Rpm extends SystemPackagingTask {
     @InputFile
     @Optional
     @PathSensitive(PathSensitivity.NONE)
diff --git a/src/main/groovy/com/netflix/gradle/plugins/utils/FilePermissionUtil.groovy b/src/main/groovy/com/netflix/gradle/plugins/utils/FilePermissionUtil.groovy
@@ -1,29 +1,64 @@
 package com.netflix.gradle.plugins.utils
 
+import groovy.transform.CompileDynamic
 import org.gradle.api.file.FileCopyDetails
 import org.gradle.api.file.SyncSpec
-import org.gradle.util.GradleVersion
 
 /**
  * Utility class to get the unix permission of a file.
  */
+@CompileDynamic
 class FilePermissionUtil {
 
     /**
      * Get the unix permission of a file.
-     * Gradle 8.3 introduced a new way to get the unix permission of a file.
-     * Gradle 8.8 deprecated the old way. @see https://docs.gradle.org/8.8-rc-1/userguide/upgrading_version_8.html#unix_file_permissions_deprecated
-     * @param details
-     * @return
+     * 
+     * <p>In Gradle 9.0, the new permissions API (details.permissions.toUnixNumeric()) may not correctly 
+     * detect executable bits for files, often returning 0644 instead of 0755 for executable files. 
+     * This method implements a fallback mechanism that detects when the API fails to identify executable 
+     * files and uses filesystem-level checks (File.canExecute()) to determine the correct permissions.</p>
+     * 
+     * <p>The fallback logic is triggered when:
+     * <ul>
+     * <li>The file exists and is marked as executable at the filesystem level</li>
+     * <li>But the Gradle permissions API reports no executable bits (mode & 0111 == 0)</li>
+     * </ul>
+     * In such cases, this method uses direct filesystem permission checks to return appropriate 
+     * Unix permission values (0755 for rwx, 0555 for r-x, etc.).</p>
+     * 
+     * @param details FileCopyDetails containing file information and permissions
+     * @return Unix permission as integer (e.g., 0755, 0644)
      */
     static int getUnixPermission(FileCopyDetails details) {
-        return isOlderThanGradle8_3() ? details.mode : details.permissions.toUnixNumeric()
+
+        int newApiMode = details.permissions.toUnixNumeric()
+        
+        // Gradle 9.0 permissions API may not detect executable bits correctly
+        // Fallback: check the actual file permissions if the API seems wrong
+        try {
+            if (details.file?.canExecute() && (newApiMode & 0111) == 0) {
+                // File is executable but new API didn't detect it - use filesystem check
+                boolean readable = details.file.canRead()
+                boolean writable = details.file.canWrite()
+                boolean executable = details.file.canExecute()
+
+                if (readable && writable && executable) {
+                    return 0755 // rwxr-xr-x
+                } else if (readable && executable) {
+                    return 0555 // r-xr-xr-x
+                } else {
+                    return 0644 // rw-r--r--
+                }
+            }
+        } catch (Exception e) {
+            return newApiMode
+        }
+
+        return newApiMode
     }
 
     /**
      * Get the unix permission of a file.
-     * Gradle 8.3 introduced a new way to get the unix permission of a file.
-     * Gradle 8.8 deprecated the old way. @see https://docs.gradle.org/8.8-rc-1/userguide/upgrading_version_8.html#unix_file_permissions_deprecated
      * @param details
      * @return
      */
@@ -32,9 +67,7 @@ class FilePermissionUtil {
             return null
         }
 
-        if(isOlderThanGradle8_3()) {
-            return copySpecInternal.fileMode
-        } else if(copySpecInternal.filePermissions.present){
+        if(copySpecInternal.filePermissions.present){
             copySpecInternal.filePermissions.get().toUnixNumeric()
         } else {
             return null
@@ -43,8 +76,6 @@ class FilePermissionUtil {
 
     /**
      * Get the unix permission of a directory.
-     * Gradle 8.3 introduced a new way to get the unix permission of a file.
-     * Gradle 8.8 deprecated the old way. @see https://docs.gradle.org/8.8-rc-1/userguide/upgrading_version_8.html#unix_file_permissions_deprecated
      * @param copySpecInternal
      * @return
      */
@@ -53,9 +84,7 @@ class FilePermissionUtil {
             return null
         }
 
-        if(isOlderThanGradle8_3()) {
-            return copySpecInternal.dirMode
-        } else if(copySpecInternal.dirPermissions.present){
+        if(copySpecInternal.dirPermissions.present){
             copySpecInternal.dirPermissions.get().toUnixNumeric()
         } else {
             return null
@@ -64,31 +93,24 @@ class FilePermissionUtil {
 
     /**
      * Set the unix permission of a file.
-     * Gradle 8.3 introduced a new way to set the unix permission of a file.
      * @param copySpec
      * @param permission
      */
     static void setFilePermission(SyncSpec copySpec, int permission) {
-        isOlderThanGradle8_3() ?
-                copySpec.setFileMode(permission) : copySpec.filePermissions {
+        copySpec.filePermissions {
             it.unix(permission)
         }
     }
 
     /**
      * Set the unix permission of a directory.
-     * Gradle 8.3 introduced a new way to set the unix permission of a file.
      * @param copySpec
      * @param permission
      */
     static void setDirPermission(SyncSpec copySpec, int permission) {
-        isOlderThanGradle8_3() ?
-                copySpec.setDirMode(permission) : copySpec.dirPermissions {
+        copySpec.dirPermissions {
             it.unix(permission)
         }
     }
 
-    private static final isOlderThanGradle8_3() {
-        return GradleVersion.current().baseVersion < GradleVersion.version('8.3').baseVersion
-    }
 }
diff --git a/src/test/groovy/com/netflix/gradle/plugins/application/OspackageApplicationSpringBootPluginLauncherSpec.groovy b/src/test/groovy/com/netflix/gradle/plugins/application/OspackageApplicationSpringBootPluginLauncherSpec.groovy
diff --git a/src/test/groovy/com/netflix/gradle/plugins/deb/DebPluginTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/deb/DebPluginTest.groovy
diff --git a/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerPluginTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerPluginTest.groovy
diff --git a/src/test/groovy/com/netflix/gradle/plugins/packaging/SystemPackagingBasePluginTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/packaging/SystemPackagingBasePluginTest.groovy

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ class DockerCopyAction extends AbstractPackagingCopyAction<SystemPackageDockerfi`
`46`	`46`
`47`	`47`	`@Override`
`48`	`48`	`protected void end() {`
`49`		`- dockerfileInstructionManager.create(task.archivePath)`
	`49`	`+ dockerfileInstructionManager.create(task.archiveFile.get().asFile)`
`50`	`50`	`}`
`51`	`51`	`}`