Skip to content

Commit aa1f65d

Browse files
HugoMarioHugoMario
authored
Merge pull request #10044 from kibertoad/chore/dependencies
Update dependencies and samples
2 parents 3935dc6 + 557c731 commit aa1f65d

File tree

86 files changed

+165
-165
lines changed

Some content is hidden

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

86 files changed

+165
-165
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ if(hasProperty('target') && target == 'android') {
120120
}
121121

122122
ext {
123-
swagger_annotations_version = "1.5.17"
123+
swagger_annotations_version = "1.5.24"
124124
jackson_version = "{{^threetenbp}}2.10.1{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
125125
jersey_version = "1.19.4"
126-
jodatime_version = "2.9.9"
126+
jodatime_version = "2.10.5"
127127
junit_version = "4.12"
128128
}
129129

‎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
@@ -294,7 +294,7 @@
294294
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
295295
<maven.compiler.source>${java.version}</maven.compiler.source>
296296
<maven.compiler.target>${java.version}</maven.compiler.target>
297-
<swagger-core-version>1.5.18</swagger-core-version>
297+
<swagger-core-version>1.5.24</swagger-core-version>
298298
<feign-version>9.4.0</feign-version>
299299
<feign-form-version>2.1.0</feign-form-version>
300300
<jackson-version>2.10.1</jackson-version>

‎modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ if(hasProperty('target') && target == 'android') {
106106
}
107107

108108
ext {
109-
swagger_annotations_version = "1.5.17"
109+
swagger_annotations_version = "1.5.24"
110110
jackson_version = "2.10.1"
111111
google_api_client_version = "1.23.0"
112112
jersey_common_version = "2.29.1"
113-
jodatime_version = "2.9.9"
113+
jodatime_version = "2.10.5"
114114
junit_version = "4.12"
115115
{{#threetenbp}}
116116
jackson_threeten_version = "2.6.4"

‎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
@@ -288,7 +288,7 @@
288288
<jersey-common-version>2.29.1</jersey-common-version>
289289
<jackson-version>2.10.1</jackson-version>
290290
{{#joda}}
291-
<jodatime-version>2.9.9</jodatime-version>
291+
<jodatime-version>2.10.5</jodatime-version>
292292
{{/joda}}
293293
{{#threetenbp}}
294294
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>

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

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

107107
ext {
108-
swagger_annotations_version = "1.5.17"
108+
swagger_annotations_version = "1.5.24"
109109
jackson_version = "2.10.1"
110110
{{#supportJava6}}
111111
jersey_version = "2.6"

‎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
@@ -318,7 +318,7 @@
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.24</swagger-core-version>
322322
{{^supportJava6}}
323323
<jersey-version>2.29.1</jersey-version>
324324
{{/supportJava6}}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ lazy val root = (project in file(".")).
1414
"com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
1515
"com.google.code.gson" % "gson" % "2.8.1",
1616
{{#joda}}
17-
"joda-time" % "joda-time" % "2.9.9" % "compile",
17+
"joda-time" % "joda-time" % "2.10.5" % "compile",
1818
{{/joda}}
1919
{{#threetenbp}}
20-
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
20+
"org.threeten" % "threetenbp" % "1.4.1" % "compile",
2121
{{/threetenbp}}
22-
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
22+
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
2323
"junit" % "junit" % "4.12" % "test",
2424
"com.novocode" % "junit-interface" % "0.10" % "test"
2525
)

‎modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,15 +277,15 @@
277277
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
278278
<maven.compiler.source>${java.version}</maven.compiler.source>
279279
<maven.compiler.target>${java.version}</maven.compiler.target>
280-
<gson-fire-version>1.8.0</gson-fire-version>
281-
<swagger-core-version>1.5.18</swagger-core-version>
280+
<gson-fire-version>1.8.3</gson-fire-version>
281+
<swagger-core-version>1.5.24</swagger-core-version>
282282
<okhttp-version>2.7.5</okhttp-version>
283283
<gson-version>2.8.1</gson-version>
284284
{{#joda}}
285-
<jodatime-version>2.9.9</jodatime-version>
285+
<jodatime-version>2.10.5</jodatime-version>
286286
{{/joda}}
287287
{{#threetenbp}}
288-
<threetenbp-version>1.3.5</threetenbp-version>
288+
<threetenbp-version>1.4.1</threetenbp-version>
289289
{{/threetenbp}}
290290
<maven-plugin-version>1.0.0</maven-plugin-version>
291291
<junit-version>4.13.1</junit-version>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ ext {
100100
gson_version = "2.6.1"
101101
gson_fire_version = "1.8.2"
102102
{{#joda}}
103-
jodatime_version = "2.9.9"
103+
jodatime_version = "2.10.5"
104104
{{/joda}}
105105
{{#threetenbp}}
106-
threetenbp_version = "1.3.5"
106+
threetenbp_version = "1.4.1"
107107
{{/threetenbp}}
108108
okio_version = "1.13.0"
109109
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ lazy val root = (project in file(".")).
1414
"com.google.code.gson" % "gson" % "2.6.1",
1515
"io.gsonfire" % "gson-fire" % "1.8.2" % "compile",
1616
{{#joda}}
17-
"joda-time" % "joda-time" % "2.9.9" % "compile",
17+
"joda-time" % "joda-time" % "2.10.5" % "compile",
1818
{{/joda}}
1919
{{#threetenbp}}
20-
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
20+
"org.threeten" % "threetenbp" % "1.4.1" % "compile",
2121
{{/threetenbp}}
2222
"com.squareup.okio" % "okio" % "1.13.0" % "compile",
2323
"junit" % "junit" % "4.12" % "test",

0 commit comments

Comments
 (0)