From 6c1cbf8c82161c9ee6429733f1e5c5c0d4b8a09d Mon Sep 17 00:00:00 2001 From: Sara Adams Date: Fri, 1 Dec 2023 22:18:13 +0100 Subject: [PATCH 1/8] Update external dependencies mockito and byte-buddy Signed-off-by: Sara Adams --- MODULE.bazel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 15e8fb1..cd5ab0d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,10 +27,10 @@ maven.install( "com.google.truth.extensions:truth-java8-extension:1.1.5", "commons-cli:commons-cli:1.6.0", "junit:junit:4.13.2", - "net.bytebuddy:byte-buddy-agent:1.12.13", - "net.bytebuddy:byte-buddy:1.12.13", + "net.bytebuddy:byte-buddy-agent:1.14.10", + "net.bytebuddy:byte-buddy:1.14.10", "org.hamcrest:hamcrest-core:2.2", - "org.mockito:mockito-core:4.6.1", + "org.mockito:mockito-core:5.7.0", "org.objenesis:objenesis:3.3", ], repositories = [ From 111fc7709fabc3563dc6c085065e9e0e53e555a4 Mon Sep 17 00:00:00 2001 From: Sara Adams Date: Fri, 1 Dec 2023 22:25:09 +0100 Subject: [PATCH 2/8] mockito 4.11.0 Signed-off-by: Sara Adams --- MODULE.bazel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index cd5ab0d..4ba80a2 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,10 +27,10 @@ maven.install( "com.google.truth.extensions:truth-java8-extension:1.1.5", "commons-cli:commons-cli:1.6.0", "junit:junit:4.13.2", - "net.bytebuddy:byte-buddy-agent:1.14.10", - "net.bytebuddy:byte-buddy:1.14.10", + "net.bytebuddy:byte-buddy-agent:1.14.5", + "net.bytebuddy:byte-buddy:1.14.5", "org.hamcrest:hamcrest-core:2.2", - "org.mockito:mockito-core:5.7.0", + "org.mockito:mockito-core:5.4.0", "org.objenesis:objenesis:3.3", ], repositories = [ From 756e5456c80b888ada27339e2286f0a4c5db4ae1 Mon Sep 17 00:00:00 2001 From: Sara Adams Date: Fri, 1 Dec 2023 23:04:43 +0100 Subject: [PATCH 3/8] Mockito 4.7.0 Signed-off-by: Sara Adams --- MODULE.bazel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 4ba80a2..b184f67 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,10 +27,10 @@ maven.install( "com.google.truth.extensions:truth-java8-extension:1.1.5", "commons-cli:commons-cli:1.6.0", "junit:junit:4.13.2", - "net.bytebuddy:byte-buddy-agent:1.14.5", - "net.bytebuddy:byte-buddy:1.14.5", + "net.bytebuddy:byte-buddy-agent:1.12.13", + "net.bytebuddy:byte-buddy:1.12.13", "org.hamcrest:hamcrest-core:2.2", - "org.mockito:mockito-core:5.4.0", + "org.mockito:mockito-core:4.7.0", "org.objenesis:objenesis:3.3", ], repositories = [ From 0607e696cabc4fa198b3cb4a01f0d1f68aea170f Mon Sep 17 00:00:00 2001 From: Sara Adams Date: Fri, 1 Dec 2023 23:10:34 +0100 Subject: [PATCH 4/8] byte-buddy 1.12.23 Signed-off-by: Sara Adams --- MODULE.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index b184f67..69c0665 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,8 +27,8 @@ maven.install( "com.google.truth.extensions:truth-java8-extension:1.1.5", "commons-cli:commons-cli:1.6.0", "junit:junit:4.13.2", - "net.bytebuddy:byte-buddy-agent:1.12.13", - "net.bytebuddy:byte-buddy:1.12.13", + "net.bytebuddy:byte-buddy-agent:1.12.23", + "net.bytebuddy:byte-buddy:1.12.23", "org.hamcrest:hamcrest-core:2.2", "org.mockito:mockito-core:4.7.0", "org.objenesis:objenesis:3.3", From e4e69d474a5a374c796581b98c37633182b39244 Mon Sep 17 00:00:00 2001 From: Sara Adams Date: Sat, 2 Dec 2023 02:35:51 +0100 Subject: [PATCH 5/8] mockito 5.1.1 Signed-off-by: Sara Adams --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 69c0665..feecdc7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -30,7 +30,7 @@ maven.install( "net.bytebuddy:byte-buddy-agent:1.12.23", "net.bytebuddy:byte-buddy:1.12.23", "org.hamcrest:hamcrest-core:2.2", - "org.mockito:mockito-core:4.7.0", + "org.mockito:mockito-core:5.1.0", "org.objenesis:objenesis:3.3", ], repositories = [ From 944b66d16e6b68efb1a0187973b672aed27b503e Mon Sep 17 00:00:00 2001 From: Sara Adams Date: Sat, 2 Dec 2023 02:49:14 +0100 Subject: [PATCH 6/8] Remove explicit byte-buddy Signed-off-by: Sara Adams --- MODULE.bazel | 4 ++-- third_party/mockito/BUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index feecdc7..afd771f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,8 +27,8 @@ maven.install( "com.google.truth.extensions:truth-java8-extension:1.1.5", "commons-cli:commons-cli:1.6.0", "junit:junit:4.13.2", - "net.bytebuddy:byte-buddy-agent:1.12.23", - "net.bytebuddy:byte-buddy:1.12.23", + # "net.bytebuddy:byte-buddy-agent:1.12.23", + # "net.bytebuddy:byte-buddy:1.12.23", "org.hamcrest:hamcrest-core:2.2", "org.mockito:mockito-core:5.1.0", "org.objenesis:objenesis:3.3", diff --git a/third_party/mockito/BUILD b/third_party/mockito/BUILD index 612936e..0b18130 100644 --- a/third_party/mockito/BUILD +++ b/third_party/mockito/BUILD @@ -3,8 +3,8 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@maven//:net_bytebuddy_byte_buddy", - "@maven//:net_bytebuddy_byte_buddy_agent", + # "@maven//:net_bytebuddy_byte_buddy", + # "@maven//:net_bytebuddy_byte_buddy_agent", "@maven//:org_mockito_mockito_core", "@maven//:org_objenesis_objenesis", ], From c7c6a2fe522e82c59d089714e56e18bdc32d2877 Mon Sep 17 00:00:00 2001 From: Sara Adams Date: Sat, 2 Dec 2023 03:14:22 +0100 Subject: [PATCH 7/8] mockito 5.4. with Bazel 7 Signed-off-by: Sara Adams --- MODULE.bazel | 6 +++--- third_party/mockito/BUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index afd771f..4ba80a2 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,10 +27,10 @@ maven.install( "com.google.truth.extensions:truth-java8-extension:1.1.5", "commons-cli:commons-cli:1.6.0", "junit:junit:4.13.2", - # "net.bytebuddy:byte-buddy-agent:1.12.23", - # "net.bytebuddy:byte-buddy:1.12.23", + "net.bytebuddy:byte-buddy-agent:1.14.5", + "net.bytebuddy:byte-buddy:1.14.5", "org.hamcrest:hamcrest-core:2.2", - "org.mockito:mockito-core:5.1.0", + "org.mockito:mockito-core:5.4.0", "org.objenesis:objenesis:3.3", ], repositories = [ diff --git a/third_party/mockito/BUILD b/third_party/mockito/BUILD index 0b18130..612936e 100644 --- a/third_party/mockito/BUILD +++ b/third_party/mockito/BUILD @@ -3,8 +3,8 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - # "@maven//:net_bytebuddy_byte_buddy", - # "@maven//:net_bytebuddy_byte_buddy_agent", + "@maven//:net_bytebuddy_byte_buddy", + "@maven//:net_bytebuddy_byte_buddy_agent", "@maven//:org_mockito_mockito_core", "@maven//:org_objenesis_objenesis", ], From 529fb6844d0e26f247900489143858bf9979252c Mon Sep 17 00:00:00 2001 From: Sara Adams Date: Sat, 2 Dec 2023 03:29:45 +0100 Subject: [PATCH 8/8] Check whether --incompatible_sandbox_hermetic_tmp does the job Signed-off-by: Sara Adams --- .bazelrc | 3 +++ MODULE.bazel | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.bazelrc b/.bazelrc index a2afba7..533c47f 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,4 +1,7 @@ +# TODO: Remove once using Bazel 7 common --enable_bzlmod +build --incompatible_sandbox_hermetic_tmp + common --enable_platform_specific_config common --experimental_announce_profile_path diff --git a/MODULE.bazel b/MODULE.bazel index 4ba80a2..cd5ab0d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,10 +27,10 @@ maven.install( "com.google.truth.extensions:truth-java8-extension:1.1.5", "commons-cli:commons-cli:1.6.0", "junit:junit:4.13.2", - "net.bytebuddy:byte-buddy-agent:1.14.5", - "net.bytebuddy:byte-buddy:1.14.5", + "net.bytebuddy:byte-buddy-agent:1.14.10", + "net.bytebuddy:byte-buddy:1.14.10", "org.hamcrest:hamcrest-core:2.2", - "org.mockito:mockito-core:5.4.0", + "org.mockito:mockito-core:5.7.0", "org.objenesis:objenesis:3.3", ], repositories = [