Upgrade the build environment and dependencies

.github/workflows/gradle-wrapper-validation.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 jobs:
   validation:
     name: "Validation"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v3

.github/workflows/linux-build-release.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -13,14 +13,14 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
-          java-version: 17
+          distribution: 'zulu'
+          java-version: 21
       - name: Set up Docker private registry
         run: |
           docker run -d -p 5000:5000 --restart=always --name registry registry:2
           docker run -d -p 5001:5000 --restart=always --name secure_registry -v "$(pwd)"/src/functTest/resources/auth:/auth:rw -e "REGISTRY_AUTH=htpasswd" -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" -e "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd" registry:2
       - name: Set up Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - name: Compilation
         run: ./gradlew classes
       - name: Validate plugins
@@ -29,6 +29,9 @@ jobs:
         run: ./gradlew test
       - name: Integration tests
         run: ./gradlew integrationTest
+      - name: Clean Docker cache
+        run: docker builder prune -af --filter "until=24h"
+        continue-on-error: true
       - name: Functional tests
         env:
           DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -41,17 +44,17 @@ jobs:
       - name: Assemble artifacts
         run: ./gradlew assemble javadoc asciidoctorAllGuides
       - name: Upload binaries
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: gradle-docker-plugin-bin
           path: build/libs/*.jar
       - name: Upload Javadoc
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: gradle-docker-plugin-javadoc
           path: build/docs/javadoc/
       - name: Upload Guides
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: gradle-docker-plugin-guides
           path: |

.github/workflows/windows-build.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 jobs:
   build:
     name: Build
-    runs-on: windows-2019
+    runs-on: windows-2025
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -13,10 +13,10 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
-          java-version: 17
+          distribution: 'zulu'
+          java-version: 21
       - name: Set up Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
       - name: Compilation
         run: ./gradlew classes
       - name: Unit tests

build.gradle.kts

@@ -31,9 +31,12 @@ dependencies {
     shaded(libs.bundles.docker.java)
     shaded(libs.activation)
     shaded(libs.asm)
+    testImplementation("org.junit.jupiter:junit-jupiter:5.13.4")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation(libs.spock.core) {
         exclude(group = "org.codehaus.groovy")
     }
+    testRuntimeOnly(libs.cglib.nodep)
     testImplementation(libs.zt.zip)
     functionalTestImplementation(libs.commons.vfs2)
 }
@@ -61,34 +64,38 @@ gradlePlugin {
             displayName = "Gradle Docker Remote API Plugin"
             description = "Plugin that provides tasks for interacting with Docker via its remote API."
             implementationClass = "com.bmuschko.gradle.docker.DockerRemoteApiPlugin"
+            tags.set(listOf("docker", "container", "image", "lightweight", "vm", "linux"))
         }
         create("docker-java-application") {
             id = "com.bmuschko.docker-java-application"
             displayName = "Gradle Docker Java Application Plugin"
             description = "Plugin that provides conventions for building and publishing Docker images for Java applications."
             implementationClass = "com.bmuschko.gradle.docker.DockerJavaApplicationPlugin"
+            tags.set(listOf("docker", "container", "image", "lightweight", "vm", "linux"))
         }
         create("docker-spring-boot-application") {
             id = "com.bmuschko.docker-spring-boot-application"
             displayName = "Gradle Docker Spring Boot Application Plugin"
             description = "Plugin that provides conventions for building and publishing Docker images for Spring Boot applications."
             implementationClass = "com.bmuschko.gradle.docker.DockerSpringBootApplicationPlugin"
+            tags.set(listOf("docker", "container", "image", "lightweight", "vm", "linux"))
         }
     }
 }
 
-pluginBundle {
-    website = "https://github.com/bmuschko/gradle-docker-plugin"
-    vcsUrl = "https://github.com/bmuschko/gradle-docker-plugin"
-    tags = listOf("docker", "container", "image", "lightweight", "vm", "linux")
+gradlePlugin {
+    website.set("https://github.com/bmuschko/gradle-docker-plugin")
+    vcsUrl.set("https://github.com/bmuschko/gradle-docker-plugin")
 }
 
-buildScan {
-    termsOfServiceUrl = "https://gradle.com/terms-of-service"
-    termsOfServiceAgree = "yes"
+develocity {
+    buildScan {
+        termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
+        termsOfUseAgree.set("yes")
 
-    if (!System.getenv("CI").isNullOrEmpty()) {
-        publishAlways()
-        tag("CI")
+        if (!System.getenv("CI").isNullOrEmpty()) {
+            publishing.onlyIf { true }
+            tag("CI")
+        }
     }
 }

buildSrc/build.gradle.kts

@@ -6,6 +6,21 @@ plugins {
 repositories {
     mavenCentral()
     gradlePluginPortal()
+    maven {
+        name = "ajoberstar-backup"
+        url = uri("https://ajoberstar.org/bintray-backup/")
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("buildsrcLibs")

gradle/buildsrc.libs.versions.toml

@@ -4,12 +4,12 @@ asciidoctorj-tabbed-code-extension = "0.3"
 grgit = "1.9.1"
 gradle-git = "1.7.1"
 gradle-git-publish = "0.3.3"
-shadow = "7.1.2"
+shadow = "8.3.8"
 
 [libraries]
 asciidoctor-jvm-plugin = { module = "org.asciidoctor:asciidoctor-gradle-jvm", version.ref = "asciidoctor-jvm-plugin" }
 asciidoctorj-tabbed-code-extension = { module = "com.bmuschko:asciidoctorj-tabbed-code-extension", version.ref = "asciidoctorj-tabbed-code-extension" }
 grgit = { module = "org.ajoberstar:grgit", version.ref = "grgit" }
 gradle-git = { module = "org.ajoberstar:gradle-git", version.ref = "gradle-git" }
 gradle-git-publish = { module = "org.ajoberstar:gradle-git-publish", version.ref = "gradle-git-publish" }
-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "shadow" }
+shadow = { module = "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }

gradle/libs.versions.toml

@@ -1,9 +1,10 @@
 [versions]
-plugin-publish = "1.1.0"
-docker-java = "3.3.3"
+plugin-publish = "2.0.0"
+docker-java = "3.6.0"
 activation = "1.1.1"
-asm = "9.6"
-spock = "2.0-groovy-3.0"
+asm = "9.9"
+spock = "2.3-groovy-3.0"
+cglib-nodep = "3.3.0"
 zt-zip = "1.13"
 commons-vfs2 = "2.9.0"
 
@@ -17,6 +18,7 @@ docker-java-transport-httpclient5 = { module = "com.github.docker-java:docker-ja
 activation = { module = "javax.activation:activation", version.ref = "activation" }
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
 spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
+cglib-nodep = { module = "cglib:cglib-nodep", version.ref = "cglib-nodep" }
 zt-zip = { module = "org.zeroturnaround:zt-zip", version.ref = "zt-zip" }
 commons-vfs2 = { module = "org.apache.commons:commons-vfs2", version.ref = "commons-vfs2" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.enterprise") version("3.10.2")
+    id("com.gradle.develocity") version("4.1")
 }
 
 rootProject.name = "gradle-docker-plugin"

src/docTest/groovy/com/bmuschko/gradle/docker/RemoteApiPluginDocumentationTest.groovy

@@ -3,7 +3,7 @@ package com.bmuschko.gradle.docker
 import org.gradle.testkit.runner.BuildResult
 import spock.lang.Unroll
 
-import static com.bmuschko.gradle.docker.TextUtils.containsIgnoreLineEndings
+import static com.bmuschko.gradle.docker.TextUtils.equalsIgnoreLineEndings
 
 class RemoteApiPluginDocumentationTest extends AbstractDocumentationTest {
 
@@ -102,10 +102,12 @@ class RemoteApiPluginDocumentationTest extends AbstractDocumentationTest {
         copySampleCode("remote-api-plugin/dockerfile-instructions/$dsl.language")
 
         when:
-        BuildResult result = build('printDockerfileInstructions')
+        build('printDockerfileInstructions')
 
         then:
-        containsIgnoreLineEndings(result.output, """FROM openjdk:8-alpine
+        def outputFile = new File(projectDir, 'build/dockerfile-instructions.txt')
+        outputFile.exists()
+        equalsIgnoreLineEndings(outputFile.text, """FROM openjdk:8-alpine
 COPY my-app-1.0.jar /app/my-app-1.0.jar
 ENTRYPOINT ["java"]
 CMD ["-jar", "/app/my-app-1.0.jar"]

src/docs/asciidoc/user-guide/00-intro.adoc

@@ -7,7 +7,7 @@ Docker remote API is handled by the https://github.com/docker-java/docker-java[D
 Please refer to the library's documentation for more information on the supported Docker's client API and Docker server version.
 
 [IMPORTANT]
-This plugin requires Gradle >= 7.4.0 to work properly.
+This plugin requires Gradle >= 8.4.0 to work properly.
 
 === Benefits