Skip to content

Commit f7dbdd0

Browse files
authored
Merge pull request #11881 from swagger-api/update-jackson-dependency-build-gradle
updated jackson depdency in java samples
2 parents cc8f817 + 9c7674a commit f7dbdd0

File tree

297 files changed

+5946
-1505
lines changed

Some content is hidden

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

297 files changed

+5946
-1505
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.35-SNAPSHOT
1+
3.0.36-SNAPSHOT

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,17 @@ if(hasProperty('target') && target == 'android') {
9696
ext {
9797
swagger_annotations_version = "2.0.0"
9898
jackson_version = "2.10.1"
99-
feign_version = "9.4.0"
100-
feign_form_version = "2.1.0"
99+
feign_version = "11.6"
100+
feign_form_version = "3.8.0"
101101
junit_version = "4.12"
102102
oltu_version = "1.0.2"
103103
}
104104

105105
dependencies {
106106
compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
107-
compile "com.netflix.feign:feign-core:$feign_version"
108-
compile "com.netflix.feign:feign-jackson:$feign_version"
109-
compile "com.netflix.feign:feign-slf4j:$feign_version"
107+
compile "io.github.openfeign:feign-core:$feign_version"
108+
compile "io.github.openfeign:feign-jackson:$feign_version"
109+
compile "io.github.openfeign:feign-slf4j:$feign_version"
110110
compile "io.github.openfeign.form:feign-form:$feign_form_version"
111111
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
112112
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.35-SNAPSHOT
1+
3.0.36-SNAPSHOT

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

Lines changed: 2 additions & 2 deletions
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.6.4"
98+
jackson_version = "2.10.1"
9999
jersey_version = "1.19.4"
100100
jodatime_version = "2.9.9"
101101
junit_version = "4.12"
@@ -109,7 +109,7 @@ dependencies {
109109
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
110110
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
111111
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
112-
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
112+
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:2.6.4"
113113
compile "com.brsanthu:migbase64:2.2"
114114
testCompile "junit:junit:$junit_version"
115115
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.35-SNAPSHOT
1+
3.0.36-SNAPSHOT

samples/client/petstore/java/resteasy/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.7.5"
97+
jackson_version = "2.10.1"
9898
jersey_version = "2.22.2"
9999
jodatime_version = "2.9.4"
100100
junit_version = "4.12"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164

165165
<dependency>
166166
<groupId>org.jboss.resteasy</groupId>
167-
<artifactId>resteasy-jackson-provider</artifactId>
167+
<artifactId>resteasy-jackson2-provider</artifactId>
168168
<version>3.1.3.Final</version>
169169
</dependency>
170170
<dependency>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.35-SNAPSHOT
1+
3.0.36-SNAPSHOT

samples/client/petstore/java/resttemplate-withXml/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.8.9"
98+
jackson_version = "2.10.1"
9999
spring_web_version = "4.3.9.RELEASE"
100100
jodatime_version = "2.9.9"
101101
junit_version = "4.12"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.35-SNAPSHOT
1+
3.0.36-SNAPSHOT

0 commit comments

Comments
 (0)