From 50b2fcad36391a4a17113ddfa93691645c79fa6a Mon Sep 17 00:00:00 2001 From: Joe Littlejohn Date: Sat, 28 Sep 2024 22:39:15 +0100 Subject: [PATCH] Dependency updates --- .github/workflows/android-ci.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/combine-prs.yml | 4 ++-- .github/workflows/gradle-wrapper-validation.yml | 2 +- README.md | 4 ---- jsonschema2pojo-core/pom.xml | 2 +- .../example/android/app/build.gradle | 4 ++-- .../example/android/lib/build.gradle | 4 ++-- pom.xml | 10 +++++----- 9 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 5d93b53b7..4c28d8f51 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -18,7 +18,7 @@ jobs: java_version: [8] steps: - name: Setup Maven Action - uses: s4u/setup-maven-action@v1.8.0 + uses: s4u/setup-maven-action@v1.14.0 with: checkout-fetch-depth: 0 java-version: ${{ matrix.java_version }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97ec12e66..96bc0021b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: name: Test JDK ${{ matrix.java_version }} steps: - name: Setup Maven Action - uses: s4u/setup-maven-action@v1.8.0 + uses: s4u/setup-maven-action@v1.14.0 with: checkout-fetch-depth: 0 java-version: ${{ matrix.java_version }} diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml index 07492e262..803df3828 100644 --- a/.github/workflows/combine-prs.yml +++ b/.github/workflows/combine-prs.yml @@ -30,7 +30,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 id: fetch-branch-names name: Fetch branch names with: @@ -121,7 +121,7 @@ jobs: git pull origin $sourcebranches --no-edit git push origin $COMBINE_BRANCH_NAME # Creates a PR with the new combined branch - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 name: Create Combined Pull Request env: PRS_STRING: ${{ steps.fetch-branch-names.outputs.prs-string }} diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 63e79f166..5a82adb3e 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -18,4 +18,4 @@ jobs: working-directory: jsonschema2pojo-gradle-plugin/example/android steps: - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: gradle/wrapper-validation-action@v3 diff --git a/README.md b/README.md index e444a843e..a60cad3e8 100644 --- a/README.md +++ b/README.md @@ -38,10 +38,6 @@ repositories { mavenCentral() } -dependencies { - implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2' -} - jsonSchema2Pojo { targetPackage = 'com.example' } diff --git a/jsonschema2pojo-core/pom.xml b/jsonschema2pojo-core/pom.xml index 9c40eae38..65e897e90 100644 --- a/jsonschema2pojo-core/pom.xml +++ b/jsonschema2pojo-core/pom.xml @@ -98,7 +98,7 @@ org.apache.httpcomponents httpclient - 4.5.13 + 4.5.14 test diff --git a/jsonschema2pojo-gradle-plugin/example/android/app/build.gradle b/jsonschema2pojo-gradle-plugin/example/android/app/build.gradle index 539a16377..d23a69d15 100644 --- a/jsonschema2pojo-gradle-plugin/example/android/app/build.gradle +++ b/jsonschema2pojo-gradle-plugin/example/android/app/build.gradle @@ -30,14 +30,14 @@ dependencies { // Required for @Generated annotation implementation 'org.glassfish:javax.annotation:10.0-b28' // Required if generating Gson annotations - implementation 'com.google.code.gson:gson:2.10.1' + implementation 'com.google.code.gson:gson:2.11.0' // Required if generating Moshi 1.x annotations implementation 'com.squareup.moshi:moshi:1.12.0' // Required if generating JSR-303 annotations implementation 'javax.validation:validation-api:2.0.1.Final' implementation 'jakarta.validation:jakarta.validation-api:3.0.2' // Required if generating Jackson 2 annotations - implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1' } // Each configuration is set to the default value diff --git a/jsonschema2pojo-gradle-plugin/example/android/lib/build.gradle b/jsonschema2pojo-gradle-plugin/example/android/lib/build.gradle index b4d8247f3..9184050db 100644 --- a/jsonschema2pojo-gradle-plugin/example/android/lib/build.gradle +++ b/jsonschema2pojo-gradle-plugin/example/android/lib/build.gradle @@ -26,14 +26,14 @@ android { dependencies { // Required if generating Gson annotations - implementation 'com.google.code.gson:gson:2.10.1' + implementation 'com.google.code.gson:gson:2.11.0' // Required if generating Moshi 1.x annotations implementation 'com.squareup.moshi:moshi:1.12.0' // Required if generating JSR-303 annotations implementation 'javax.validation:validation-api:2.0.1.Final' implementation 'jakarta.validation:jakarta.validation-api:3.0.2' // Required if generating Jackson 2 annotations - implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1' } // Each configuration is set to the default value diff --git a/pom.xml b/pom.xml index c89fc6912..58cafc437 100644 --- a/pom.xml +++ b/pom.xml @@ -37,8 +37,8 @@ https://github.com/joelittlejohn/jsonschema2pojo scm:git:git@github.com:joelittlejohn/jsonschema2pojo.git scm:git:git@github.com:joelittlejohn/jsonschema2pojo.git - HEAD - + HEAD + @@ -67,7 +67,7 @@ maven-clean-plugin - 3.2.0 + 3.4.0 maven-compiler-plugin @@ -79,7 +79,7 @@ maven-deploy-plugin - 3.1.0 + 3.1.2 maven-enforcer-plugin @@ -95,7 +95,7 @@ maven-install-plugin - 3.1.0 + 3.1.2 maven-jar-plugin