Skip to content

Commit e980929

Browse files
wing328wing328
authored
update travis, support java9+ (#3279)
1 parent bd17a15 commit e980929

29 files changed

Lines changed: 300 additions & 164 deletions

File tree

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ lazy val root = (project in file(".")).
2424
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
2525
{{/threetenbp}}
2626
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
27+
"javax.annotation" % "jsr250-api" % "1.0" % "compile",
2728
"junit" % "junit" % "4.12" % "test",
2829
"com.novocode" % "junit-interface" % "0.10" % "test"
2930
)

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,11 @@
284284
<scope>provided</scope>
285285
</dependency>
286286
{{/parcelableModel}}
287+
<dependency>
288+
<groupId>javax.annotation</groupId>
289+
<artifactId>jsr250-api</artifactId>
290+
<version>${javax-annotation-version}</version>
291+
</dependency>
287292
<!-- test dependencies -->
288293
<dependency>
289294
<groupId>junit</groupId>
@@ -297,7 +302,7 @@
297302
<maven.compiler.source>${java.version}</maven.compiler.source>
298303
<maven.compiler.target>${java.version}</maven.compiler.target>
299304
<gson-fire-version>1.8.3</gson-fire-version>
300-
<swagger-core-version>1.5.21</swagger-core-version>
305+
<swagger-core-version>1.5.22</swagger-core-version>
301306
<okhttp-version>3.14.2</okhttp-version>
302307
<gson-version>2.8.5</gson-version>
303308
<commons-lang3-version>3.9</commons-lang3-version>
@@ -308,6 +313,7 @@
308313
<threetenbp-version>1.3.8</threetenbp-version>
309314
{{/threetenbp}}
310315
<maven-plugin-version>1.0.0</maven-plugin-version>
316+
<javax-annotation-version>1.0</javax-annotation-version>
311317
<junit-version>4.12</junit-version>
312318
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
313319
</properties>

‎modules/openapi-generator/src/main/resources/Java/travis.mustache‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#
2-
# Generated by: https://openapi-generator.tech
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
35
#
46
language: java
57
jdk:
6-
- oraclejdk8
7-
- oraclejdk7
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
813
before_install:
914
# ensure gradlew has proper permission
1015
- chmod a+x ./gradlew
1116
script:
1217
# test using maven
13-
- mvn test
14-
# uncomment below to test using gradle
15-
# - gradle test
16-
# uncomment below to test using sbt
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
1722
# - sbt test

‎samples/client/petstore/java/feign/.travis.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#
2-
# Generated by: https://openapi-generator.tech
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
35
#
46
language: java
57
jdk:
6-
- oraclejdk8
7-
- oraclejdk7
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
813
before_install:
914
# ensure gradlew has proper permission
1015
- chmod a+x ./gradlew
1116
script:
1217
# test using maven
13-
- mvn test
14-
# uncomment below to test using gradle
15-
# - gradle test
16-
# uncomment below to test using sbt
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
1722
# - sbt test

‎samples/client/petstore/java/feign10x/.travis.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#
2-
# Generated by: https://openapi-generator.tech
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
35
#
46
language: java
57
jdk:
6-
- oraclejdk8
7-
- oraclejdk7
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
813
before_install:
914
# ensure gradlew has proper permission
1015
- chmod a+x ./gradlew
1116
script:
1217
# test using maven
13-
- mvn test
14-
# uncomment below to test using gradle
15-
# - gradle test
16-
# uncomment below to test using sbt
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
1722
# - sbt test

‎samples/client/petstore/java/google-api-client/.travis.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#
2-
# Generated by: https://openapi-generator.tech
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
35
#
46
language: java
57
jdk:
6-
- oraclejdk8
7-
- oraclejdk7
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
813
before_install:
914
# ensure gradlew has proper permission
1015
- chmod a+x ./gradlew
1116
script:
1217
# test using maven
13-
- mvn test
14-
# uncomment below to test using gradle
15-
# - gradle test
16-
# uncomment below to test using sbt
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
1722
# - sbt test

‎samples/client/petstore/java/jersey1/.travis.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#
2-
# Generated by: https://openapi-generator.tech
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
35
#
46
language: java
57
jdk:
6-
- oraclejdk8
7-
- oraclejdk7
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
813
before_install:
914
# ensure gradlew has proper permission
1015
- chmod a+x ./gradlew
1116
script:
1217
# test using maven
13-
- mvn test
14-
# uncomment below to test using gradle
15-
# - gradle test
16-
# uncomment below to test using sbt
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
1722
# - sbt test

‎samples/client/petstore/java/jersey2-java6/.travis.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#
2-
# Generated by: https://openapi-generator.tech
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
35
#
46
language: java
57
jdk:
6-
- oraclejdk8
7-
- oraclejdk7
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
813
before_install:
914
# ensure gradlew has proper permission
1015
- chmod a+x ./gradlew
1116
script:
1217
# test using maven
13-
- mvn test
14-
# uncomment below to test using gradle
15-
# - gradle test
16-
# uncomment below to test using sbt
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
1722
# - sbt test

‎samples/client/petstore/java/jersey2-java8/.travis.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#
2-
# Generated by: https://openapi-generator.tech
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
35
#
46
language: java
57
jdk:
6-
- oraclejdk8
7-
- oraclejdk7
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
813
before_install:
914
# ensure gradlew has proper permission
1015
- chmod a+x ./gradlew
1116
script:
1217
# test using maven
13-
- mvn test
14-
# uncomment below to test using gradle
15-
# - gradle test
16-
# uncomment below to test using sbt
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
1722
# - sbt test

‎samples/client/petstore/java/jersey2/.travis.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
#
2-
# Generated by: https://openapi-generator.tech
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
35
#
46
language: java
57
jdk:
6-
- oraclejdk8
7-
- oraclejdk7
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
813
before_install:
914
# ensure gradlew has proper permission
1015
- chmod a+x ./gradlew
1116
script:
1217
# test using maven
13-
- mvn test
14-
# uncomment below to test using gradle
15-
# - gradle test
16-
# uncomment below to test using sbt
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
1722
# - sbt test

0 commit comments

Comments
 (0)