Skip to content

Commit d863c3e

Browse files
authored
Add travis.yml to test java6 option (#568)
Add travis.yml to test java6 option, update Java (Jersey2) dependencies
1 parent 5a0a8f6 commit d863c3e

17 files changed

Lines changed: 225 additions & 52 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ samples/client/petstore/scala/build/
8383
samples/client/petstore/java/resttemplate/hello.txt
8484
samples/client/petstore/java/retrofit2/hello.txt
8585
samples/client/petstore/java/feign/hello.txt
86+
samples/client/petstore/java/jersey2-java6/project/
87+
samples/client/petstore/java/jersey2-java8/project/
88+
samples/client/petstore/java/jersey2/project/
8689

8790
#PHP
8891
samples/client/petstore/php/OpenAPIToolsClient-php/composer.lock

CI/.travis.yml.jdk6

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
dist: trusty
2+
sudo: required
3+
language: java
4+
addons:
5+
apt:
6+
packages:
7+
- openjdk-6-jdk
8+
jdk: openjdk6
9+
10+
cache:
11+
directories:
12+
- $HOME/.m2
13+
- $HOME/.ivy2
14+
- $HOME/.gradle/caches/
15+
- $HOME/.gradle/wrapper/
16+
17+
install:
18+
- jdk_switcher use openjdk6
19+
- java -version
20+
- curl -s "https://get.sdkman.io" | bash
21+
- source "$HOME/.sdkman/bin/sdkman-init.sh"
22+
- sdk version
23+
- sdk install gradle 2.9
24+
- sdk list gradle
25+
- sdk version
26+
- gradle --version
27+
28+
script:
29+
- cd samples/client/petstore/java/jersey2-java6 && gradle test
Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
apply plugin: 'idea'
2+
apply plugin: 'eclipse'
3+
4+
group = 'org.openapitools'
5+
version = '1.0.0'
6+
7+
buildscript {
8+
repositories {
9+
jcenter {
10+
url "http://jcenter.bintray.com/"
11+
}
12+
}
13+
dependencies {
14+
classpath 'com.android.tools.build:gradle:2.3.+'
15+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
16+
}
17+
}
18+
19+
repositories {
20+
jcenter {
21+
url "http://jcenter.bintray.com/"
22+
}
23+
}
24+
25+
26+
if(hasProperty('target') && target == 'android') {
27+
28+
apply plugin: 'com.android.library'
29+
apply plugin: 'com.github.dcendents.android-maven'
30+
31+
android {
32+
compileSdkVersion 25
33+
buildToolsVersion '25.0.2'
34+
defaultConfig {
35+
minSdkVersion 14
36+
targetSdkVersion 25
37+
}
38+
compileOptions {
39+
sourceCompatibility JavaVersion.VERSION_1_6
40+
targetCompatibility JavaVersion.VERSION_1_6
41+
}
42+
43+
// Rename the aar correctly
44+
libraryVariants.all { variant ->
45+
variant.outputs.each { output ->
46+
def outputFile = output.outputFile
47+
if (outputFile != null && outputFile.name.endsWith('.aar')) {
48+
def fileName = "${project.name}-${variant.baseName}-${version}.aar"
49+
output.outputFile = new File(outputFile.parent, fileName)
50+
}
51+
}
52+
}
53+
54+
dependencies {
55+
provided 'javax.annotation:jsr250-api:1.0'
56+
}
57+
}
58+
59+
afterEvaluate {
60+
android.libraryVariants.all { variant ->
61+
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
62+
task.description = "Create jar artifact for ${variant.name}"
63+
task.dependsOn variant.javaCompile
64+
task.from variant.javaCompile.destinationDir
65+
task.destinationDir = project.file("${project.buildDir}/outputs/jar")
66+
task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
67+
artifacts.add('archives', task);
68+
}
69+
}
70+
71+
task sourcesJar(type: Jar) {
72+
from android.sourceSets.main.java.srcDirs
73+
classifier = 'sources'
74+
}
75+
76+
artifacts {
77+
archives sourcesJar
78+
}
79+
80+
} else {
81+
82+
apply plugin: 'java'
83+
apply plugin: 'maven'
84+
sourceCompatibility = JavaVersion.VERSION_1_6
85+
targetCompatibility = JavaVersion.VERSION_1_6
86+
87+
install {
88+
repositories.mavenInstaller {
89+
pom.artifactId = 'petstore-jersey2-java6'
90+
}
91+
}
92+
93+
task execute(type:JavaExec) {
94+
main = System.getProperty('mainClass')
95+
classpath = sourceSets.main.runtimeClasspath
96+
}
97+
}
98+
99+
ext {
100+
swagger_annotations_version = "1.5.20"
101+
jackson_version = "2.9.6"
102+
jersey_version = "2.6"
103+
commons_io_version=2.5
104+
commons_lang3_version=3.6
105+
junit_version = "4.12"
106+
threetenbp_version = "2.6.4"
107+
}
108+
109+
dependencies {
110+
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
111+
compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
112+
compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
113+
compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
114+
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
115+
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
116+
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
117+
compile "commons-io:commons-io:$commons_io_version"
118+
compile "org.apache.commons:commons-lang3:$commons_lang3_version"
119+
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
120+
compile "com.brsanthu:migbase64:2.2"
121+
testCompile "junit:junit:$junit_version"
122+
}

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ install:
1818
- cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
1919
- cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
2020
- cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
21+
- cmd: java -version
2122
- cmd: dir/w
2223
- git clone https://github.com/wing328/swagger-samples
2324
- ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"

bin/java-petstore-jersey2-java6.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,8 @@ ags="generate --artifact-id petstore-jersey2-java6 -i modules/openapi-generator/
3232
echo "Removing files and folders under samples/client/petstore/java/jersey2-java6/src/main"
3333
rm -rf samples/client/petstore/java/jersey2-java6/src/main
3434
find samples/client/petstore/java/jersey2-java6 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
35+
36+
echo "Restoring build.gradle ... "
37+
cp CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle samples/client/petstore/java/jersey2-java6/
38+
3539
java $JAVA_OPTS -jar $executable $ags

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,20 @@ if(hasProperty('target') && target == 'android') {
117117
}
118118

119119
ext {
120-
swagger_annotations_version = "1.5.17"
121-
jackson_version = "2.8.9"
120+
swagger_annotations_version = "1.5.20"
121+
jackson_version = "2.9.6"
122122
{{#supportJava6}}
123123
jersey_version = "2.6"
124124
commons_io_version=2.5
125125
commons_lang3_version=3.6
126126
{{/supportJava6}}
127127
{{^supportJava6}}
128-
jersey_version = "2.25.1"
128+
jersey_version = "2.27"
129129
{{/supportJava6}}
130130
junit_version = "4.12"
131+
{{#threetenbp}}
132+
threetenbp_version = "2.6.4"
133+
{{/threetenbp}}
131134
}
132135

133136
dependencies {
@@ -139,17 +142,17 @@ dependencies {
139142
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
140143
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
141144
{{#joda}}
142-
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version",
145+
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
143146
{{/joda}}
144147
{{#java8}}
145-
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version",
148+
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
146149
{{/java8}}
147150
{{#supportJava6}}
148151
compile "commons-io:commons-io:$commons_io_version"
149152
compile "org.apache.commons:commons-lang3:$commons_lang3_version"
150153
{{/supportJava6}}
151154
{{#threetenbp}}
152-
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version",
155+
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
153156
{{/threetenbp}}
154157
{{^java8}}
155158
compile "com.brsanthu:migbase64:2.2"

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ lazy val root = (project in file(".")).
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.5.17",
12+
"io.swagger" % "swagger-annotations" % "1.5.20",
1313
"org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
1414
"org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
1515
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
16-
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
16+
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9" % "compile",
18+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9" % "compile",
1919
{{#joda}}
2020
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9" % "compile",
2121
{{/joda}}

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<dependency>
277277
<groupId>com.github.joschi.jackson</groupId>
278278
<artifactId>jackson-datatype-threetenbp</artifactId>
279-
<version>${jackson-version}</version>
279+
<version>${threetenbp-version}</version>
280280
</dependency>
281281
{{/threetenbp}}
282282
{{^java8}}
@@ -318,16 +318,19 @@
318318
</dependencies>
319319
<properties>
320320
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
321-
<swagger-core-version>1.5.18</swagger-core-version>
321+
<swagger-core-version>1.5.20</swagger-core-version>
322322
{{^supportJava6}}
323-
<jersey-version>2.25.1</jersey-version>
323+
<jersey-version>2.27</jersey-version>
324324
{{/supportJava6}}
325325
{{#supportJava6}}
326-
<jersey-version>2.6</jersey-version>
327-
<commons_io_version>2.5</commons_io_version>
328-
<commons_lang3_version>3.6</commons_lang3_version>
326+
<jersey-version>2.6</jersey-version>
327+
<commons_io_version>2.5</commons_io_version>
328+
<commons_lang3_version>3.6</commons_lang3_version>
329329
{{/supportJava6}}
330-
<jackson-version>{{^threetenbp}}2.7.5{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
330+
<jackson-version>2.8.9</jackson-version>
331+
{{#threetenbp}}
332+
<threetenbp-version>2.6.4</threetenbp-version>
333+
{{/threetenbp}}
331334
<maven-plugin-version>1.0.0</maven-plugin-version>
332335
<junit-version>4.12</junit-version>
333336
</properties>

samples/client/petstore/java/jersey2-java6/build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ version = '1.0.0'
66

77
buildscript {
88
repositories {
9-
jcenter()
9+
jcenter {
10+
url "http://jcenter.bintray.com/"
11+
}
1012
}
1113
dependencies {
1214
classpath 'com.android.tools.build:gradle:2.3.+'
@@ -15,7 +17,9 @@ buildscript {
1517
}
1618

1719
repositories {
18-
jcenter()
20+
jcenter {
21+
url "http://jcenter.bintray.com/"
22+
}
1923
}
2024

2125

@@ -93,12 +97,13 @@ if(hasProperty('target') && target == 'android') {
9397
}
9498

9599
ext {
96-
swagger_annotations_version = "1.5.17"
97-
jackson_version = "2.8.9"
100+
swagger_annotations_version = "1.5.20"
101+
jackson_version = "2.9.6"
98102
jersey_version = "2.6"
99103
commons_io_version=2.5
100104
commons_lang3_version=3.6
101105
junit_version = "4.12"
106+
threetenbp_version = "2.6.4"
102107
}
103108

104109
dependencies {
@@ -111,7 +116,7 @@ dependencies {
111116
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
112117
compile "commons-io:commons-io:$commons_io_version"
113118
compile "org.apache.commons:commons-lang3:$commons_lang3_version"
114-
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version",
119+
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
115120
compile "com.brsanthu:migbase64:2.2"
116121
testCompile "junit:junit:$junit_version"
117122
}

samples/client/petstore/java/jersey2-java6/build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ lazy val root = (project in file(".")).
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.5.17",
12+
"io.swagger" % "swagger-annotations" % "1.5.20",
1313
"org.glassfish.jersey.core" % "jersey-client" % "2.6",
1414
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.6",
1515
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.6",
16-
"com.fasterxml.jackson.core" % "jackson-core" % "2.6.4" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.4" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.6.4" % "compile",
16+
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9" % "compile",
18+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9" % "compile",
1919
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
2020
"com.brsanthu" % "migbase64" % "2.2",
2121
"org.apache.commons" % "commons-lang3" % "3.6",

0 commit comments

Comments
 (0)