Skip to content

Commit 25a6696

Browse files
ishaigorishaigor
authored
Merge branch 'master' into master
2 parents 0081482 + 2b134ac commit 25a6696

186 files changed

Lines changed: 2810 additions & 3971 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bin/spring-all-pestore.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
./bin/spring-delegate-j8.sh
66
./bin/spring-stubs.sh
77
./bin/spring-mvc-petstore-j8-async-server.sh
8-
./bin/springboot-petstore-server.sh
8+
./bin/spring-mvc-petstore-j8-localdatetime.sh
99
./bin/spring-mvc-petstore-server.sh
10+
./bin/springboot-petstore-server.sh
1011
./bin/springboot-petstore-server-beanvalidation.sh
1112
./bin/springboot-petstore-server-implicitHeaders.sh
1213
./bin/springboot-petstore-server-useOptional.sh

‎bin/typescript-angular-v5-petstore-with-npm.1.sh‎

100644100755
File mode changed.

‎bin/typescript-angular-v6-petstore-with-npm.sh‎

100644100755
File mode changed.

‎modules/swagger-codegen-maven-plugin/examples/java-client.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<properties>
121121
<swagger-annotations-version>1.5.21</swagger-annotations-version>
122122
<jersey-version>2.25.1</jersey-version>
123-
<jackson-version>2.9.5</jackson-version>
123+
<jackson-version>2.9.9</jackson-version>
124124
<jodatime-version>2.7</jodatime-version>
125125
<maven-plugin-version>1.0.0</maven-plugin-version>
126126
<junit-version>4.8.1</junit-version>

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ public JavaClientCodegen() {
7474
cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
7575
cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));
7676

77-
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.8.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
78-
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.8.9");
79-
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.9");
77+
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.9.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
78+
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.9.9");
79+
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.9");
8080
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'.");
8181
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.");
8282
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)");
83-
supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.8.9");
84-
supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.8.9");
85-
supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.8.9");
86-
supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.8.9");
83+
supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.9.9");
84+
supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.9.9");
85+
supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.9.9");
86+
supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.9.9");
8787
supportedLibraries.put("rest-assured", "HTTP client: rest-assured : 3.1.0. JSON processing: Gson 2.6.1. Only for Java8");
8888

8989
CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ private void addNpmPackageGeneration(SemVer ngVersion) {
175175
// Libraries generated with v2.x of ng-packagr will ship with AoT metadata in v4, which is intended for Angular v5 (and Angular v6).
176176
additionalProperties.put("useOldNgPackagr", !ngVersion.atLeast("5.0.0"));
177177

178+
additionalProperties.put("supportedNgVersion", ngVersion.atLeast("6.0.0"));
179+
178180
//Files for building our lib
179181
supportingFiles.add(new SupportingFile("package.mustache", getIndexDirectory(), "package.json"));
180182
supportingFiles.add(new SupportingFile("typings.mustache", getIndexDirectory(), "typings.json"));

‎modules/swagger-codegen/src/main/resources/Groovy/build.gradle.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repositories {
2424

2525
ext {
2626
swagger_annotations_version = "1.5.8"
27-
jackson_version = "2.7.0"
27+
jackson_version = "2.9.9"
2828
}
2929

3030
dependencies {

‎modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ if(hasProperty('target') && target == 'android') {
121121

122122
ext {
123123
swagger_annotations_version = "1.5.17"
124-
jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
124+
jackson_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
125125
jersey_version = "1.19.4"
126126
jodatime_version = "2.9.9"
127127
junit_version = "4.12"

‎modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ if(hasProperty('target') && target == 'android') {
101101

102102
ext {
103103
swagger_annotations_version = "1.5.9"
104-
jackson_version = "2.8.7"
104+
jackson_version = "2.9.9"
105105
{{#threetenbp}}
106106
threepane_version = "2.6.4"
107107
{{/threetenbp}}

‎modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ lazy val root = (project in file(".")).
1414
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
1515
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
1616
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.7" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.7" % "compile",
19-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.7" % "compile",
20-
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.8.7" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
18+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
19+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
20+
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.9" % "compile",
2121
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
2222
"com.brsanthu" % "migbase64" % "2.2" % "compile",
2323
"junit" % "junit" % "4.12" % "test",

0 commit comments

Comments
 (0)