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
11 changes: 7 additions & 4 deletions .github/workflows/maven-pulls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,18 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 11, 14, 17 ]
java: [ 11, 17 ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
uses: actions/cache@v4
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 11, 14, 17 ]
java: [ 11 17 ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
server-id: ossrh
distribution: 'temurin'
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
Expand Down Expand Up @@ -50,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 }}
12 changes: 6 additions & 6 deletions .github/workflows/next-snapshot.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,11 +21,11 @@ jobs:
with:
python-version: '3.10'
- name: Set up Java 11
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'zulu'
server-id: ossrh
distribution: 'temurin'
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
Expand Down Expand Up @@ -78,8 +78,8 @@ jobs:

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
12 changes: 6 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,11 +21,11 @@ jobs:
with:
python-version: '3.10'
- name: Set up Java 11
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'zulu'
server-id: ossrh
distribution: 'temurin'
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
Expand Down Expand Up @@ -59,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:
24 changes: 10 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,13 +21,14 @@ jobs:
with:
python-version: '3.10'
- name: Set up Java 11
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'zulu'
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@v4
with:
Expand Down Expand Up @@ -57,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 }}:[email protected]/swagger-api/swagger-parser.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: |
./mvnw --no-transfer-progress -B -Prelease deploy
- name: Run post release script
id: postRelease
if: env.RELEASE_OK == 'yes'
Expand All @@ -82,8 +78,8 @@ jobs:

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 modules/swagger-parser-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<artifactId>swagger-parser-cli</artifactId>
<packaging>jar</packaging>
<name>swagger-parser (executable)</name>

<description>swagger-parser (executable)</description>
<build>
<finalName>swagger-parser-cli</finalName>
<resources>
Expand Down
12 changes: 2 additions & 10 deletions modules/swagger-parser-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>swagger-parser-core</artifactId>
<packaging>jar</packaging>
<name>swagger-parser</name>
<name>swagger-parser-core</name>
<description>swagger-parser-core</description>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-models</artifactId>
<version>${swagger-core-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>
</project>
3 changes: 2 additions & 1 deletion modules/swagger-parser-safe-url-resolver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
</parent>

<artifactId>swagger-parser-safe-url-resolver</artifactId>

<name>swagger-parser-safe-url-resolver</name>
<description>swagger-parser-safe-url-resolver</description>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
Expand Down
1 change: 1 addition & 0 deletions modules/swagger-parser-v2-converter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<artifactId>swagger-parser-v2-converter</artifactId>
<packaging>jar</packaging>
<name>swagger-parser-v2-converter</name>
<description>swagger-parser-v2-converter</description>
<build>
<plugins>
<plugin>
Expand Down
1 change: 1 addition & 0 deletions modules/swagger-parser-v3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<artifactId>swagger-parser-v3</artifactId>
<packaging>jar</packaging>
<name>swagger-parser-v3</name>
<description>swagger-parser-v3</description>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<artifactId>swagger-parser</artifactId>
<packaging>jar</packaging>
<name>swagger-parser</name>

<description>swagger-parser</description>
<dependencies>
<dependency>
<groupId>io.swagger.parser.v3</groupId>
Expand Down
73 changes: 14 additions & 59 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.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.parser.v3</groupId>
<artifactId>swagger-parser-project</artifactId>
<version>2.1.28-SNAPSHOT</version>
<packaging>pom</packaging>
<name>swagger-parser-project</name>
<description>swagger-parser-project</description>
<url>https://github.com/swagger-api/swagger-core</url>
<developers>
<developer>
<id>fehguy</id>
Expand All @@ -22,12 +19,6 @@
<system>github</system>
<url>https://github.com/swagger-api/swagger-parser/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>swagger-swaggersocket</name>
<archive>https://groups.google.com/forum/#!forum/swagger-swaggersocket</archive>
</mailingList>
</mailingLists>
<licenses>
<license>
<name>Apache License 2.0</name>
Expand All @@ -40,16 +31,6 @@
<developerConnection>scm:git:[email protected]:swagger-api/swagger-parser.git</developerConnection>
<url>https://github.com/swagger-api/swagger-parser</url>
</scm>
<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>
<build>
<defaultGoal>install</defaultGoal>
<resources>
Expand Down Expand Up @@ -232,18 +213,15 @@
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.7.0</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>-->
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
<waitUntil>published</waitUntil>
<waitMaxTime>3600</waitMaxTime>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -388,45 +366,22 @@
<module>modules/swagger-parser-cli</module>
<module>modules/swagger-parser-safe-url-resolver</module>
</modules>
<repositories>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>sonatype-releases</id>
<url>https://oss.sonatype.org/content/repositories/releases</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<properties>
<maven.compiler.release>8</maven.compiler.release>
<snakeyaml-version>2.4</snakeyaml-version>
<swagger-parser-v2-version>1.0.73</swagger-parser-v2-version>
<commons-io-version>2.18.0</commons-io-version>
<swagger-parser-v2-version>1.0.75</swagger-parser-v2-version>
<commons-io-version>2.19.0</commons-io-version>
<slf4j-version>2.0.9</slf4j-version>
<swagger-core-version>2.2.32</swagger-core-version>
<swagger-core-v2-version>1.6.15</swagger-core-v2-version>
<swagger-core-v2-version>1.6.16</swagger-core-v2-version>
<junit-version>4.13.2</junit-version>
<testng-version>7.11.0</testng-version>
<jmockit-version>1.49</jmockit-version>
<wiremock-version>2.35.2</wiremock-version>
<surefire-version>3.2.2</surefire-version>
<commons-lang-version>3.17.0</commons-lang-version>
<jackson-version>2.18.3</jackson-version>
<jackson-databind-version>2.18.3</jackson-databind-version>
<jackson-version>2.19.0</jackson-version>
<jackson-databind-version>2.19.0</jackson-databind-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
</properties>
</project>
Loading