Skip to content

Commit cdc5260

Browse files
frantumafrantuma
committed
chore: migrate Sonatype OSSRH to Central Portal
1 parent 680adc4 commit cdc5260

File tree

11 files changed

+165
-2748
lines changed

11 files changed

+165
-2748
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: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,29 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
java: [ 8, 11, 17 ]
13+
java: [ 11, 17 ]
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
22+
with:
23+
ref: 3.0.0
2024
- name: Set up Java
21-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2226
with:
2327
java-version: ${{ matrix.java }}
2428
distribution: temurin
2529
cache: maven
30+
overwrite-settings: false
31+
- name: Add Central-Portal snapshot repo to settings.xml
32+
uses: s4u/[email protected]
33+
with:
34+
repositories: '[{"id":"central-portal-snapshots","name":"Sonatype Central Portal snapshots","url":"https://central.sonatype.com/repository/maven-snapshots/","releases":{"enabled":false},"snapshots":{"enabled":true}}]'
35+
servers: '[{"id":"central","username":"${{ secrets.MAVEN_CENTRAL_USERNAME }}","password":"${{ secrets.MAVEN_CENTRAL_PASSWORD }}"}]'
2636
- name: preliminary checks
2737
run: |
2838
docker login --username=${{ secrets.DOCKERHUB_SB_USERNAME }} --password=${{ secrets.DOCKERHUB_SB_PASSWORD }}
@@ -53,41 +63,13 @@ jobs:
5363
if [[ $GENERATORS_FOUND == '0' ]];
5464
then
5565
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`
59-
export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
60-
echo "LAST_SNAP $LAST_SNAP"
61-
export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
62-
fi
63-
fi
64-
fi
65-
echo "GENERATORS_VERSION_PROPERTY ${GENERATORS_VERSION_PROPERTY}"
66-
echo "GENERATORS_VERSION_PROPERTY=${GENERATORS_VERSION_PROPERTY}" >> $GITHUB_ENV
67-
mvn clean verify -U -DJETTY_TEST_HTTP_PORT=8070 -DJETTY_TEST_STOP_PORT=8069 ${GENERATORS_VERSION_PROPERTY}
68-
- name: Build and test samples Java 8
69-
if: ${{ matrix.java == 8 }}
70-
run: |
71-
export MY_POM_VERSION=`mvn -Dswagger-codegen-generators-version=1.0.37 -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
72-
echo "POM VERSION" ${MY_POM_VERSION}
73-
export GENERATORS_VERSION=`sed -n 's/<swagger\-codegen\-generators\-version>\([^\s]*\)<\/swagger\-codegen\-generators\-version>/\1/p' pom.xml`
74-
export GENERATORS_VERSION=`echo ${GENERATORS_VERSION} | tr -d '[:space:]'`
75-
echo "GENERATORS_VERSION" ${GENERATORS_VERSION}
76-
export GENERATORS_VERSION_PROPERTY=""
77-
if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
78-
then
79-
if [[ ! $GENERATORS_VERSION =~ ^.*SNAPSHOT$ ]];
80-
then
81-
# check release version exists
82-
export GENERATORS_FOUND_JSON=`curl -s --max-time 60 --retry 15 --connect-timeout 20 https://search.maven.org/solrsearch/select?q=g:io.swagger.codegen.v3%20AND%20a:swagger-codegen-generators%20AND%20v:${GENERATORS_VERSION}%20AND%20p:jar`
83-
export GENERATORS_FOUND=`echo ${GENERATORS_FOUND_JSON} | jq '.response.numFound'`
84-
echo "GENERATORS_FOUND" ${GENERATORS_FOUND}
85-
if [[ $GENERATORS_FOUND == '0' ]];
86-
then
87-
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`
66+
rm -f maven-metadata.xml
67+
SNAP_API="https://central.sonatype.com/repository/maven-snapshots"
68+
ARTIFACT_PATH="io/swagger/codegen/v3/swagger-codegen-generators"
69+
ROOT_META="${SNAP_API}/${ARTIFACT_PATH}/maven-metadata.xml"
70+
LATEST_DIR=$(curl -s "$ROOT_META" | grep -oP '(?<=<version>)1\.[^<]+' | sort -V | tail -n1)
71+
SNAP_META="${SNAP_API}/${ARTIFACT_PATH}/${LATEST_DIR}/maven-metadata.xml"
72+
LAST_SNAP=$(curl -s "$SNAP_META" | grep -oP '(?<=<value>)[^<]+' | head -n1)
9173
export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
9274
echo "LAST_SNAP $LAST_SNAP"
9375
export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
@@ -96,7 +78,4 @@ jobs:
9678
fi
9779
echo "GENERATORS_VERSION_PROPERTY ${GENERATORS_VERSION_PROPERTY}"
9880
echo "GENERATORS_VERSION_PROPERTY=${GENERATORS_VERSION_PROPERTY}" >> $GITHUB_ENV
99-
cp -a pom.java8.xml pom.xml
100-
echo "Test samples - GENERATORS_VERSION_PROPERTY ${GENERATORS_VERSION_PROPERTY}"
101-
mvn verify -U -Psamples -DskipTests -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true -Dproject.build.sourceEncoding=UTF8 -Dfile.encoding=UTF8 ${GENERATORS_VERSION_PROPERTY}
102-
cp -a pom.java11.xml pom.xml
81+
mvn clean verify -U -DJETTY_TEST_HTTP_PORT=8070 -DJETTY_TEST_STOP_PORT=8069 ${GENERATORS_VERSION_PROPERTY}

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

Lines changed: 18 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,29 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
java: [ 8, 11, 17 ]
13+
java: [ 11, 17 ]
1414

1515
env:
1616
GENERATORS_VERSION_PROPERTY: ""
17-
17+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
18+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
1819
steps:
19-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2021
name: git checkout 3.0.0
2122
with:
2223
ref: 3.0.0
2324
- name: Set up Java
24-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2526
with:
2627
java-version: ${{ matrix.java }}
2728
distribution: temurin
2829
cache: maven
30+
overwrite-settings: false
31+
- name: Add Central-Portal snapshot repo to settings.xml
32+
uses: s4u/[email protected]
33+
with:
34+
repositories: '[{"id":"central-portal-snapshots","name":"Sonatype Central Portal snapshots","url":"https://central.sonatype.com/repository/maven-snapshots/","releases":{"enabled":false},"snapshots":{"enabled":true}}]'
35+
servers: '[{"id":"central","username":"${{ secrets.MAVEN_CENTRAL_USERNAME }}","password":"${{ secrets.MAVEN_CENTRAL_PASSWORD }}"}]'
2936
- name: Set up QEMU
3037
uses: docker/setup-qemu-action@v3
3138
- name: Set up Docker Buildx
@@ -40,20 +47,6 @@ jobs:
4047
/bin/bash ./bin/utils/detect_merge_conflict.sh
4148
# fail if generators contain tab '\t'
4249
/bin/bash ./bin/utils/detect_tab_in_java_class.sh
43-
- uses: s4u/[email protected]
44-
name: setup maven settings.xml
45-
with:
46-
servers: |
47-
[{
48-
"id": "sonatype-nexus-staging",
49-
"username": "${{ secrets.OSSRH_USERNAME }}",
50-
"password": "${{ secrets.OSSRH_TOKEN }}"
51-
},
52-
{
53-
"id": "sonatype-nexus-snapshots",
54-
"username": "${{ secrets.OSSRH_USERNAME }}",
55-
"password": "${{ secrets.OSSRH_TOKEN }}"
56-
}]
5750
- name: Build with Maven
5851
if: ${{ matrix.java != 8 }}
5952
run: |
@@ -74,9 +67,13 @@ jobs:
7467
if [[ $GENERATORS_FOUND == '0' ]];
7568
then
7669
echo "generators version not found"
77-
rm -f maven-metadata.json
78-
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/
79-
LAST_SNAP=`jq '[.data | sort_by(.lastModified) | reverse | .[] | select( .text | contains("1."))]| .[0].text' maven-metadata.json`
70+
rm -f maven-metadata.xml
71+
SNAP_API="https://central.sonatype.com/repository/maven-snapshots"
72+
ARTIFACT_PATH="io/swagger/codegen/v3/swagger-codegen-generators"
73+
ROOT_META="${SNAP_API}/${ARTIFACT_PATH}/maven-metadata.xml"
74+
LATEST_DIR=$(curl -s "$ROOT_META" | grep -oP '(?<=<version>)1\.[^<]+' | sort -V | tail -n1)
75+
SNAP_META="${SNAP_API}/${ARTIFACT_PATH}/${LATEST_DIR}/maven-metadata.xml"
76+
LAST_SNAP=$(curl -s "$SNAP_META" | grep -oP '(?<=<value>)[^<]+' | head -n1)
8077
export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
8178
echo "LAST_SNAP $LAST_SNAP"
8279
export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
@@ -89,41 +86,6 @@ jobs:
8986
echo "GENERATORS_VERSION_PROPERTY=${GENERATORS_VERSION_PROPERTY}" >> $GITHUB_ENV
9087
mvn clean verify -U -DJETTY_TEST_HTTP_PORT=8070 -DJETTY_TEST_STOP_PORT=8069 ${GENERATORS_VERSION_PROPERTY}
9188
mvn clean install -U -Pdocker -DJETTY_TEST_HTTP_PORT=8090 -DJETTY_TEST_STOP_PORT=8089 ${GENERATORS_VERSION_PROPERTY}
92-
- name: Build and test samples Java 8
93-
if: ${{ matrix.java == 8 }}
94-
run: |
95-
export MY_POM_VERSION=`mvn -Dswagger-codegen-generators-version=1.0.37 -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
96-
echo "POM VERSION" ${MY_POM_VERSION}
97-
export GENERATORS_VERSION=`sed -n 's/<swagger\-codegen\-generators\-version>\([^\s]*\)<\/swagger\-codegen\-generators\-version>/\1/p' pom.xml`
98-
export GENERATORS_VERSION=`echo ${GENERATORS_VERSION} | tr -d '[:space:]'`
99-
echo "GENERATORS_VERSION" ${GENERATORS_VERSION}
100-
export GENERATORS_VERSION_PROPERTY=""
101-
if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
102-
then
103-
if [[ ! $GENERATORS_VERSION =~ ^.*SNAPSHOT$ ]];
104-
then
105-
# check release version exists
106-
export GENERATORS_FOUND_JSON=`curl -s --max-time 60 --retry 15 --connect-timeout 20 https://search.maven.org/solrsearch/select?q=g:io.swagger.codegen.v3%20AND%20a:swagger-codegen-generators%20AND%20v:${GENERATORS_VERSION}%20AND%20p:jar`
107-
export GENERATORS_FOUND=`echo ${GENERATORS_FOUND_JSON} | jq '.response.numFound'`
108-
echo "GENERATORS_FOUND" ${GENERATORS_FOUND}
109-
if [[ $GENERATORS_FOUND == '0' ]];
110-
then
111-
echo "generators version not found"
112-
rm -f maven-metadata.json
113-
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/
114-
LAST_SNAP=`jq '[.data | sort_by(.lastModified) | reverse | .[] | select( .text | contains("1."))]| .[0].text' maven-metadata.json`
115-
export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
116-
echo "LAST_SNAP $LAST_SNAP"
117-
export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
118-
fi
119-
fi
120-
fi
121-
echo "GENERATORS_VERSION_PROPERTY ${GENERATORS_VERSION_PROPERTY}"
122-
echo "GENERATORS_VERSION_PROPERTY=${GENERATORS_VERSION_PROPERTY}" >> $GITHUB_ENV
123-
cp -a pom.java8.xml pom.xml
124-
echo "Test samples - GENERATORS_VERSION_PROPERTY ${GENERATORS_VERSION_PROPERTY}"
125-
mvn -q verify -U -Psamples -DskipTests -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true -Dproject.build.sourceEncoding=UTF8 -Dfile.encoding=UTF8 ${GENERATORS_VERSION_PROPERTY}
126-
cp -a pom.java11.xml pom.xml
12789
- name: deploy maven
12890
if: ${{ matrix.java == 17 && env.SNAP == 'true'}}
12991
run: |

‎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: 2 additions & 15 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>
@@ -72,7 +73,7 @@
7273
</plugin>
7374
<plugin>
7475
<artifactId>maven-compiler-plugin</artifactId>
75-
<version>3.10.1</version>
76+
<version>3.13.0</version>
7677
</plugin>
7778
<plugin>
7879
<groupId>org.apache.maven.plugins</groupId>
@@ -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)