From bb55441cc7ceab4f2dc970211c3149488dbfa79f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Jun 2024 13:10:03 +0000 Subject: [PATCH 1/3] Bump com.google.guava:guava-testlib from 33.0.0-jre to 33.2.1-jre Bumps [com.google.guava:guava-testlib](https://github.com/google/guava) from 33.0.0-jre to 33.2.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava-testlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7b2abb9e..57030265 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ subprojects { set("log4jVersion", "2.23.1") // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core set("slf4jVersion", "2.0.13") // https://mvnrepository.com/artifact/org.slf4j/slf4j-api - set("guavaVersion", "33.0.0-jre") // https://mvnrepository.com/artifact/com.google.guava/guava + set("guavaVersion", "33.2.1-jre") // https://mvnrepository.com/artifact/com.google.guava/guava set("junitVersion", "5.10.2") // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api set("junitPioneerVersion", "2.2.0") // https://mvnrepository.com/artifact/org.junit-pioneer/junit-pioneer set("mockitoVersion", "5.12.0") // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter From 1bbea00be8aace17946caefc38d6dea05a6dae7d Mon Sep 17 00:00:00 2001 From: Big Andy <8012398+big-andy-coates@users.noreply.github.com> Date: Sun, 23 Jun 2024 14:48:32 +0100 Subject: [PATCH 2/3] Fix weird issue with annotation in test compilation Without this change `./gradlew :executor:compileTestJava` fails with: ``` > Task :executor:compileTestJava /home/runner/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'replacement()' in type 'InlineMe': class file for com.google.errorprone.annotations.InlineMe not found /home/runner/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'replacement()' in type 'InlineMe' /home/runner/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'value()' in type 'InlineMeValidationDisabled': class file for com.google.errorprone.annotations.InlineMeValidationDisabled not found /home/runner/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'replacement()' in type 'InlineMe' /home/runner/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'value()' in type 'InlineMeValidationDisabled' /home/runner/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'replacement()' in type 'InlineMe' /home/runner/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'value()' in type 'InlineMeValidationDisabled' /home/runner/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'replacement()' in type 'InlineMe' /home/runner/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'value()' in type 'InlineMeValidationDisabled' error: warnings found and -Werror specified ``` `./gradlew allDeps` should the correct annotations dependency being part of the test compilation classpath. Go figure. --- executor/build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/executor/build.gradle.kts b/executor/build.gradle.kts index 3a7f29a6..d137771e 100644 --- a/executor/build.gradle.kts +++ b/executor/build.gradle.kts @@ -58,4 +58,10 @@ tasks.test { dependsOn(":test-service-extension-metadata:jar") dependsOn(":test-services:jar") dependsOn(":test-service:buildAppImage") +} + +tasks.compileTestJava { + // For some reason, since upgrading guava-testlib from 33.0.0-jre to 33.1.0-jre, without this, task fails with: + // ../com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'replacement()' in type 'InlineMe': class file for com.google.errorprone.annotations.InlineMe not found + options.compilerArgs.add("-Xlint:-classfile") } \ No newline at end of file From 9016ca8500efa12d962a1600887e35edf631f32b Mon Sep 17 00:00:00 2001 From: Big Andy <8012398+big-andy-coates@users.noreply.github.com> Date: Sun, 23 Jun 2024 15:09:56 +0100 Subject: [PATCH 3/3] Switch to adding module see: https://github.com/google/error-prone/releases/tag/v2.26.1 --- executor/build.gradle.kts | 6 ------ executor/src/test/java/module-info.test | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/executor/build.gradle.kts b/executor/build.gradle.kts index d137771e..7abab711 100644 --- a/executor/build.gradle.kts +++ b/executor/build.gradle.kts @@ -59,9 +59,3 @@ tasks.test { dependsOn(":test-services:jar") dependsOn(":test-service:buildAppImage") } - -tasks.compileTestJava { - // For some reason, since upgrading guava-testlib from 33.0.0-jre to 33.1.0-jre, without this, task fails with: - // ../com.google.guava/guava/33.2.1-jre/818e780da2c66c63bbb6480fef1f3855eeafa3e4/guava-33.2.1-jre.jar(/com/google/common/collect/Streams.class): warning: Cannot find annotation method 'replacement()' in type 'InlineMe': class file for com.google.errorprone.annotations.InlineMe not found - options.compilerArgs.add("-Xlint:-classfile") -} \ No newline at end of file diff --git a/executor/src/test/java/module-info.test b/executor/src/test/java/module-info.test index 563d9734..ec3a5027 100644 --- a/executor/src/test/java/module-info.test +++ b/executor/src/test/java/module-info.test @@ -1,8 +1,8 @@ --add-modules - org.junitpioneer,org.hamcrest,guava.testlib,creek.test.util,creek.test.hamcrest,creek.test.conformity,creek.system.test.test.services,creek.system.test.test.extension,creek.system.test.test.service.extension + org.junitpioneer,org.hamcrest,guava.testlib,creek.test.util,creek.test.hamcrest,creek.test.conformity,creek.system.test.test.services,creek.system.test.test.extension,creek.system.test.test.service.extension,com.google.errorprone.annotations --add-reads - creek.system.test.executor=org.junitpioneer,org.hamcrest,guava.testlib,creek.test.util,creek.test.hamcrest,creek.test.conformity,creek.system.test.test.services,creek.system.test.test.extension,creek.system.test.test.service.extension + creek.system.test.executor=org.junitpioneer,org.hamcrest,guava.testlib,creek.test.util,creek.test.hamcrest,creek.test.conformity,creek.system.test.test.services,creek.system.test.test.extension,creek.system.test.test.service.extension,com.google.errorprone.annotations --add-opens org.junitpioneer/org.junitpioneer.jupiter=org.junit.platform.commons