From 98a049848c0327c24a9e65ae14d5877dbf70a157 Mon Sep 17 00:00:00 2001 From: Robrecht Vanhuysse Date: Tue, 7 Apr 2026 16:38:56 +0200 Subject: [PATCH 1/3] ACC-2752 intermediate micro upgrade to 3.5.13 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4d8c9e4..a57de92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ group=com.contentgrid.opa-java-client -springBootVersion=3.5.12 +springBootVersion=3.5.13 lombokVersion=1.18.44 \ No newline at end of file From aa16e206aa795510466c3a03d30fd6bc60889104 Mon Sep 17 00:00:00 2001 From: Robrecht Vanhuysse Date: Fri, 17 Apr 2026 09:09:48 +0200 Subject: [PATCH 2/3] ACC-2752 update to spring boot 4.0.5, update dependencies, fix test ordering --- gradle.properties | 2 +- opa-async-java-client/build.gradle | 8 ++++---- .../contentgrid/opa/client/OpaClientIntegrationTests.java | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index a57de92..e82b18a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ group=com.contentgrid.opa-java-client -springBootVersion=3.5.13 +springBootVersion=4.0.5 lombokVersion=1.18.44 \ No newline at end of file diff --git a/opa-async-java-client/build.gradle b/opa-async-java-client/build.gradle index 910114b..4fb67cc 100644 --- a/opa-async-java-client/build.gradle +++ b/opa-async-java-client/build.gradle @@ -18,13 +18,13 @@ dependencies { testCompileOnly "org.projectlombok:lombok:${lombokVersion}" testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}" - testImplementation "org.testcontainers:junit-jupiter" testImplementation "org.assertj:assertj-core" + testImplementation "org.testcontainers:testcontainers-junit-jupiter" testImplementation "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.springframework.boot:spring-boot-testcontainers" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" - testRuntimeOnly "org.junit.platform:junit-platform-launcher" + testRuntimeOnly "org.springframework.boot:spring-boot-testcontainers" // TODO 3.5.15 > 4.0.5 + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" // TODO 5.12.2 > 6.0.3 + testRuntimeOnly "org.junit.platform:junit-platform-launcher" // TODO 1.12.2 > 6.0.3 testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind" testRuntimeOnly "org.slf4j:slf4j-simple" diff --git a/opa-async-java-client/src/test/java/com/contentgrid/opa/client/OpaClientIntegrationTests.java b/opa-async-java-client/src/test/java/com/contentgrid/opa/client/OpaClientIntegrationTests.java index d89171a..9eee56a 100644 --- a/opa-async-java-client/src/test/java/com/contentgrid/opa/client/OpaClientIntegrationTests.java +++ b/opa-async-java-client/src/test/java/com/contentgrid/opa/client/OpaClientIntegrationTests.java @@ -28,9 +28,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; @@ -68,6 +70,7 @@ void opaIsRunningInDocker() { * @see REST Policy API */ @Nested + @TestMethodOrder(OrderAnnotation.class) class PolicyApiTests { private static final String PATH_EXAMPLE_1 = "fixtures/openpolicyagent.org/docs/policy/policies-example-1.rego"; From 19a76d98c71a030c518fb8d6be3a140b0b6de553 Mon Sep 17 00:00:00 2001 From: RVanhuysseXenit <41945802+RVanhuysseXenit@users.noreply.github.com> Date: Fri, 17 Apr 2026 10:11:24 +0200 Subject: [PATCH 3/3] ACC-2752 remove redundant comments --- opa-async-java-client/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opa-async-java-client/build.gradle b/opa-async-java-client/build.gradle index 4fb67cc..284f3c9 100644 --- a/opa-async-java-client/build.gradle +++ b/opa-async-java-client/build.gradle @@ -22,9 +22,9 @@ dependencies { testImplementation "org.testcontainers:testcontainers-junit-jupiter" testImplementation "org.junit.jupiter:junit-jupiter-api" - testRuntimeOnly "org.springframework.boot:spring-boot-testcontainers" // TODO 3.5.15 > 4.0.5 - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" // TODO 5.12.2 > 6.0.3 - testRuntimeOnly "org.junit.platform:junit-platform-launcher" // TODO 1.12.2 > 6.0.3 + testRuntimeOnly "org.springframework.boot:spring-boot-testcontainers" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" + testRuntimeOnly "org.junit.platform:junit-platform-launcher" testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind" testRuntimeOnly "org.slf4j:slf4j-simple" @@ -32,4 +32,4 @@ dependencies { test { useJUnitPlatform() -} \ No newline at end of file +}