Skip to content

Commit 1c18d1c

Browse files
authored
Merge pull request #12301 from swagger-api/jackson-databind-CVE-2019-14439
updated jackson dependency version to solve vulnerability warning
2 parents d249140 + bf68ee6 commit 1c18d1c

File tree

21 files changed

+20
-391
lines changed

21 files changed

+20
-391
lines changed

modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
<swagger-core-version>1.5.24</swagger-core-version>
322322
<feign-version>11.6</feign-version>
323323
<feign-form-version>3.8.0</feign-form-version>
324-
<jackson-version>2.11.4</jackson-version>
324+
<jackson-version>2.15.2</jackson-version>
325325
{{#threetenbp}}
326326
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
327327
{{/threetenbp}}

modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
<swagger-annotations-version>1.5.17</swagger-annotations-version>
287287
<google-api-client-version>1.23.0</google-api-client-version>
288288
<jersey-common-version>2.29.1</jersey-common-version>
289-
<jackson-version>2.11.4</jackson-version>
289+
<jackson-version>2.15.2</jackson-version>
290290
{{#joda}}
291291
<jodatime-version>2.10.5</jodatime-version>
292292
{{/joda}}

modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
<commons_io_version>2.5</commons_io_version>
346346
<commons_lang3_version>3.6</commons_lang3_version>
347347
{{/supportJava6}}
348-
<jackson-version>{{^threetenbp}}2.11.4{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
348+
<jackson-version>{{^threetenbp}}2.15.2{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
349349
<maven-plugin-version>1.0.0</maven-plugin-version>
350350
<junit-version>4.13.1</junit-version>
351351
</properties>

modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
258258
<swagger-core-version>1.5.24</swagger-core-version>
259259
<resteasy-version>3.1.3.Final</resteasy-version>
260-
<jackson-version>2.11.4</jackson-version>
260+
<jackson-version>2.15.2</jackson-version>
261261
<threetenbp-version>2.6.4</threetenbp-version>
262262
{{^java8}}
263263
<jodatime-version>2.10.5</jodatime-version>

modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
313313
<swagger-annotations-version>1.5.17</swagger-annotations-version>
314314
<spring-web-version>4.3.9.RELEASE</spring-web-version>
315-
<jackson-version>2.11.4</jackson-version>
315+
<jackson-version>2.15.2</jackson-version>
316316
{{#joda}}
317317
<jodatime-version>2.10.5</jodatime-version>
318318
{{/joda}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.22-SNAPSHOT
1+
2.4.38-SNAPSHOT

samples/client/petstore/java/feign/build.gradle

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

5050
dependencies {
51-
provided 'javax.annotation:jsr250-api:1.0'
51+
provided 'jakarta.annotation:jakarta.annotation-api:1.3.5'
5252
}
5353
}
5454

samples/client/petstore/java/feign/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<plugin>
138138
<groupId>org.apache.maven.plugins</groupId>
139139
<artifactId>maven-javadoc-plugin</artifactId>
140-
<version>2.10.4</version>
140+
<version>3.2.0</version>
141141
<executions>
142142
<execution>
143143
<id>attach-javadocs</id>
@@ -271,7 +271,7 @@
271271
<swagger-core-version>1.5.24</swagger-core-version>
272272
<feign-version>11.6</feign-version>
273273
<feign-form-version>3.8.0</feign-form-version>
274-
<jackson-version>2.11.4</jackson-version>
274+
<jackson-version>2.15.2</jackson-version>
275275
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
276276
<junit-version>4.13.1</junit-version>
277277
<maven-plugin-version>1.0.0</maven-plugin-version>

samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class ApiClient {
2626
public interface Api {}
2727

2828
protected ObjectMapper objectMapper;
29-
private String basePath = "https://petstore.swagger.io/v2";
29+
private String basePath = "http://petstore.swagger.io:80/v2";
3030
private Map<String, RequestInterceptor> apiAuthorizations;
3131
private Feign.Builder feignBuilder;
3232

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelList.java

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)