Skip to content

Commit 0fb7dc9

Browse files
frantumafrantuma
committed
chore: migrate Sonatype OSSRH to Central Portal
1 parent 157fec2 commit 0fb7dc9

File tree

11 files changed

+243
-269
lines changed

11 files changed

+243
-269
lines changed

‎.github/workflows/docker-release-3.0.yml‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,25 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
name: git checkout 3.0.0
1818
with:
1919
ref: 3.0.0
2020
- name: Set up Java
21-
uses: actions/setup-java@v3
21+
uses: actions/setup-java@v4
2222
with:
2323
java-version: 17
2424
distribution: temurin
25-
cache: maven
25+
server-id: central
26+
server-username: MAVEN_USERNAME
27+
server-password: MAVEN_PASSWORD
28+
- name: Cache local Maven repository
29+
uses: actions/cache@v4
30+
with:
31+
path: ~/.m2/repository
32+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
33+
restore-keys: |
34+
${{ runner.os }}-maven-
2635
- name: Set up QEMU
2736
uses: docker/setup-qemu-action@v3
2837
- name: Set up Docker Buildx
@@ -37,20 +46,6 @@ jobs:
3746
/bin/bash ./bin/utils/detect_merge_conflict.sh
3847
# fail if generators contain tab '\t'
3948
/bin/bash ./bin/utils/detect_tab_in_java_class.sh
40-
- uses: s4u/[email protected]
41-
name: setup maven settings.xml
42-
with:
43-
servers: |
44-
[{
45-
"id": "sonatype-nexus-staging",
46-
"username": "${{ secrets.OSSRH_USERNAME }}",
47-
"password": "${{ secrets.OSSRH_TOKEN }}"
48-
},
49-
{
50-
"id": "sonatype-nexus-snapshots",
51-
"username": "${{ secrets.OSSRH_USERNAME }}",
52-
"password": "${{ secrets.OSSRH_TOKEN }}"
53-
}]
5449
- name: Build with Maven
5550
run: |
5651
mvn clean install -U -Pdocker -DJETTY_TEST_HTTP_PORT=8090 -DJETTY_TEST_STOP_PORT=8089
@@ -213,4 +208,6 @@ jobs:
213208
echo "Exiting Build..."
214209
exit 0
215210
env:
211+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
212+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
216213
TAG: ${{ github.event.inputs.tag }}

‎.github/workflows/docker-release-master.yml‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,25 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
name: git checkout master
1818
with:
1919
ref: master
2020
- name: Set up Java
21-
uses: actions/setup-java@v3
21+
uses: actions/setup-java@v4
2222
with:
2323
java-version: 17
2424
distribution: temurin
25-
cache: maven
25+
server-id: central
26+
server-username: MAVEN_USERNAME
27+
server-password: MAVEN_PASSWORD
28+
- name: Cache local Maven repository
29+
uses: actions/cache@v4
30+
with:
31+
path: ~/.m2/repository
32+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
33+
restore-keys: |
34+
${{ runner.os }}-maven-
2635
- name: Set up QEMU
2736
uses: docker/setup-qemu-action@v3
2837
- name: Set up Docker Buildx
@@ -37,20 +46,6 @@ jobs:
3746
/bin/bash ./bin/utils/detect_merge_conflict.sh
3847
# fail if generators contain tab '\t'
3948
/bin/bash ./bin/utils/detect_tab_in_java_class.sh
40-
- uses: s4u/[email protected]
41-
name: setup maven settings.xml
42-
with:
43-
servers: |
44-
[{
45-
"id": "sonatype-nexus-staging",
46-
"username": "${{ secrets.OSSRH_USERNAME }}",
47-
"password": "${{ secrets.OSSRH_TOKEN }}"
48-
},
49-
{
50-
"id": "sonatype-nexus-snapshots",
51-
"username": "${{ secrets.OSSRH_USERNAME }}",
52-
"password": "${{ secrets.OSSRH_TOKEN }}"
53-
}]
5449
- name: Build with Maven
5550
run: |
5651
mvn clean install -U
@@ -185,4 +180,6 @@ jobs:
185180
echo "Exiting Build..."
186181
exit 0
187182
env:
188-
TAG: ${{ github.event.inputs.tag }}
183+
TAG: ${{ github.event.inputs.tag }}
184+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
185+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}

‎.github/workflows/maven-pr-3.0.yml‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,23 @@ jobs:
1414

1515
env:
1616
GENERATORS_VERSION_PROPERTY: ""
17+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
18+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
1719
steps:
18-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
1921
name: git checkout 3.0.0
2022
- name: Set up Java
21-
uses: actions/setup-java@v3
23+
uses: actions/setup-java@v4
2224
with:
2325
java-version: ${{ matrix.java }}
2426
distribution: temurin
2527
cache: maven
28+
overwrite-settings: false
29+
- name: Add Central-Portal snapshot repo to settings.xml
30+
uses: s4u/[email protected]
31+
with:
32+
repositories: '[{"id":"central-portal-snapshots","name":"Sonatype Central Portal snapshots","url":"https://central.sonatype.com/repository/maven-snapshots/","releases":{"enabled":false},"snapshots":{"enabled":true}}]'
33+
servers: '[{"id":"central","username":"${{ secrets.MAVEN_CENTRAL_USERNAME }}","password":"${{ secrets.MAVEN_CENTRAL_PASSWORD }}"}]'
2634
- name: preliminary checks
2735
run: |
2836
docker login --username=${{ secrets.DOCKERHUB_SB_USERNAME }} --password=${{ secrets.DOCKERHUB_SB_PASSWORD }}
@@ -33,6 +41,7 @@ jobs:
3341
/bin/bash ./bin/utils/detect_merge_conflict.sh
3442
# fail if generators contain tab '\t'
3543
/bin/bash ./bin/utils/detect_tab_in_java_class.sh
44+
cat ~/.m2/settings.xml
3645
- name: Build with Maven
3746
if: ${{ matrix.java != 8 }}
3847
run: |
@@ -53,9 +62,13 @@ jobs:
5362
if [[ $GENERATORS_FOUND == '0' ]];
5463
then
5564
echo "generators version not found"
56-
rm -f maven-metadata.json
57-
curl -o maven-metadata.json -s --max-time 60 --retry 15 --connect-timeout 30 -H "accept: application/json" https://oss.sonatype.org/service/local/repositories/snapshots/content/io/swagger/codegen/v3/swagger-codegen-generators/
58-
LAST_SNAP=`jq '[.data | sort_by(.lastModified) | reverse | .[] | select( .text | contains("1."))]| .[0].text' maven-metadata.json`
65+
rm -f maven-metadata.xml
66+
SNAP_API="https://central.sonatype.com/repository/maven-snapshots"
67+
ARTIFACT_PATH="io/swagger/codegen/v3/swagger-codegen-generators"
68+
ROOT_META="${SNAP_API}/${ARTIFACT_PATH}/maven-metadata.xml"
69+
LATEST_DIR=$(curl -s "$ROOT_META" | grep -oP '(?<=<version>)1\.[^<]+' | sort -V | tail -n1)
70+
SNAP_META="${SNAP_API}/${ARTIFACT_PATH}/${LATEST_DIR}/maven-metadata.xml"
71+
LAST_SNAP=$(curl -s "$SNAP_META" | grep -oP '(?<=<value>)[^<]+' | head -n1)
5972
export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
6073
echo "LAST_SNAP $LAST_SNAP"
6174
export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
@@ -85,9 +98,13 @@ jobs:
8598
if [[ $GENERATORS_FOUND == '0' ]];
8699
then
87100
echo "generators version not found"
88-
rm -f maven-metadata.json
89-
curl -o maven-metadata.json -s --max-time 60 --retry 15 --connect-timeout 30 -H "accept: application/json" https://oss.sonatype.org/service/local/repositories/snapshots/content/io/swagger/codegen/v3/swagger-codegen-generators/
90-
LAST_SNAP=`jq '[.data | sort_by(.lastModified) | reverse | .[] | select( .text | contains("1."))]| .[0].text' maven-metadata.json`
101+
rm -f maven-metadata.xml
102+
SNAP_API="https://central.sonatype.com/repository/maven-snapshots"
103+
ARTIFACT_PATH="io/swagger/codegen/v3/swagger-codegen-generators"
104+
ROOT_META="${SNAP_API}/${ARTIFACT_PATH}/maven-metadata.xml"
105+
LATEST_DIR=$(curl -s "$ROOT_META" | grep -oP '(?<=<version>)1\.[^<]+' | sort -V | tail -n1)
106+
SNAP_META="${SNAP_API}/${ARTIFACT_PATH}/${LATEST_DIR}/maven-metadata.xml"
107+
LAST_SNAP=$(curl -s "$SNAP_META" | grep -oP '(?<=<value>)[^<]+' | head -n1)
91108
export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
92109
echo "LAST_SNAP $LAST_SNAP"
93110
export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP

‎.github/workflows/maven-push-3.0.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
GENERATORS_VERSION_PROPERTY: ""
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
name: git checkout 3.0.0
2121
with:
2222
ref: 3.0.0

‎modules/swagger-codegen-cli/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<packaging>jar</packaging>
1313

1414
<name>swagger-codegen (executable)</name>
15+
<description>swagger-codegen (executable)</description>
1516

1617
<build>
1718
<finalName>swagger-codegen-cli</finalName>

‎modules/swagger-codegen/pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<artifactId>swagger-codegen</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-codegen (core library)</name>
13+
<description>swagger-codegen (core library)</description>
1314
<build>
1415
<sourceDirectory>src/main/java</sourceDirectory>
1516
<defaultGoal>install</defaultGoal>
@@ -101,11 +102,6 @@
101102
<artifactId>maven-site-plugin</artifactId>
102103
<version>3.12.0</version>
103104
</plugin>
104-
<plugin>
105-
<groupId>org.apache.maven.plugins</groupId>
106-
<artifactId>maven-release-plugin</artifactId>
107-
<version>2.5.3</version>
108-
</plugin>
109105
<plugin>
110106
<groupId>net.revelc.code</groupId>
111107
<artifactId>formatter-maven-plugin</artifactId>
@@ -317,13 +313,4 @@
317313
<scope>test</scope>
318314
</dependency>
319315
</dependencies>
320-
<repositories>
321-
<repository>
322-
<id>sonatype-snapshots</id>
323-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
324-
<snapshots>
325-
<enabled>true</enabled>
326-
</snapshots>
327-
</repository>
328-
</repositories>
329316
</project>

‎modules/swagger-generator/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<artifactId>swagger-generator</artifactId>
1111
<packaging>war</packaging>
1212
<name>swagger-generator</name>
13+
<description>swagger-generator</description>
1314
<build>
1415
<defaultGoal>install</defaultGoal>
1516
<directory>target</directory>

0 commit comments

Comments
 (0)