Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ version: 2
updates:
- package-ecosystem: "maven"
target-branch: "master"
open-pull-requests-limit: 5
directory: "/"
schedule:
interval: "daily"
ignore:
- dependency-name: "*"
time: "19:00"
allow:
- dependency-name: "io.swagger*:*"
update-types: ["version-update:semver-major"]
10 changes: 7 additions & 3 deletions .github/workflows/maven-pulls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@ jobs:
java: [ 11 ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ jobs:
java: [ 11 ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
server-id: ossrh
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -49,5 +50,5 @@ jobs:
echo "not building and maven publishing project as it is a release version: " ${MY_JAVA_VERSION}
fi
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
13 changes: 7 additions & 6 deletions .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: tibdex/github-app-token@v1
id: generate-token
with:
Expand All @@ -21,14 +21,15 @@ jobs:
with:
python-version: '3.10'
- name: Set up Java 11
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
server-id: ossrh
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -58,8 +59,8 @@ jobs:
branch: prepare-release-${{ env.SC_VERSION }}
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SC_VERSION:
SC_NEXT_VERSION:
Expand Down
25 changes: 11 additions & 14 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: tibdex/github-app-token@v1
id: generate-token
with:
Expand All @@ -21,14 +21,16 @@ jobs:
with:
python-version: '3.10'
- name: Set up Java 11
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
server-id: ossrh
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
- name: Cache local Maven repository
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -56,15 +58,10 @@ jobs:
git config --global user.name "GitHub Action"
git config --global hub.protocol https
git remote set-url origin https://\${{ secrets.GITHUB_TOKEN }}:x-oauth-basic@github.com/swagger-api/validator-badge.git
- name: Run maven deploy/release (action-maven-publish)
uses: samuelmeuli/action-maven-publish@v1
- name: Run maven deploy/release
if: env.RELEASE_OK == 'yes'
with:
gpg_private_key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
gpg_passphrase: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
nexus_username: ${{ secrets.OSSRH_USERNAME }}
nexus_password: ${{ secrets.OSSRH_TOKEN }}
maven_profiles: "release"
run: |
mvn --no-transfer-progress -B -Prelease deploy
- name: docker login
run: |
docker login --username=${{ secrets.DOCKERHUB_SB_USERNAME }} --password=${{ secrets.DOCKERHUB_SB_PASSWORD }}
Expand Down Expand Up @@ -204,8 +201,8 @@ jobs:
exit 0
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SC_VERSION:
SC_NEXT_VERSION:
Expand Down
2 changes: 1 addition & 1 deletion CI/CI.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ See also [here](https://github.com/peter-evans/create-pull-request/blob/master/d
GPG private key and passphrase defined to be used for sonatype deployments, as detailed in
https://central.sonatype.org/pages/working-with-pgp-signatures.html (I'd say with email matching the one of the sonatype account of point 1

* `OSSRH_USERNAME` and `OSSRH_TOKEN`: sonatype user/token
* `MAVEN_USERNAME` and `MAVEN_PASSWORD`: sonatype user/token



Expand Down
66 changes: 17 additions & 49 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>io.swagger.validator.v3</groupId>
<artifactId>swagger-validator</artifactId>
<packaging>war</packaging>
<name>swagger-validator</name>
<description>swagger-validator</description>
<version>2.1.7-SNAPSHOT</version>
<url>https://github.com/swagger-api/validator-badge</url>
<developers>
<developer>
<id>frantuma</id>
<name>Francesco Tumanischvili</name>
<email>frantuma@yahoo.com</email>
</developer>
</developers>
<prerequisites>
<maven>2.2.0</maven>
</prerequisites>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<issueManagement>
<system>github</system>
<url>https://github.com/swagger-api/validator-badge/issues</url>
Expand Down Expand Up @@ -230,21 +223,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
<!-- <skipStaging>true</skipStaging>
<skipRemoteStaging>true</skipRemoteStaging>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>-->
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -427,34 +405,24 @@
<version>${slf4j-version}</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<properties>
<maven.compiler.release>8</maven.compiler.release>
<jackson.version>2.18.2</jackson.version>
<jackson-databind.version>2.18.2</jackson-databind.version>
<snakeyaml.version>2.3</snakeyaml.version>
<jackson.version>2.19.0</jackson.version>
<jackson-databind.version>2.19.0</jackson-databind.version>
<snakeyaml.version>2.4</snakeyaml.version>
<httpclient-version>4.5.14</httpclient-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<swagger-parser-version>2.1.25</swagger-parser-version>
<swagger-inflector-version>2.0.12</swagger-inflector-version>
<swagger-parser-version>2.1.28</swagger-parser-version>
<swagger-inflector-version>2.0.13</swagger-inflector-version>
<jetty-version>9.4.56.v20240826</jetty-version>
<logback-version>1.5.16</logback-version>
<logback-version>1.5.18</logback-version>
<slf4j-version>2.0.16</slf4j-version>
<surefire-version>3.1.2</surefire-version>
<wiremock-version>3.10.0</wiremock-version>
<wiremock-version>3.13.0</wiremock-version>
<junit-version>4.13.2</junit-version>
<assertj-version>3.27.2</assertj-version>
<assertj-version>3.27.3</assertj-version>
<json-schema-validator-version>2.2.14</json-schema-validator-version>
<nt-json-schema-validator-version>1.5.5</nt-json-schema-validator-version>
<nt-json-schema-validator-version>1.5.6</nt-json-schema-validator-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
</properties>
</project>