Merge pull request #1 from conductor-oss/springboot3_upgrade

springboot3 upgrade Authored by: @LuisLainez
conductor-oss · Dec 17, 2023 · fb122cb · fb122cb
2 parents 0ed1fa0 + ebd0fa2
commit fb122cb
Show file tree

Hide file tree

Showing 104 changed files with 1,837 additions and 7,459 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,12 +42,7 @@ jobs:
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
         run: |
           echo "Running build for commit ${{ github.sha }}"
-          ./gradlew build snapshot --scan
-        env:
-          NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
-          NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
-          NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
-          NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}
+          ./gradlew build
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3
         if: always()

diff --git a/annotations-processor/build.gradle b/annotations-processor/build.gradle
@@ -5,11 +5,11 @@ sourceSets {
 
 dependencies {
     implementation project(':conductor-annotations')
-    api 'com.google.guava:guava:32.1.2-jre'
+    api 'com.google.guava:guava:31.1-jre'
     api 'com.squareup:javapoet:1.13.+'
     api 'com.github.jknack:handlebars:4.3.+'
     api 'com.google.protobuf:protobuf-java:3.21.12'
-    api 'javax.annotation:javax.annotation-api:1.3.2'
+    api 'jakarta.annotation:jakarta.annotation-api:2.1.1'
     api gradleApi()
 
     exampleImplementation sourceSets.main.output