From dc0af0997147add2395ed44d3ba4ee73dd99bf3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 13:27:39 +0000 Subject: [PATCH 1/2] Bump net.bytebuddy:byte-buddy from 1.14.7 to 1.14.8 Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.7...byte-buddy-1.14.8) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- engine/build.gradle.kts | 2 +- integrationtest/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts index 6ca378f1..a5b9580d 100644 --- a/engine/build.gradle.kts +++ b/engine/build.gradle.kts @@ -85,7 +85,7 @@ dependencies { implementation("org.bouncycastle:bcpkix-jdk18on:1.76") testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") - testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.7") + testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.8") } java { diff --git a/integrationtest/build.gradle.kts b/integrationtest/build.gradle.kts index 05c30bec..a3205f96 100644 --- a/integrationtest/build.gradle.kts +++ b/integrationtest/build.gradle.kts @@ -62,7 +62,7 @@ dependencies { testRuntimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.8") testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") - testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.7") + testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.8") } tasks.check.get().shouldRunAfter(project(":engine").tasks.check) From 5387d0a37e8aec9c68a6c942bba61bcb8fe109de Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Sun, 24 Sep 2023 09:47:17 +0200 Subject: [PATCH 2/2] Be more lenient in integration tests --- .../de/gesellix/docker/engine/TestConstants.groovy | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/integrationtest/src/test/groovy/de/gesellix/docker/engine/TestConstants.groovy b/integrationtest/src/test/groovy/de/gesellix/docker/engine/TestConstants.groovy index 86ddb701..931b24a6 100644 --- a/integrationtest/src/test/groovy/de/gesellix/docker/engine/TestConstants.groovy +++ b/integrationtest/src/test/groovy/de/gesellix/docker/engine/TestConstants.groovy @@ -23,7 +23,7 @@ class TestConstants { Arch : { it in ["amd64", "arm64"] }, BuildTime : { it =~ "2023-\\d{2}-\\d{2}T\\w+" }, GitCommit : { it =~ "\\w{6,}" }, - GoVersion : { it == "go1.20.6" }, + GoVersion : { it =~ "go\\d+.\\d+.\\d+" }, KernelVersion: { it =~ "\\d.\\d{1,2}.\\d{1,2}\\w*" }, MinAPIVersion: { it == "1.24" }, Os : { it == "windows" }, @@ -35,7 +35,7 @@ class TestConstants { Arch : { it in ["amd64", "arm64"] }, BuildTime : { it =~ "2023-\\d{2}-\\d{2}T\\w+" }, GitCommit : { it =~ "\\w{6,}" }, - GoVersion : { it == "go1.20.6" }, + GoVersion : { it =~ "go\\d+.\\d+.\\d+" }, KernelVersion: { it =~ "\\d.\\d{1,2}.\\d{1,2}\\w*" }, MinAPIVersion: { it == "1.12" }, Os : { it == "linux" }, @@ -48,7 +48,7 @@ class TestConstants { Arch : { it in ["amd64", "arm64"] }, BuildTime : { it =~ "2023-05-25T\\w+" }, GitCommit : { it == "659604f9" }, - GoVersion : { it == "go1.20.4" }, + GoVersion : { it =~ "go\\d+.\\d+.\\d+" }, KernelVersion: { it =~ "\\d.\\d{1,2}.\\d{1,2}\\w*" }, MinAPIVersion: { it == "1.24" }, Os : { it == "windows" }, @@ -56,11 +56,11 @@ class TestConstants { } else { versionDetails = [ - ApiVersion : { it == "1.43" }, + ApiVersion : { it == "1.44" }, Arch : { it in ["amd64", "arm64"] }, - BuildTime : { it =~ "2023-05-25T\\w+" }, - GitCommit : { it == "659604f" }, - GoVersion : { it == "go1.20.4" }, + BuildTime : { it =~ "2023-08-31T\\w+" }, + GitCommit : { it == "8dfaf0c780630c4f3a6ee51b324bdf50b36e2bb3" }, + GoVersion : { it =~ "go\\d+.\\d+.\\d+" }, KernelVersion: { it =~ "\\d.\\d{1,2}.\\d{1,2}\\w*" }, MinAPIVersion: { it == "1.12" }, Os : { it == "linux" },