Skip to content

Commit 34388a3

Browse files
HugoMarioHugoMario
authored
Merge branch 'master' into issue-11234
2 parents b473958 + cf9b3ca commit 34388a3

File tree

27 files changed

+299
-200
lines changed

27 files changed

+299
-200
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: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: PR 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: |
43+
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`
44+
echo "POM VERSION" ${MY_POM_VERSION}
45+
if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
46+
then
47+
- name: Build with Maven
48+
run: mvn -B -U verify --file pom.xml
49+
- name: Deploy Maven Snapshot
50+
if: ${{ matrix.java == 11 }}
51+
run: |
52+
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`
53+
echo "POM VERSION" ${MY_POM_VERSION}
54+
if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
55+
then
56+
./mvnw clean deploy -U --settings $HOME/.m2/settings.xml
57+
docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME:unstable ./modules/swagger-generator
58+
docker tag $DOCKER_GENERATOR_IMAGE_NAME:unstable
59+
docker push $DOCKER_GENERATOR_IMAGE_NAME:unstable
60+
docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable ./modules/swagger-codegen-cli
61+
docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable
62+
docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable
63+
else
64+
echo "not deploying release nor building and pushing release docker image: " ${MY_POM_VERSION}
65+
fi

‎.github/workflows/test-generation-v2.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
java: [ 8 ]
23+
java: [ 11 ]
2424

2525
steps:
2626
- uses: actions/checkout@v2
@@ -54,7 +54,7 @@ jobs:
5454

5555
strategy:
5656
matrix:
57-
java: [ 8 ]
57+
java: [ 11 ]
5858

5959

6060
outputs:
@@ -114,7 +114,7 @@ jobs:
114114
###############################################
115115
matrix:
116116
ruby: ['2.2']
117-
java: [ 8 ]
117+
java: [ 11 ]
118118
###############################################
119119
##### END DYNAMIC: Dependent on build environment
120120
###############################################
@@ -183,7 +183,7 @@ jobs:
183183

184184
strategy:
185185
matrix:
186-
java: [ 8 ]
186+
java: [ 11 ]
187187

188188

189189
outputs:
@@ -243,7 +243,7 @@ jobs:
243243
###############################################
244244
matrix:
245245
node-version: [12.x]
246-
java: [ 8 ]
246+
java: [ 11 ]
247247
###############################################
248248
##### END DYNAMIC: Dependent on build environment
249249
###############################################
@@ -309,7 +309,7 @@ jobs:
309309

310310
strategy:
311311
matrix:
312-
java: [ 8 ]
312+
java: [ 11 ]
313313

314314

315315
outputs:
@@ -369,7 +369,7 @@ jobs:
369369
###############################################
370370
matrix:
371371
node-version: [12.x]
372-
java: [ 8 ]
372+
java: [ 11 ]
373373
###############################################
374374
##### END DYNAMIC: Dependent on build environment
375375
###############################################

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,16 +238,16 @@ brew install swagger-codegen
238238

239239
To build from source, you need the following installed and available in your `$PATH:`
240240

241-
* [Java 8+](http://java.oracle.com)
241+
* [Java 11+](http://java.oracle.com)
242242

243-
* [Apache maven 3.3.3 or greater](http://maven.apache.org/)
243+
* [Apache maven 3.6.2 or greater](http://maven.apache.org/)
244244

245245
#### OS X Users
246-
Don't forget to install Java 8+.
246+
Don't forget to install Java 11+.
247247

248248
Export `JAVA_HOME` in order to use the supported Java version:
249249
```sh
250-
export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
250+
export JAVA_HOME=`/usr/libexec/java_home -v 11`
251251
export PATH=${JAVA_HOME}/bin:$PATH
252252
```
253253

‎appveyor.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# for CI with appveyor.yml
22
# Ref: http://www.yegor256.com/2015/01/10/windows-appveyor-maven.html
33
version: '{branch}-{build}'
4-
os: Windows Server 2012
54
skip_branch_with_pr: true
65
hosts:
76
petstore.swagger.io: 127.0.0.1
@@ -10,19 +9,17 @@ install:
109
Add-Type -AssemblyName System.IO.Compression.FileSystem
1110
if (!(Test-Path -Path "C:\maven" )) {
1211
(new-object System.Net.WebClient).DownloadFile(
13-
'https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip',
12+
'https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip',
1413
'C:\maven-bin.zip'
1514
)
1615
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
1716
}
18-
- cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;%PATH%
19-
- cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
20-
- cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
21-
- cmd: SET M2_HOME=C:\maven\apache-maven-3.5.4
17+
- cmd: SET JAVA_HOME=%ProgramFiles%\Java\jdk11
18+
- cmd: SET PATH=%ProgramFiles%\Java\jdk11\bin;%PATH%
2219
- cmd: dir/w
2320
# - cmd: RMDIR "C:\projects\swagger-codegen\swagger-samples" /S /Q
2421
- git clone https://github.com/wing328/swagger-samples
25-
- ps: Start-Process -FilePath 'C:\maven\apache-maven-3.5.4\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
22+
- ps: Start-Process "C:\Program Files (x86)\Apache\Maven\bin\mvn.cmd" -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
2623
build_script:
2724
# build C# API client
2825
- nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln
@@ -34,6 +31,12 @@ build_script:
3431
- nuget restore samples\client\petstore\csharp\SwaggerClientNetStandard\IO.Swagger.sln
3532
- msbuild samples\client\petstore\csharp\SwaggerClientNetStandard\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
3633
# install swagger codegen locally
34+
- echo %JAVA_HOME%
35+
- echo %PATH%
36+
- echo %M2_HOME%
37+
- echo %MAVEN_HOME%
38+
- set
39+
- mvn --version
3740
- mvn clean install --batch-mode
3841
test_script:
3942
# test c# API client

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<plugin>
4040
<groupId>org.apache.maven.plugins</groupId>
4141
<artifactId>maven-shade-plugin</artifactId>
42-
<version>2.3</version>
42+
<version>3.3.0</version>
4343
<executions>
4444
<execution>
4545
<id>process-resources</id>
@@ -98,13 +98,17 @@
9898
<dependency>
9999
<groupId>org.testng</groupId>
100100
<artifactId>testng</artifactId>
101-
<!-- <version>${testng-version}</version> -->
102101
<scope>test</scope>
103102
</dependency>
104103
<dependency>
105104
<groupId>org.jmockit</groupId>
106105
<artifactId>jmockit</artifactId>
107-
<!-- <version>${jmockit-version}</version> -->
106+
<scope>test</scope>
107+
</dependency>
108+
<dependency>
109+
<groupId>junit</groupId>
110+
<artifactId>junit</artifactId>
111+
<version>${junit-version}</version>
108112
<scope>test</scope>
109113
</dependency>
110114
</dependencies>

‎modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/cmd/GenerateTest.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -509,10 +509,6 @@ private void setupAndRunTest(String specFlag, final String spec, String langFlag
509509
new Expectations() {
510510
{
511511
CodegenConfigurator.fromFile(anyString);
512-
result = null;
513-
514-
new CodegenConfigurator();
515-
times = 1;
516512
result = configurator;
517513
}
518514
};
@@ -522,19 +518,15 @@ private void setupAndRunTest(String specFlag, final String spec, String langFlag
522518
{
523519

524520
configurator.toClientOptInput();
525-
times = 1;
526521
result = clientOptInput;
522+
minTimes = 1;
527523

528-
new DefaultGenerator();
529-
times = 1;
530-
result = generator;
524+
DefaultGenerator g = new DefaultGenerator();
531525

532-
generator.opts(clientOptInput);
533-
times = 1;
534-
result = generator;
526+
g.opts(clientOptInput);
527+
result = g;
535528

536-
generator.generate();
537-
times = 1;
529+
g.generate();
538530

539531
}
540532
};

‎modules/swagger-codegen-maven-plugin/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,29 @@
1616
</prerequisites>
1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19+
<maven.version>3.2.5</maven.version>
1920
</properties>
2021
<dependencies>
2122
<dependency>
2223
<groupId>org.apache.maven</groupId>
2324
<artifactId>maven-core</artifactId>
24-
<version>3.2.5</version>
25+
<version>${maven.version}</version>
2526
</dependency>
2627
<dependency>
2728
<groupId>org.apache.maven</groupId>
2829
<artifactId>maven-artifact</artifactId>
29-
<version>3.2.5</version>
30+
<version>${maven.version}</version>
3031
<scope>provided</scope>
3132
</dependency>
3233
<dependency>
3334
<groupId>org.apache.maven</groupId>
3435
<artifactId>maven-compat</artifactId>
35-
<version>3.2.5</version>
36+
<version>${maven.version}</version>
3637
</dependency>
3738
<dependency>
3839
<groupId>org.apache.maven</groupId>
3940
<artifactId>maven-plugin-api</artifactId>
40-
<version>3.2.5</version>
41+
<version>${maven.version}</version>
4142
</dependency>
4243
<dependency>
4344
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -52,7 +53,6 @@
5253
<dependency>
5354
<groupId>junit</groupId>
5455
<artifactId>junit</artifactId>
55-
<!-- <version>4.12</version> -->
5656
<scope>test</scope>
5757
</dependency>
5858
</dependencies>

0 commit comments

Comments
 (0)