Skip to content

Commit 67b6764

Browse files
committed
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)
1 parent 470b6c0 commit 67b6764

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ if(hasProperty('target') && target == 'android') {
8383
apply plugin: 'java'
8484
apply plugin: 'maven-publish'
8585

86-
sourceCompatibility = JavaVersion.VERSION_1_8
87-
targetCompatibility = JavaVersion.VERSION_1_8
86+
sourceCompatibility = JavaVersion.VERSION_17
87+
targetCompatibility = JavaVersion.VERSION_17
8888

8989
publishing {
9090
publications {
@@ -116,9 +116,9 @@ dependencies {
116116
implementation 'org.openapitools:jackson-databind-nullable:0.2.10'
117117
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.20.0'
118118
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
119-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.14.4'
119+
testImplementation 'org.junit.jupiter:junit-jupiter-api:6.1.1'
120120
testImplementation 'org.mockito:mockito-core:5.23.0'
121-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.14.4'
121+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:6.1.1'
122122
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:6.1.1'
123123
}
124124

@@ -146,7 +146,7 @@ spotless {
146146
// don't need to set target, it is inferred from java
147147

148148
// apply a specific flavor of google-java-format
149-
googleJavaFormat('1.8').aosp().reflowLongStrings()
149+
googleJavaFormat('1.22.0').aosp().reflowLongStrings()
150150

151151
removeUnusedImports()
152152
importOrder()

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@
338338
</dependency>
339339
</dependencies>
340340
<properties>
341-
<java.version>1.8</java.version>
341+
<java.version>17</java.version>
342342
<maven.compiler.source>${java.version}</maven.compiler.source>
343343
<maven.compiler.target>${java.version}</maven.compiler.target>
344344
<gson-fire-version>1.9.0</gson-fire-version>
@@ -348,8 +348,8 @@
348348
<jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
349349
<jakarta-annotation-version>3.0.0</jakarta-annotation-version>
350350
<beanvalidation-version>2.0.2</beanvalidation-version>
351-
<junit-version>5.14.4</junit-version>
352-
<junit-platform-runner.version>1.14.4</junit-platform-runner.version>
351+
<junit-version>6.1.1</junit-version>
352+
<junit-platform-runner.version>6.1.1</junit-platform-runner.version>
353353
<jakarta.ws.rs-api-version>4.0.0</jakarta.ws.rs-api-version>
354354
<jsr311-api-version>1.1.1</jsr311-api-version>
355355
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)