Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #1598

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/android-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ jobs:
java_version: [8]
steps:
- name: Setup Maven Action
uses: s4u/setup-maven-action@v1.8.0
uses: s4u/setup-maven-action@v1.10.0
with:
checkout-fetch-depth: 0
java-version: ${{ matrix.java_version }}
java-distribution: temurin
maven-version: 3.8.7
- name: Install Android SDK
uses: malinskiy/action-android/install-sdk@release/0.1.1
- name: Install latest jsonschema2pojo SNAPSHOT
run: mvn -U -B install -DskipTests -Dmaven.javadoc.skip -Dmaven.site.skip
run: ./mvnw -U -B install -DskipTests -Dmaven.javadoc.skip -Dmaven.site.skip
- name: Build projects
run: cd jsonschema2pojo-gradle-plugin/example/android && ./gradlew --info assembleDebug
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ 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.10.0
with:
checkout-fetch-depth: 0
java-version: ${{ matrix.java_version }}
java-distribution: temurin
maven-version: 3.8.7
- name: Verify with Maven
run: mvn verify -B
run: ./mvnw verify -B
2 changes: 1 addition & 1 deletion .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
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@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
# Creates a branch with other PR branches merged together
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 @@ -17,5 +17,5 @@ jobs:
run:
working-directory: jsonschema2pojo-gradle-plugin/example/android
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v1
Binary file added .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
18 changes: 18 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
4 changes: 2 additions & 2 deletions jsonschema2pojo-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<artifactId>javaparser</artifactId>
</dependency>
<dependency>
<groupId>com.sun.codemodel</groupId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>codemodel</artifactId>
</dependency>
<dependency>
Expand Down 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 @@ -37,7 +37,7 @@ dependencies {
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.15.3'
}

// Each configuration is set to the default value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
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.15.3'
}

// Each configuration is set to the default value
Expand Down