Skip to content

Commit

Permalink
Dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joelittlejohn committed Sep 28, 2024
1 parent 1476474 commit 50b2fca
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ repositories {
mavenCentral()
}
dependencies {
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
}
jsonSchema2Pojo {
targetPackage = 'com.example'
}
Expand Down
2 changes: 1 addition & 1 deletion jsonschema2pojo-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
<version>4.5.14</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<url>https://github.com/joelittlejohn/jsonschema2pojo</url>
<connection>scm:git:[email protected]:joelittlejohn/jsonschema2pojo.git</connection>
<developerConnection>scm:git:[email protected]:joelittlejohn/jsonschema2pojo.git</developerConnection>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>

<licenses>
<license>
Expand Down Expand Up @@ -67,7 +67,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<version>3.4.0</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Expand All @@ -79,7 +79,7 @@
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
Expand All @@ -95,7 +95,7 @@
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand Down

0 comments on commit 50b2fca

Please sign in to comment.