Skip to content

Commit

Permalink
Dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joelittlejohn committed Dec 8, 2021
1 parent 97409e7 commit 932858a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
java_version: [8]
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Install JDK ${{ 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 @@ -29,7 +29,7 @@ jobs:
java-version: ${{ matrix.java }}
distribution: adopt
- name: Cache local Maven repository
uses: actions/cache@v2.1.6
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
6 changes: 3 additions & 3 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@v4.0.2
- uses: actions/github-script@v4
id: fetch-branch-names
name: Fetch branch names
with:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
console.log('Combined: ' + combined);
return combined
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2.3.3
- uses: actions/checkout@v2
with:
fetch-depth: 0
# Creates a branch with other PR branches merged together
Expand All @@ -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@v4.0.2
- uses: actions/github-script@v4
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 @@ -16,5 +16,5 @@ jobs:
run:
working-directory: jsonschema2pojo-gradle-plugin/example/android
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
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.8.7'
implementation 'com.google.code.gson:gson:2.8.9'
// 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.0'
// Required if generating Jackson 2 annotations
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
}

// Each configuration is set to the default value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {

dependencies {
// Required if generating Gson annotations
implementation 'com.google.code.gson:gson:2.8.7'
implementation 'com.google.code.gson:gson:2.8.9'
// Required if generating Moshi 1.x annotations
implementation 'com.squareup.moshi:moshi:1.12.0'
// Required if generating JSR-303 annotations
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,13 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
<version>1.15</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down Expand Up @@ -394,7 +394,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.30</version>
<version>1.7.32</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -420,7 +420,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.9</version>
<version>1.10.11</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down Expand Up @@ -464,7 +464,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.2.4</version>
<version>3.12.4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -482,7 +482,7 @@
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.1.0</version>
<version>1.5.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 932858a

Please sign in to comment.