Skip to content

Commit e734db7

Browse files
HugoMarioHugoMario
authored
Merge branch '3.0.0' into unused_samples_removing
2 parents a4ec053 + 69cd3bb commit e734db7

File tree

22 files changed

+47
-47
lines changed

22 files changed

+47
-47
lines changed

‎pom.docker.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,11 +1071,11 @@
10711071
</repositories>
10721072
<properties>
10731073
<swagger-codegen-generators-version>1.0.12-SNAPSHOT</swagger-codegen-generators-version>
1074-
<swagger-core-version>2.0.9</swagger-core-version>
1074+
<swagger-core-version>2.0.10-SNAPSHOT</swagger-core-version>
10751075
<swagger-core-version-v1>1.5.23</swagger-core-version-v1>
10761076
<swagger-parser-version>2.0.15-SNAPSHOT</swagger-parser-version>
10771077
<swagger-parser-version-v1>1.0.46</swagger-parser-version-v1>
1078-
<jackson-version>2.9.9</jackson-version>
1078+
<jackson-version>2.9.10</jackson-version>
10791079
<scala-version>2.11.1</scala-version>
10801080
<felix-version>3.3.0</felix-version>
10811081
<commons-io-version>2.4</commons-io-version>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,11 +1162,11 @@
11621162
</repositories>
11631163
<properties>
11641164
<swagger-codegen-generators-version>1.0.12-SNAPSHOT</swagger-codegen-generators-version>
1165-
<swagger-core-version>2.0.9</swagger-core-version>
1165+
<swagger-core-version>2.0.10-SNAPSHOT</swagger-core-version>
11661166
<swagger-core-version-v1>1.5.23</swagger-core-version-v1>
11671167
<swagger-parser-version>2.0.15-SNAPSHOT</swagger-parser-version>
11681168
<swagger-parser-version-v1>1.0.46</swagger-parser-version-v1>
1169-
<jackson-version>2.9.9</jackson-version>
1169+
<jackson-version>2.9.10</jackson-version>
11701170
<scala-version>2.11.1</scala-version>
11711171
<felix-version>3.3.0</felix-version>
11721172
<commons-io-version>2.4</commons-io-version>

‎pom.xml.bash‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,11 +1059,11 @@
10591059
</repositories>
10601060
<properties>
10611061
<swagger-codegen-generators-version>1.0.12-SNAPSHOT</swagger-codegen-generators-version>
1062-
<swagger-core-version>2.0.9</swagger-core-version>
1062+
<swagger-core-version>2.0.10-SNAPSHOT</swagger-core-version>
10631063
<swagger-core-version-v1>1.5.23</swagger-core-version-v1>
10641064
<swagger-parser-version>2.0.15-SNAPSHOT</swagger-parser-version>
10651065
<swagger-parser-version-v1>1.0.46</swagger-parser-version-v1>
1066-
<jackson-version>2.9.9</jackson-version>
1066+
<jackson-version>2.9.10</jackson-version>
10671067
<scala-version>2.11.1</scala-version>
10681068
<felix-version>3.3.0</felix-version>
10691069
<commons-io-version>2.4</commons-io-version>

‎pom.xml.shippable‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,11 +1061,11 @@
10611061
</repositories>
10621062
<properties>
10631063
<swagger-codegen-generators-version>1.0.12-SNAPSHOT</swagger-codegen-generators-version>
1064-
<swagger-core-version>2.0.9</swagger-core-version>
1064+
<swagger-core-version>2.0.10-SNAPSHOT</swagger-core-version>
10651065
<swagger-core-version-v1>1.5.23</swagger-core-version-v1>
10661066
<swagger-parser-version>2.0.15-SNAPSHOT</swagger-parser-version>
10671067
<swagger-parser-version-v1>1.0.46</swagger-parser-version-v1>
1068-
<jackson-version>2.9.9</jackson-version>
1068+
<jackson-version>2.9.10</jackson-version>
10691069
<scala-version>2.11.1</scala-version>
10701070
<felix-version>3.3.0</felix-version>
10711071
<commons-io-version>2.4</commons-io-version>

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

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

9696
ext {
9797
swagger_annotations_version = "2.0.0"
98-
jackson_version = "2.9.9"
98+
jackson_version = "2.9.10"
9999
threepane_version = "2.6.4"
100100
feign_version = "9.4.0"
101101
feign_form_version = "2.1.0"

‎samples/client/petstore/java/feign/build.sbt‎

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
"com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
1515
"com.netflix.feign" % "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.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-jsr310" % "2.9.9" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
18+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
19+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
20+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
2121
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2" % "compile",
2222
"com.brsanthu" % "migbase64" % "2.2" % "compile",
2323
"junit" % "junit" % "4.12" % "test",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<swagger-core-version>2.0.0</swagger-core-version>
256256
<feign-version>9.4.0</feign-version>
257257
<feign-form-version>2.1.0</feign-form-version>
258-
<jackson-version>2.9.9</jackson-version>
258+
<jackson-version>2.9.10</jackson-version>
259259
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
260260
<junit-version>4.12</junit-version>
261261
<maven-plugin-version>1.0.0</maven-plugin-version>

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

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

9595
ext {
9696
swagger_annotations_version = "2.0.0"
97-
jackson_version = "2.9.9"
97+
jackson_version = "2.9.10"
9898
jersey_version = "2.25.1"
9999
commons_io_version=2.5
100100
commons_lang3_version=3.6

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ lazy val root = (project in file(".")).
1313
"org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
1414
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
1515
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
16-
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
19-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile",
16+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
18+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
19+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
2020
"org.apache.commons" % "commons-lang3" % "3.6",
2121
"commons-io" % "commons-io" % "2.5",
2222
"junit" % "junit" % "4.12" % "test",

‎samples/client/petstore/java/jersey2-java6/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
<jersey-version>2.6</jersey-version>
245245
<commons_io_version>2.5</commons_io_version>
246246
<commons_lang3_version>3.6</commons_lang3_version>
247-
<jackson-version>2.9.9</jackson-version>
247+
<jackson-version>2.9.10</jackson-version>
248248
<maven-plugin-version>1.0.0</maven-plugin-version>
249249
<junit-version>4.12</junit-version>
250250
</properties>

0 commit comments

Comments
 (0)