Skip to content

Commit 4c6a688

Browse files
authored
upgrade to spring-framework 6, java 17, and bump version to 2.0.0 (#14)
* bump all versions to 2.0 because of multiple breaking changes * upgrade most dependencies * spring-framework required changes from javax to jakarta * change application.properties to application.yaml * compile target to version 17 because of spring requirement * fix actions target to 17 * bump gradle version to 8.2.1 * add `junit-platform-launcher` in prep for gradle 9 * add package-info for kotlin because why not
1 parent 61a6089 commit 4c6a688

File tree

24 files changed

+272
-184
lines changed

24 files changed

+272
-184
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ jobs:
1717
packages: read
1818
steps:
1919
- uses: actions/checkout@v3
20-
- name: Set up JDK 11
20+
- name: Set up JDK 17
2121
uses: actions/setup-java@v3
2222
with:
23-
java-version: '11'
23+
java-version: '17'
2424
distribution: 'zulu'
25-
- name: Build with Gradle
26-
uses: gradle/gradle-build-action@v2
2725
- name: Build
2826
env:
2927
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ jobs:
4141
- name: Checkout repository
4242
uses: actions/checkout@v3
4343

44+
- name: Set up JDK 17
45+
uses: actions/setup-java@v3
46+
with:
47+
java-version: '17'
48+
distribution: 'zulu'
49+
4450
# Initializes the CodeQL tools for scanning.
4551
- name: Initialize CodeQL
4652
uses: github/codeql-action/init@v2

.github/workflows/publish.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ jobs:
1515
- uses: actions/checkout@v3
1616
- uses: actions/setup-java@v3
1717
with:
18-
java-version: '11'
18+
java-version: '17'
1919
distribution: 'zulu'
20-
- name: Publish with Gradle
21-
uses: gradle/gradle-build-action@v2
2220
- name: Publish
2321
env:
2422
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ The plugin is executed as part of a protoc compilation step:
127127

128128
### Requirements
129129

130-
The build has been tested with [Zulu's OpenJDK](https://www.azul.com/downloads/#zulu "JDK Downloads") version 11.
130+
The build has been tested with [Zulu's OpenJDK](https://www.azul.com/downloads/#zulu "JDK Downloads") version 17.
131131

132132
The build uses gradle to generate the artifacts. No installation is required as the project uses the
133133
[gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html "gradle wrapper") setup.

build.gradle

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@ allprojects {
1414

1515
ext {
1616
// third party
17-
jakartaservletapiVersion = "5.0.0"
18-
jakartawsrsapiVersion = "3.0.0"
17+
jakartaservletapiVersion = "6.0.0"
18+
jakartawsrsapiVersion = "3.1.0"
1919
javapoetVersion = "1.13.0"
2020
javaxservletapiVersion = "4.0.1"
2121
javaxwsrsapiVersion = "2.1.1"
22-
protobufVersion = "3.22.2"
22+
protobufVersion = "3.23.4"
2323
slf4jVersion = "1.7.36"
24-
springVersion = "5.3.26"
24+
springVersion = "6.0.11"
2525
undertowVersion = "2.3.5.Final"
2626

2727
// testing
28-
approvaltestsVersion = "18.5.0"
29-
javaparserVersion = "3.25.2"
28+
approvaltestsVersion = "18.7.1"
29+
javaparserVersion = "3.25.4"
3030
jerseyCommonJavaxVersion = "2.22.2"
31-
jerseyCommonJakartaVersion = "3.1.1"
32-
junitJupiterVersion = "5.9.2"
33-
mockitoVersion = "5.2.0"
31+
jerseyCommonJakartaVersion = "3.1.3"
32+
junitJupiterVersion = "5.10.0"
33+
mockitoVersion = "5.4.0"
3434
}
3535

3636
java {
3737
group = "com.flit"
38-
targetCompatibility = JavaVersion.VERSION_11
39-
sourceCompatibility = JavaVersion.VERSION_11
38+
targetCompatibility = JavaVersion.VERSION_17
39+
sourceCompatibility = JavaVersion.VERSION_17
4040
withSourcesJar()
4141
}
4242

@@ -50,6 +50,7 @@ allprojects {
5050
dependencies {
5151
testImplementation(platform("org.junit:junit-bom:$junitJupiterVersion"))
5252
testImplementation('org.junit.jupiter:junit-jupiter')
53+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
5354
}
5455

5556
publishing {

gradle/wrapper/gradle-wrapper.jar

5.31 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)