From 470b6c0ff23891522edf7246a78966731261bc7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jun 2026 09:12:33 +0000
Subject: [PATCH 1/4] Bump org.junit.platform:junit-platform-launcher from
 1.14.3 to 6.1.1

Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit-framework) from 1.14.3 to 6.1.1.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/commits/r6.1.1)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-launcher
  dependency-version: 6.1.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b35fb2a4..b8c7dd24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,7 +119,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.14.4'
     testImplementation 'org.mockito:mockito-core:5.23.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.4'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.3'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:6.1.1'
 }
 
 javadoc {

From 67b6764544b06801414d0b23b771cae498eedec0 Mon Sep 17 00:00:00 2001
From: Quentin Rousseau <contact@quent.in>
Date: Mon, 29 Jun 2026 11:45:12 +0200
Subject: [PATCH 2/4] Upgrade to Java 17 and align all JUnit deps to 6.x

- Bump sourceCompatibility/targetCompatibility from Java 8 to 17
- Bump junit-jupiter-api and junit-jupiter-engine to 6.1.1 (match platform-launcher)
- Update pom.xml java.version, junit-version, and junit-platform-runner.version
- Bump google-java-format from 1.8 to 1.22.0 (Java 17 compat)
---
 build.gradle | 10 +++++-----
 pom.xml      |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index b8c7dd24..96d99952 100644
--- a/build.gradle
+++ b/build.gradle
@@ -83,8 +83,8 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven-publish'
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
     publishing {
         publications {
@@ -116,9 +116,9 @@ dependencies {
     implementation 'org.openapitools:jackson-databind-nullable:0.2.10'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.20.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.14.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:6.1.1'
     testImplementation 'org.mockito:mockito-core:5.23.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.4'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:6.1.1'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:6.1.1'
 }
 
@@ -146,7 +146,7 @@ spotless {
         // don't need to set target, it is inferred from java
 
         // apply a specific flavor of google-java-format
-        googleJavaFormat('1.8').aosp().reflowLongStrings()
+        googleJavaFormat('1.22.0').aosp().reflowLongStrings()
 
         removeUnusedImports()
         importOrder()
diff --git a/pom.xml b/pom.xml
index 996470fe..99a40d67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -338,7 +338,7 @@
         </dependency>
     </dependencies>
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.9.0</gson-fire-version>
@@ -348,8 +348,8 @@
         <jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
         <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
         <beanvalidation-version>2.0.2</beanvalidation-version>
-        <junit-version>5.14.4</junit-version>
-        <junit-platform-runner.version>1.14.4</junit-platform-runner.version>
+        <junit-version>6.1.1</junit-version>
+        <junit-platform-runner.version>6.1.1</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>4.0.0</jakarta.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From edb80ae69f3f960e3242088c2b36feeffd831b48 Mon Sep 17 00:00:00 2001
From: Quentin Rousseau <contact@quent.in>
Date: Mon, 29 Jun 2026 11:47:04 +0200
Subject: [PATCH 3/4] Remove junit-platform-runner (dropped in JUnit 6)

junit-platform-runner provided JUnit 4 compatibility which was removed
in JUnit 6. Remove the dependency and its version property from pom.xml.
---
 pom.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 99a40d67..051e72b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,12 +330,6 @@
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit-platform-runner.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <java.version>17</java.version>
@@ -349,8 +343,7 @@
         <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
         <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>6.1.1</junit-version>
-        <junit-platform-runner.version>6.1.1</junit-platform-runner.version>
-        <jakarta.ws.rs-api-version>4.0.0</jakarta.ws.rs-api-version>
+<jakarta.ws.rs-api-version>4.0.0</jakarta.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spotless.version>2.46.1</spotless.version>

From f36f893f1b2cd223179a03fe0ba48577a867db26 Mon Sep 17 00:00:00 2001
From: Quentin Rousseau <contact@quent.in>
Date: Mon, 29 Jun 2026 11:49:08 +0200
Subject: [PATCH 4/4] Remove explicit junit-jupiter-engine from surefire plugin
 deps

Surefire 3.5.x auto-discovers JUnit engines from the test classpath.
The explicit engine dependency override causes test discovery failures
with JUnit 6.
---
 pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 051e72b5..fe259286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,14 +89,6 @@
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
                 </configuration>
-                <dependencies>
-                    <!--Custom provider and engine for Junit 5 to surefire-->
-                    <dependency>
-                        <groupId>org.junit.jupiter</groupId>
-                        <artifactId>junit-jupiter-engine</artifactId>
-                        <version>${junit-version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>