Skip to content

Commit

Permalink
upgrade to spring-framework 6, java 17, and bump version to 2.0.0 (#14)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
countableSet authored Jul 31, 2023
1 parent 61a6089 commit 4c6a688
Show file tree
Hide file tree
Showing 24 changed files with 272 additions and 184 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ jobs:
packages: read
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'zulu'
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
- name: Build
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'zulu'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'zulu'
- name: Publish with Gradle
uses: gradle/gradle-build-action@v2
- name: Publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ The plugin is executed as part of a protoc compilation step:

### Requirements

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

The build uses gradle to generate the artifacts. No installation is required as the project uses the
[gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html "gradle wrapper") setup.
Expand Down
23 changes: 12 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,29 @@ allprojects {

ext {
// third party
jakartaservletapiVersion = "5.0.0"
jakartawsrsapiVersion = "3.0.0"
jakartaservletapiVersion = "6.0.0"
jakartawsrsapiVersion = "3.1.0"
javapoetVersion = "1.13.0"
javaxservletapiVersion = "4.0.1"
javaxwsrsapiVersion = "2.1.1"
protobufVersion = "3.22.2"
protobufVersion = "3.23.4"
slf4jVersion = "1.7.36"
springVersion = "5.3.26"
springVersion = "6.0.11"
undertowVersion = "2.3.5.Final"

// testing
approvaltestsVersion = "18.5.0"
javaparserVersion = "3.25.2"
approvaltestsVersion = "18.7.1"
javaparserVersion = "3.25.4"
jerseyCommonJavaxVersion = "2.22.2"
jerseyCommonJakartaVersion = "3.1.1"
junitJupiterVersion = "5.9.2"
mockitoVersion = "5.2.0"
jerseyCommonJakartaVersion = "3.1.3"
junitJupiterVersion = "5.10.0"
mockitoVersion = "5.4.0"
}

java {
group = "com.flit"
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17
withSourcesJar()
}

Expand All @@ -50,6 +50,7 @@ allprojects {
dependencies {
testImplementation(platform("org.junit:junit-bom:$junitJupiterVersion"))
testImplementation('org.junit.jupiter:junit-jupiter')
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

publishing {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 4c6a688

Please sign in to comment.