From 9f743e0763ec79584cbe286607e3fb46d94b84e5 Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Mon, 19 Aug 2024 11:10:46 -0700 Subject: [PATCH] upgrade to org.vafer:jdeb:1.10 --- build.gradle | 2 +- gradle.lockfile | 18 +++++++++++++----- .../ApacheCommonsFileSystemActions.groovy | 2 +- .../gradle/plugins/deb/DebPluginTest.groovy | 6 +++--- .../netflix/gradle/plugins/deb/Scanner.groovy | 4 ++-- .../OsPackageDockerBasePluginTest.groovy | 2 +- .../docker/OsPackageDockerPluginTest.groovy | 2 +- .../SystemPackagingBasePluginTest.groovy | 2 +- .../rpm/RpmPluginIntegrationTest.groovy | 2 +- .../gradle/plugins/rpm/RpmPluginTest.groovy | 2 +- 10 files changed, 25 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index a1998ab3..63ca83cd 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { // Where logging goes is a runtime decision exclude group: 'org.slf4j', module: 'slf4j-log4j12' } - api('org.vafer:jdeb:1.8') { + api('org.vafer:jdeb:1.10') { // 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' diff --git a/gradle.lockfile b/gradle.lockfile index 33303e67..541d3bdb 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -4,20 +4,27 @@ cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath com.bmuschko:gradle-docker-plugin:3.2.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.stefanbirkner:system-rules:1.19.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.netflix.nebula:nebula-test:10.5.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 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.11=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.ant:ant:1.10.11=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,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.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.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.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath @@ -26,6 +33,7 @@ org.redline-rpm:redline:1.2.10=compileClasspath,integTestCompileClasspath,integT 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.tukaani:xz:1.8=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.vafer:jdeb:1.8=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,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 empty=annotationProcessor,integTestAnnotationProcessor,testAnnotationProcessor diff --git a/src/main/groovy/com/netflix/gradle/plugins/utils/ApacheCommonsFileSystemActions.groovy b/src/main/groovy/com/netflix/gradle/plugins/utils/ApacheCommonsFileSystemActions.groovy index 27b1b6e7..2004561a 100644 --- a/src/main/groovy/com/netflix/gradle/plugins/utils/ApacheCommonsFileSystemActions.groovy +++ b/src/main/groovy/com/netflix/gradle/plugins/utils/ApacheCommonsFileSystemActions.groovy @@ -1,6 +1,6 @@ package com.netflix.gradle.plugins.utils -import org.apache.commons.io.FileUtils +import org.vafer.jdeb.shaded.commons.io.FileUtils class ApacheCommonsFileSystemActions implements FileSystemActions { @Override diff --git a/src/test/groovy/com/netflix/gradle/plugins/deb/DebPluginTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/deb/DebPluginTest.groovy index 0279c4f8..984bf56e 100644 --- a/src/test/groovy/com/netflix/gradle/plugins/deb/DebPluginTest.groovy +++ b/src/test/groovy/com/netflix/gradle/plugins/deb/DebPluginTest.groovy @@ -19,7 +19,7 @@ package com.netflix.gradle.plugins.deb import nebula.test.ProjectSpec import nebula.test.dependencies.DependencyGraph import nebula.test.dependencies.GradleDependencyGenerator -import org.apache.commons.io.FileUtils +import org.vafer.jdeb.shaded.commons.io.FileUtils import org.redline_rpm.header.Flags import spock.lang.Issue import spock.lang.Unroll @@ -1135,7 +1135,7 @@ class DebPluginTest extends ProjectSpec { then: def scan = new Scanner(debTask.archivePath) - def emptydir = scan.getEntry('.//var/log/customemptyfolder/') + def emptydir = scan.getEntry('./var/log/customemptyfolder/') emptydir.userName == 'test' emptydir.groupName == 'testgroup' } @@ -1155,7 +1155,7 @@ class DebPluginTest extends ProjectSpec { then: def scan = new Scanner(debTask.archivePath) - def emptydir = scan.getEntry('.//var/log/customemptyfolder/') + def emptydir = scan.getEntry('./var/log/customemptyfolder/') emptydir.userName == 'myuser' emptydir.groupName == 'mygroup' } diff --git a/src/test/groovy/com/netflix/gradle/plugins/deb/Scanner.groovy b/src/test/groovy/com/netflix/gradle/plugins/deb/Scanner.groovy index e4027802..cf1abade 100644 --- a/src/test/groovy/com/netflix/gradle/plugins/deb/Scanner.groovy +++ b/src/test/groovy/com/netflix/gradle/plugins/deb/Scanner.groovy @@ -6,8 +6,8 @@ import org.apache.commons.compress.archivers.ar.ArArchiveInputStream import org.apache.commons.compress.archivers.tar.TarArchiveEntry import org.apache.commons.compress.archivers.tar.TarArchiveInputStream import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream -import org.apache.commons.io.FileUtils -import org.apache.commons.io.IOUtils +import org.vafer.jdeb.shaded.commons.io.FileUtils +import org.vafer.jdeb.shaded.commons.io.IOUtils public class Scanner { static final String CONTROL_GZ_FILE = 'control.tar.gz' diff --git a/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerBasePluginTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerBasePluginTest.groovy index 2cc77f41..4bf312c1 100644 --- a/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerBasePluginTest.groovy +++ b/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerBasePluginTest.groovy @@ -1,7 +1,7 @@ package com.netflix.gradle.plugins.docker import nebula.test.ProjectSpec -import org.apache.commons.io.FileUtils +import org.vafer.jdeb.shaded.commons.io.FileUtils import org.gradle.api.Project import org.gradle.testfixtures.ProjectBuilder diff --git a/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerPluginTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerPluginTest.groovy index 9d013508..2a616a52 100644 --- a/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerPluginTest.groovy +++ b/src/test/groovy/com/netflix/gradle/plugins/docker/OsPackageDockerPluginTest.groovy @@ -1,7 +1,7 @@ package com.netflix.gradle.plugins.docker import nebula.test.ProjectSpec -import org.apache.commons.io.FileUtils +import org.vafer.jdeb.shaded.commons.io.FileUtils class OsPackageDockerPluginTest extends ProjectSpec { diff --git a/src/test/groovy/com/netflix/gradle/plugins/packaging/SystemPackagingBasePluginTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/packaging/SystemPackagingBasePluginTest.groovy index 4c91ca7a..5a715648 100644 --- a/src/test/groovy/com/netflix/gradle/plugins/packaging/SystemPackagingBasePluginTest.groovy +++ b/src/test/groovy/com/netflix/gradle/plugins/packaging/SystemPackagingBasePluginTest.groovy @@ -4,7 +4,7 @@ import com.netflix.gradle.plugins.deb.Deb import com.netflix.gradle.plugins.rpm.Rpm import com.netflix.gradle.plugins.rpm.Scanner import nebula.test.ProjectSpec -import org.apache.commons.io.FileUtils +import org.vafer.jdeb.shaded.commons.io.FileUtils import org.redline_rpm.header.Os import spock.lang.Issue diff --git a/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginIntegrationTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginIntegrationTest.groovy index 1e0ceb8f..5fcccf63 100644 --- a/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginIntegrationTest.groovy +++ b/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginIntegrationTest.groovy @@ -4,7 +4,7 @@ import com.netflix.gradle.plugins.BaseIntegrationTestKitSpec import com.netflix.gradle.plugins.utils.GradleUtils import nebula.test.dependencies.DependencyGraph import nebula.test.dependencies.GradleDependencyGenerator -import org.apache.commons.io.FileUtils +import org.vafer.jdeb.shaded.commons.io.FileUtils import org.gradle.testkit.runner.TaskOutcome import spock.lang.Issue import spock.lang.Unroll diff --git a/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginTest.groovy index cb40b689..ac8dead0 100755 --- a/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginTest.groovy +++ b/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginTest.groovy @@ -20,7 +20,7 @@ package com.netflix.gradle.plugins.rpm import com.netflix.gradle.plugins.packaging.ProjectPackagingExtension import com.netflix.gradle.plugins.utils.JavaNIOUtils import nebula.test.ProjectSpec -import org.apache.commons.io.FileUtils +import org.vafer.jdeb.shaded.commons.io.FileUtils import org.apache.commons.lang3.JavaVersion import org.apache.commons.lang3.SystemUtils import org.gradle.api.Project