Skip to content

Commit d8bd1fd

Browse files
sonOfRasonOfRa
authored
Merge branch 'master' into spring-resource
2 parents f1892c8 + 81497c4 commit d8bd1fd

32 files changed

+96
-82
lines changed

‎pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>io.swagger.codegen.v3</groupId>
1414
<artifactId>swagger-codegen-generators</artifactId>
15-
<version>1.0.14-SNAPSHOT</version>
15+
<version>1.0.15-SNAPSHOT</version>
1616
<packaging>jar</packaging>
1717

1818
<build>
@@ -246,10 +246,10 @@
246246
</dependency>
247247
</dependencies>
248248
<properties>
249-
<swagger-codegen-version>3.0.14-SNAPSHOT</swagger-codegen-version>
250-
<swagger-parser-version>2.0.16-SNAPSHOT</swagger-parser-version>
251-
<swagger-core-version>2.0.10</swagger-core-version>
252-
<jackson-version>2.9.10</jackson-version>
249+
<swagger-codegen-version>3.0.15-SNAPSHOT</swagger-codegen-version>
250+
<swagger-parser-version>2.0.17-SNAPSHOT</swagger-parser-version>
251+
<swagger-core-version>2.1.1-SNAPSHOT</swagger-core-version>
252+
<jackson-version>2.10.1</jackson-version>
253253
<scala-version>2.11.1</scala-version>
254254
<felix-version>3.3.0</felix-version>
255255
<commons-io-version>2.4</commons-io-version>

‎src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2223,7 +2223,7 @@ public int compare(CodegenParameter one, CodegenParameter another) {
22232223
codegenOperation.pathParams = addHasMore(pathParams);
22242224
codegenOperation.queryParams = addHasMore(queryParams);
22252225
codegenOperation.headerParams = addHasMore(headerParams);
2226-
// op.cookieParams = cookieParams;
2226+
codegenOperation.cookieParams = addHasMore(cookieParams);
22272227
codegenOperation.formParams = addHasMore(formParams);
22282228
codegenOperation.requiredParams = addHasMore(requiredParams);
22292229
codegenOperation.externalDocs = operation.getExternalDocs();

‎src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public JavaClientCodegen() {
8383
cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
8484
cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));
8585

86-
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.9.10. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
87-
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.9.10");
88-
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.10");
86+
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.10.1. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
87+
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.10.1");
88+
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.26. JSON processing: Jackson 2.10.1");
8989
supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
9090
supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
9191
supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.8.0. JSON processing: Gson 2.6.1 (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");

‎src/main/resources/handlebars/Java/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ ext {
112112
{{^useOas2}}
113113
swagger_annotations_version = "2.0.0"
114114
{{/useOas2}}
115-
jackson_version = "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
115+
jackson_version = "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
116116
jersey_version = "1.19.4"
117117
jodatime_version = "2.9.9"
118118
junit_version = "4.12"

‎src/main/resources/handlebars/Java/libraries/feign/build.gradle.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ ext {
106106
{{^useOas2}}
107107
swagger_annotations_version = "2.0.0"
108108
{{/useOas2}}
109-
jackson_version = "2.9.10"
109+
jackson_version = "2.10.1"
110110
{{#threetenbp}}
111111
threepane_version = "2.6.4"
112112
{{/threetenbp}}

‎src/main/resources/handlebars/Java/libraries/feign/build.sbt.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ lazy val root = (project in file(".")).
1919
"com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
2020
"com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
2121
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
22-
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
23-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
24-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
25-
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.10" % "compile",
22+
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile",
23+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
24+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile",
25+
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.10.1" % "compile",
2626
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2" % "compile",
2727
"com.brsanthu" % "migbase64" % "2.2" % "compile",
2828
"junit" % "junit" % "4.12" % "test",

‎src/main/resources/handlebars/Java/libraries/feign/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
{{/useOas2}}
291291
<feign-version>9.4.0</feign-version>
292292
<feign-form-version>2.1.0</feign-form-version>
293-
<jackson-version>2.9.10</jackson-version>
293+
<jackson-version>2.10.1</jackson-version>
294294
{{#threetenbp}}
295295
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
296296
{{/threetenbp}}

‎src/main/resources/handlebars/Java/libraries/jersey2/build.gradle.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ ext {
111111
{{^useOas2}}
112112
swagger_annotations_version = "2.0.0"
113113
{{/useOas2}}
114-
jackson_version = "2.9.10"
115-
jersey_version = "2.25.1"
114+
jackson_version = "2.10.1"
115+
jersey_version = "2.26"
116116
{{#supportJava6}}
117117
commons_io_version=2.5
118118
commons_lang3_version=3.6

‎src/main/resources/handlebars/Java/libraries/jersey2/build.sbt.mustache

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@ lazy val root = (project in file(".")).
1515
{{^useOas2}}
1616
"io.swagger.core.v3" % "swagger-annotations" % "2.0.0",
1717
{{/useOas2}}
18-
"org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
19-
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
20-
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
21-
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
22-
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
23-
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
18+
"org.glassfish.jersey.core" % "jersey-client" % "2.29.1",
19+
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.29.1",
20+
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.29.1",
21+
"org.glassfish.jersey.inject" % "jersey-hk2" % "2.29.1",
22+
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
23+
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
24+
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
2425
{{#joda}}
25-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
26+
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.10.1" % "compile",
2627
{{/joda}}
2728
{{#java8}}
28-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
29+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1" % "compile",
2930
{{/java8}}
3031
{{#threetenbp}}
3132
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",

‎src/main/resources/handlebars/Java/libraries/jersey2/pom.mustache

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@
214214
<artifactId>jersey-media-json-jackson</artifactId>
215215
<version>${jersey-version}</version>
216216
</dependency>
217+
<dependency>
218+
<groupId>org.glassfish.jersey.inject</groupId>
219+
<artifactId>jersey-hk2</artifactId>
220+
<version>${jersey-version}</version>
221+
</dependency>
217222

218223
<!-- JSON processing: jackson -->
219224
<dependency>
@@ -307,14 +312,14 @@
307312
<swagger-core-version>2.0.0</swagger-core-version>
308313
{{/useOas2}}
309314
{{^supportJava6}}
310-
<jersey-version>2.25.1</jersey-version>
315+
<jersey-version>2.29.1</jersey-version>
311316
{{/supportJava6}}
312317
{{#supportJava6}}
313318
<jersey-version>2.6</jersey-version>
314319
<commons_io_version>2.5</commons_io_version>
315320
<commons_lang3_version>3.6</commons_lang3_version>
316321
{{/supportJava6}}
317-
<jackson-version>{{^threetenbp}}2.9.10{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
322+
<jackson-version>{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
318323
<maven-plugin-version>1.0.0</maven-plugin-version>
319324
<junit-version>4.12</junit-version>
320325
</properties>

0 commit comments

Comments
 (0)