diff --git a/build.gradle b/build.gradle index 4b77b30d..fdfddcb6 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ import org.gradle.api.attributes.plugin.GradlePluginApiVersion * */ plugins { - id 'com.netflix.nebula.plugin-plugin' version '22.0.2' + id 'com.netflix.nebula.plugin-plugin' version '25.+' id 'java-library' } @@ -59,8 +59,12 @@ dependencies { implementation 'com.bmuschko:gradle-docker-plugin:10.0.0' testImplementation 'com.github.stefanbirkner:system-rules:1.19.0' + testImplementation("org.spockframework:spock-core:2.4-groovy-4.0") + testImplementation("org.spockframework:spock-junit4:2.4-groovy-4.0") } + + def javaApiUrl = 'http://docs.oracle.com/javase/1.6.0/docs/api/' def groovyApiUrl = 'http://groovy.codehaus.org/gapi/' @@ -90,6 +94,11 @@ gradlePlugin { description = project.description implementationClass = 'com.netflix.gradle.plugins.packaging.SystemPackagingPlugin' tags.set(['nebula', 'rpm', 'centos', 'deb', 'debian']) + compatibility { + features { + configurationCache = true + } + } } ospackageApplication { @@ -98,6 +107,11 @@ gradlePlugin { description = 'Packages output of application plugin into a debian or rpm' implementationClass = 'com.netflix.gradle.plugins.application.OspackageApplicationPlugin' tags.set(['nebula', 'os', 'package', 'rpm', 'deb', 'application']) + compatibility { + features { + configurationCache = true + } + } } ospackageApplicationDaemon { @@ -106,6 +120,11 @@ gradlePlugin { description = 'Creates daemontools setup to run output from application plugin' implementationClass = 'com.netflix.gradle.plugins.application.OspackageApplicationDaemonPlugin' tags.set(['nebula', 'os', 'package', 'rpm', 'deb', 'application', 'daemon']) + compatibility { + features { + configurationCache = true + } + } } ospackageApplicationSpring { @@ -114,6 +133,11 @@ gradlePlugin { description = 'Packages output of application plugin into a debian or rpm' implementationClass = 'com.netflix.gradle.plugins.application.OspackageApplicationSpringBootPlugin' tags.set(['nebula', 'os', 'package', 'rpm', 'deb', 'application', 'spring']) + compatibility { + features { + configurationCache = true + } + } } ospackageBase { @@ -122,6 +146,11 @@ gradlePlugin { description = 'Setup base publishing for OS packages' implementationClass = 'com.netflix.gradle.plugins.packaging.SystemPackagingBasePlugin' tags.set(['nebula', 'rpm', 'centos', 'deb', 'debian']) + compatibility { + features { + configurationCache = true + } + } } ospackageDaemon { @@ -130,6 +159,11 @@ gradlePlugin { description = 'Create daemontools runner' implementationClass = 'com.netflix.gradle.plugins.daemon.OspackageDaemonPlugin' tags.set(['nebula', 'os', 'package', 'rpm', 'deb', 'daemon']) + compatibility { + features { + configurationCache = true + } + } } ospackageDocker { @@ -138,6 +172,11 @@ gradlePlugin { description = 'Create docker images from ospackage block' implementationClass = 'com.netflix.gradle.plugins.docker.OsPackageDockerPlugin' tags.set(['nebula', 'docker']) + compatibility { + features { + configurationCache = true + } + } } ospackageDockerBase { @@ -146,6 +185,11 @@ gradlePlugin { description = 'Setup base publishing for docker images' implementationClass = 'com.netflix.gradle.plugins.docker.OsPackageDockerBasePlugin' tags.set(['nebula', 'docker']) + compatibility { + features { + configurationCache = true + } + } } deb { @@ -154,6 +198,11 @@ gradlePlugin { description = 'Create debian system packages' implementationClass = 'com.netflix.gradle.plugins.deb.DebPlugin' tags.set(['nebula', 'deb', 'debian']) + compatibility { + features { + configurationCache = true + } + } } rpm { @@ -162,6 +211,11 @@ gradlePlugin { description = 'Create RPM system packages' implementationClass = 'com.netflix.gradle.plugins.rpm.RpmPlugin' tags.set(['nebula', 'rpm', 'centos']) + compatibility { + features { + configurationCache = true + } + } } } } diff --git a/gradle.lockfile b/gradle.lockfile index df3e5fdb..86fe7a9a 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -5,38 +5,45 @@ cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath com.bmuschko:gradle-docker-plugin:10.0.0=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:11.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:nebula-test:11.12.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 +io.leangen.geantyref:geantyref:1.3.16=integTestRuntimeClasspath,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 +net.bytebuddy:byte-buddy:1.18.3=integTestCompileClasspath,integTestRuntimeClasspath,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.groovy:groovy-bom:4.0.29=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.groovy:groovy:4.0.29=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.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,testCompileClasspath +org.assertj:assertj-core:3.27.7=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.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.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.hamcrest:hamcrest:3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:2.4=integTestRuntimeClasspath,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.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.spockframework:spock-bom:2.4-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-junit4:2.4-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.tukaani:xz:1.4=compileClasspath,integTestCompileClasspath,testCompileClasspath org.tukaani:xz:1.9=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.vafer:jdeb:1.14=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath