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
5 changes: 4 additions & 1 deletion .github/workflows/maven-v1-pulls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ jobs:
java: [ "8" ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Java
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@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/maven-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
java: [ 8 ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
server-id: ossrh
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
distribution: 'temurin'
Expand Down Expand Up @@ -49,5 +49,5 @@ jobs:
echo "not deploying on java 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 }}
8 changes: 4 additions & 4 deletions .github/workflows/next-snapshot-v1.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 @@ -24,7 +24,7 @@ jobs:
uses: actions/setup-java@v4
with:
java-version: 11
server-id: ossrh
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
distribution: 'temurin'
Expand Down Expand Up @@ -84,5 +84,5 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SC_VERSION:
SC_NEXT_VERSION:
GPG_PRIVATE_KEY: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
GPG_PRIVATE_KEY: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
GPG_PASSPHRASE: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
8 changes: 4 additions & 4 deletions .github/workflows/prepare-release-v1.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 @@ -24,7 +24,7 @@ jobs:
uses: actions/setup-java@v4
with:
java-version: 8
server-id: ossrh
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
distribution: 'temurin'
Expand Down Expand Up @@ -60,8 +60,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
21 changes: 8 additions & 13 deletions .github/workflows/release-v1.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 @@ -24,10 +24,11 @@ jobs:
uses: actions/setup-java@v4
with:
java-version: 8
server-id: ossrh
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
distribution: 'temurin'
gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
- name: Cache local Maven repository
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -58,16 +59,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"
maven_args: "-DskipTests"
run: |
./mvnw -DskipTests --no-transfer-progress -B -Prelease deploy
- name: Run post release script
id: postRelease
if: env.RELEASE_OK == 'yes'
Expand All @@ -84,8 +79,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
1 change: 1 addition & 0 deletions modules/swagger-compat-spec-parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<artifactId>swagger-compat-spec-parser</artifactId>
<packaging>jar</packaging>
<name>swagger-compat-spec-parser</name>
<description>swagger-compat-spec-parser</description>
<dependencies>
<dependency>
<groupId>io.swagger</groupId>
Expand Down
1 change: 1 addition & 0 deletions modules/swagger-parser-safe-url-resolver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<artifactId>swagger-parser-safe-url-resolver</artifactId>
<packaging>jar</packaging>
<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/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<artifactId>swagger-parser</artifactId>
<packaging>jar</packaging>
<name>swagger-parser</name>
<description>swagger-parser</description>
<profiles>
<profile>
<id>test-single</id>
Expand Down
51 changes: 8 additions & 43 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<version>1.0.75-SNAPSHOT</version>
<packaging>pom</packaging>
<name>swagger-parser-project</name>
<description>swagger-parser-project</description>
<developers>
<developer>
<id>fehguy</id>
Expand Down Expand Up @@ -51,16 +52,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 @@ -226,18 +217,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 @@ -369,28 +357,6 @@
<module>modules/swagger-parser</module>
<module>modules/swagger-compat-spec-parser</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>-->
<commons-io-version>2.15.1</commons-io-version>
Expand All @@ -403,6 +369,5 @@
<wiremock-version>2.27.2</wiremock-version>
<surefire-version>2.22.2</surefire-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
</properties>
</project>
Loading