Skip to content

Commit 1bbe2d6

Browse files
frantumafrantuma
committed
JDK 11+ - update dependencies
1 parent 5796b80 commit 1bbe2d6

25 files changed

+276
-163
lines changed

Diff for: ‎.github/workflows/maven-master-pulls.yml

+29
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

Diff for: ‎.github/workflows/maven-master.yml

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
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@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: Docker Login
29+
run: |
30+
docker login --username=${{ secrets.DOCKERHUB_SB_USERNAME }} --password=${{ secrets.DOCKERHUB_SB_PASSWORD }}
31+
set -e
32+
- uses: s4u/[email protected]
33+
name: setup maven settings.xml
34+
with:
35+
servers: |
36+
[{
37+
"id": "sonatype-nexus-staging",
38+
"username": "${{ secrets.OSSRH_USERNAME }}",
39+
"password": "${{ secrets.OSSRH_TOKEN }}"
40+
},
41+
{
42+
"id": "sonatype-nexus-snapshots",
43+
"username": "${{ secrets.OSSRH_USERNAME }}",
44+
"password": "${{ secrets.OSSRH_TOKEN }}"
45+
}]
46+
- name: Build with Maven
47+
run: |
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+
- name: Build with Maven
53+
run: mvn -B -U verify --file pom.xml
54+
- name: Deploy Maven Snapshot
55+
if: ${{ matrix.java == 11 }}
56+
run: |
57+
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`
58+
echo "POM VERSION" ${MY_POM_VERSION}
59+
if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
60+
then
61+
./mvnw clean deploy -U --settings $HOME/.m2/settings.xml
62+
docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME:unstable ./modules/swagger-generator
63+
docker tag $DOCKER_GENERATOR_IMAGE_NAME:unstable
64+
docker push $DOCKER_GENERATOR_IMAGE_NAME:unstable
65+
docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable ./modules/swagger-codegen-cli
66+
docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable
67+
docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable
68+
else
69+
echo "not deploying release nor building and pushing release docker image: " ${MY_POM_VERSION}
70+
fi

Diff for: ‎.github/workflows/test-generation-v2.yml

+7-7
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
###############################################

Diff for: ‎appveyor.yml

+10-7
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

Diff for: ‎modules/swagger-codegen-cli/pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -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>

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

+5-13
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
};

Diff for: ‎modules/swagger-codegen/pom.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@
265265
<dependency>
266266
<groupId>org.testng</groupId>
267267
<artifactId>testng</artifactId>
268-
<!-- <version>${testng-version}</version> -->
269268
<scope>test</scope>
270269
</dependency>
271270
<dependency>
@@ -294,10 +293,15 @@
294293
<dependency>
295294
<groupId>org.mockito</groupId>
296295
<artifactId>mockito-core</artifactId>
297-
<version>2.8.47</version>
296+
<version>${mockito-version}</version>
297+
<scope>test</scope>
298+
</dependency>
299+
<dependency>
300+
<groupId>junit</groupId>
301+
<artifactId>junit</artifactId>
302+
<version>${junit-version}</version>
298303
<scope>test</scope>
299304
</dependency>
300-
301305
</dependencies>
302306
<repositories>
303307
<repository>

Diff for: ‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java

-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public SpringCodegen() {
8585
cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files."));
8686
cliOptions.add(CliOption.newBoolean(DELEGATE_PATTERN, "Whether to generate the server files using the delegate pattern"));
8787
cliOptions.add(CliOption.newBoolean(SINGLE_CONTENT_TYPES, "Whether to select only one produces/consumes content-type by operation."));
88-
cliOptions.add(CliOption.newBoolean(JAVA_8, "use java8 features like the new date library"));
8988
cliOptions.add(CliOption.newBoolean(ASYNC, "use async Callable controllers"));
9089
cliOptions.add(new CliOption(RESPONSE_WRAPPER, "wrap the responses in given type (Future,Callable,CompletableFuture,ListenableFuture,DeferredResult,HystrixCommand,RxObservable,RxSingle or fully qualified type)"));
9190
cliOptions.add(CliOption.newBoolean(USE_TAGS, "use tags for creating interface and controller classnames"));

Diff for: ‎modules/swagger-codegen/src/test/java/io/swagger/codegen/AbstractIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void generatesCorrectDirectoryStructure() throws IOException {
3636

3737
IntegrationTestPathsConfig integrationTestPathsConfig = getIntegrationTestPathsConfig();
3838

39-
String specContent = Files.readFile(integrationTestPathsConfig.getSpecPath().toFile());
39+
String specContent = Files.readFile(java.nio.file.Files.newInputStream(integrationTestPathsConfig.getSpecPath()));
4040
Swagger swagger = new SwaggerParser().parse(specContent);
4141

4242
CodegenConfig codegenConfig = getCodegenConfig();

0 commit comments

Comments
 (0)