Skip to content

Commit 1cb0f36

Browse files
frantumafrantuma
committed
JDK 11+ - update dependencies
1 parent 3e2211a commit 1cb0f36

File tree

249 files changed

+3510
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+3510
-352
lines changed

‎.github/workflows/maven-master-pulls.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: PR build - master
2+
3+
on:
4+
pull_request:
5+
branches: [ "master" ]
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
java: [ 11 ]
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up Java
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: ${{ matrix.java }}
21+
- name: Cache local Maven repository
22+
uses: actions/cache@v2
23+
with:
24+
path: ~/.m2/repository
25+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
26+
restore-keys: |
27+
${{ runner.os }}-maven-
28+
- name: Build with Maven
29+
run: mvn -B -U verify --file pom.xml

‎.github/workflows/maven-master.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Build - master
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
java: [ 11 ]
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up Java
18+
uses: actions/setup-java@v3
19+
with:
20+
java-version: ${{ matrix.java }}
21+
distribution: temurin
22+
cache: maven
23+
- name: Docker Login
24+
run: |
25+
docker login --username=${{ secrets.DOCKERHUB_SB_USERNAME }} --password=${{ secrets.DOCKERHUB_SB_PASSWORD }}
26+
set -e
27+
- uses: s4u/[email protected]
28+
name: setup maven settings.xml
29+
with:
30+
servers: |
31+
[{
32+
"id": "sonatype-nexus-staging",
33+
"username": "${{ secrets.OSSRH_USERNAME }}",
34+
"password": "${{ secrets.OSSRH_TOKEN }}"
35+
},
36+
{
37+
"id": "sonatype-nexus-snapshots",
38+
"username": "${{ secrets.OSSRH_USERNAME }}",
39+
"password": "${{ secrets.OSSRH_TOKEN }}"
40+
}]
41+
- name: Build with Maven
42+
run: mvn -B -U verify --file pom.xml
43+
- name: Deploy Maven Snapshot
44+
if: ${{ matrix.java == 11 }}
45+
run: |
46+
export DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator
47+
export DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli
48+
export MY_POM_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
49+
echo "POM VERSION" ${MY_POM_VERSION}
50+
if [[ $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
51+
then
52+
./mvnw clean deploy -U --settings $HOME/.m2/settings.xml
53+
docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME:unstable ./modules/swagger-generator
54+
docker push $DOCKER_GENERATOR_IMAGE_NAME:unstable
55+
docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable ./modules/swagger-codegen-cli
56+
docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable
57+
else
58+
echo "not deploying release nor building and pushing release docker image: " ${MY_POM_VERSION}
59+
fi

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

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
"password": "${{ secrets.OSSRH_TOKEN }}"
4949
}]
5050
- name: Build with Maven
51+
if: ${{ matrix.java != 8 }}
5152
run: |
5253
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`
5354
echo "POM VERSION" ${MY_POM_VERSION}
@@ -78,8 +79,38 @@ jobs:
7879
echo "GENERATORS_VERSION_PROPERTY ${GENERATORS_VERSION_PROPERTY}"
7980
echo "GENERATORS_VERSION_PROPERTY=${GENERATORS_VERSION_PROPERTY}" >> $GITHUB_ENV
8081
mvn clean verify -U -DJETTY_TEST_HTTP_PORT=8070 -DJETTY_TEST_STOP_PORT=8069 ${GENERATORS_VERSION_PROPERTY}
81-
- name: Test samples
82+
- name: Build and test samples Java 8
8283
if: ${{ matrix.java == 8 }}
8384
run: |
85+
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`
86+
echo "POM VERSION" ${MY_POM_VERSION}
87+
export GENERATORS_VERSION=`sed -n 's/<swagger\-codegen\-generators\-version>\([^\s]*\)<\/swagger\-codegen\-generators\-version>/\1/p' pom.xml`
88+
export GENERATORS_VERSION=`echo ${GENERATORS_VERSION} | tr -d '[:space:]'`
89+
echo "GENERATORS_VERSION" ${GENERATORS_VERSION}
90+
export GENERATORS_VERSION_PROPERTY=""
91+
if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
92+
then
93+
if [[ ! $GENERATORS_VERSION =~ ^.*SNAPSHOT$ ]];
94+
then
95+
# check release version exists
96+
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`
97+
export GENERATORS_FOUND=`echo ${GENERATORS_FOUND_JSON} | jq '.response.numFound'`
98+
echo "GENERATORS_FOUND" ${GENERATORS_FOUND}
99+
if [[ $GENERATORS_FOUND == '0' ]];
100+
then
101+
echo "generators version not found"
102+
rm -f maven-metadata.json
103+
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/
104+
LAST_SNAP=`jq '.data | sort_by(.lastModified) | reverse | .[0].text' maven-metadata.json`
105+
export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
106+
echo "LAST_SNAP $LAST_SNAP"
107+
export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
108+
fi
109+
fi
110+
fi
111+
echo "GENERATORS_VERSION_PROPERTY ${GENERATORS_VERSION_PROPERTY}"
112+
echo "GENERATORS_VERSION_PROPERTY=${GENERATORS_VERSION_PROPERTY}" >> $GITHUB_ENV
113+
cp -a pom.java8.xml pom.xml
84114
echo "Test samples - GENERATORS_VERSION_PROPERTY ${{ env.GENERATORS_VERSION_PROPERTY }}"
85-
mvn -q verify -U -Psamples -Dproject.build.sourceEncoding=UTF8 -Dfile.encoding=UTF8 ${{ env.GENERATORS_VERSION_PROPERTY }}
115+
mvn verify -U -Psamples -DskipTests -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true -Dproject.build.sourceEncoding=UTF8 -Dfile.encoding=UTF8 ${{ env.GENERATORS_VERSION_PROPERTY }}
116+
cp -a pom.java11.xml pom.xml

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

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
"password": "${{ secrets.OSSRH_TOKEN }}"
5252
}]
5353
- name: Build with Maven
54+
if: ${{ matrix.java != 8 }}
5455
run: |
5556
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`
5657
echo "POM VERSION" ${MY_POM_VERSION}
@@ -82,11 +83,41 @@ jobs:
8283
echo "GENERATORS_VERSION_PROPERTY=${GENERATORS_VERSION_PROPERTY}" >> $GITHUB_ENV
8384
mvn clean verify -U -DJETTY_TEST_HTTP_PORT=8070 -DJETTY_TEST_STOP_PORT=8069 ${GENERATORS_VERSION_PROPERTY}
8485
mvn clean install -U -Pdocker -Plinux -DJETTY_TEST_HTTP_PORT=8090 -DJETTY_TEST_STOP_PORT=8089 ${GENERATORS_VERSION_PROPERTY}
85-
- name: Test samples
86+
- name: Build and test samples Java 8
8687
if: ${{ matrix.java == 8 }}
8788
run: |
88-
echo "Test samples - GENERATORS_VERSION_PROPERTY ${{ env.GENERATORS_VERSION_PROPERTY }}"
89-
mvn -q verify -U -Psamples -Dproject.build.sourceEncoding=UTF8 -Dfile.encoding=UTF8 ${{ env.GENERATORS_VERSION_PROPERTY }}
89+
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`
90+
echo "POM VERSION" ${MY_POM_VERSION}
91+
export GENERATORS_VERSION=`sed -n 's/<swagger\-codegen\-generators\-version>\([^\s]*\)<\/swagger\-codegen\-generators\-version>/\1/p' pom.xml`
92+
export GENERATORS_VERSION=`echo ${GENERATORS_VERSION} | tr -d '[:space:]'`
93+
echo "GENERATORS_VERSION" ${GENERATORS_VERSION}
94+
export GENERATORS_VERSION_PROPERTY=""
95+
if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
96+
then
97+
if [[ ! $GENERATORS_VERSION =~ ^.*SNAPSHOT$ ]];
98+
then
99+
# check release version exists
100+
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`
101+
export GENERATORS_FOUND=`echo ${GENERATORS_FOUND_JSON} | jq '.response.numFound'`
102+
echo "GENERATORS_FOUND" ${GENERATORS_FOUND}
103+
if [[ $GENERATORS_FOUND == '0' ]];
104+
then
105+
echo "generators version not found"
106+
rm -f maven-metadata.json
107+
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/
108+
LAST_SNAP=`jq '.data | sort_by(.lastModified) | reverse | .[0].text' maven-metadata.json`
109+
export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
110+
echo "LAST_SNAP $LAST_SNAP"
111+
export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
112+
fi
113+
fi
114+
fi
115+
echo "GENERATORS_VERSION_PROPERTY ${GENERATORS_VERSION_PROPERTY}"
116+
echo "GENERATORS_VERSION_PROPERTY=${GENERATORS_VERSION_PROPERTY}" >> $GITHUB_ENV
117+
cp -a pom.java8.xml pom.xml
118+
echo "Test samples - GENERATORS_VERSION_PROPERTY ${{ env.GENERATORS_VERSION_PROPERTY }}"
119+
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 ${{ env.GENERATORS_VERSION_PROPERTY }}
120+
cp -a pom.java11.xml pom.xml
90121
- name: docker cli and minimal build and push
91122
if: ${{ matrix.java == 17 }}
92123
run: |

‎.github/workflows/test-framework-ada.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
java: [ 8 ]
37+
java: [ 11 ]
3838

3939
steps:
4040
- uses: actions/checkout@v2

‎.github/workflows/test-framework-clojure.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
java: [ 8 ]
37+
java: [ 11 ]
3838

3939
steps:
4040
- uses: actions/checkout@v2

‎.github/workflows/test-framework-dart.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
java: [ 8 ]
37+
java: [ 11 ]
3838

3939
steps:
4040
- uses: actions/checkout@v2

‎.github/workflows/test-framework-dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
java: [ 8 ]
37+
java: [ 11 ]
3838

3939
steps:
4040
- uses: actions/checkout@v2

‎.github/workflows/test-framework-elixir.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
java: [ 8 ]
37+
java: [ 11 ]
3838

3939
steps:
4040
- uses: actions/checkout@v2

‎.github/workflows/test-framework-go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
java: [ 8 ]
37+
java: [ 11 ]
3838

3939
steps:
4040
- uses: actions/checkout@v2

0 commit comments

Comments
 (0)