Skip to content

Commit fb122cb

Browse files
authored
Merge pull request #1 from conductor-oss/springboot3_upgrade
springboot3 upgrade Authored by: @LuisLainez
2 parents 0ed1fa0 + ebd0fa2 commit fb122cb

File tree

104 files changed

+1837
-7459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1837
-7459
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,7 @@ jobs:
4242
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
4343
run: |
4444
echo "Running build for commit ${{ github.sha }}"
45-
./gradlew build snapshot --scan
46-
env:
47-
NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }}
48-
NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }}
49-
NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
50-
NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}
45+
./gradlew build
5146
- name: Publish Test Report
5247
uses: mikepenz/action-junit-report@v3
5348
if: always()

annotations-processor/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ sourceSets {
55

66
dependencies {
77
implementation project(':conductor-annotations')
8-
api 'com.google.guava:guava:32.1.2-jre'
8+
api 'com.google.guava:guava:31.1-jre'
99
api 'com.squareup:javapoet:1.13.+'
1010
api 'com.github.jknack:handlebars:4.3.+'
1111
api 'com.google.protobuf:protobuf-java:3.21.12'
12-
api 'javax.annotation:javax.annotation-api:1.3.2'
12+
api 'jakarta.annotation:jakarta.annotation-api:2.1.1'
1313
api gradleApi()
1414

1515
exampleImplementation sourceSets.main.output

0 commit comments

Comments
 (0)