Skip to content

Commit 45433a1

Browse files
oteichmannwing328
oteichmann
authored and
wing328
committed
Updated feign library to use latest version of OpenFeign and Jackson. (swagger-api#5114)
1 parent d7af53a commit 45433a1

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public JavaClientCodegen() {
6060
cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
6161

6262
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.1. JSON processing: Jackson 2.7.0. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
63-
supportedLibraries.put("feign", "HTTP client: Netflix Feign 8.16.0. JSON processing: Jackson 2.7.0");
63+
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.8.7");
6464
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.22.2. JSON processing: Jackson 2.7.0");
6565
supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.6.2. Enable Parcelable modles on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
6666
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.");

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') {
9595

9696
ext {
9797
swagger_annotations_version = "1.5.9"
98-
jackson_version = "2.7.5"
99-
feign_version = "8.17.0"
100-
feign_form_version = "2.0.2"
98+
jackson_version = "2.8.7"
99+
feign_version = "9.4.0"
100+
feign_form_version = "2.1.0"
101101
junit_version = "4.12"
102102
oltu_version = "1.0.1"
103103
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ lazy val root = (project in file(".")).
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
1212
"io.swagger" % "swagger-annotations" % "1.5.9" % "compile",
13-
"com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
14-
"com.netflix.feign" % "feign-jackson" % "8.17.0" % "compile",
15-
"com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
16-
"io.github.openfeign.form" % "feign-form" % "2.0.2" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile",
19-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
20-
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.7.5" % "compile",
13+
"com.netflix.feign" % "feign-core" % "9.4.0" % "compile",
14+
"com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
15+
"com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
16+
"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",
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",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,17 +176,17 @@
176176

177177
<!-- HTTP client: Netflix Feign -->
178178
<dependency>
179-
<groupId>com.netflix.feign</groupId>
179+
<groupId>io.github.openfeign</groupId>
180180
<artifactId>feign-core</artifactId>
181181
<version>${feign-version}</version>
182182
</dependency>
183183
<dependency>
184-
<groupId>com.netflix.feign</groupId>
184+
<groupId>io.github.openfeign</groupId>
185185
<artifactId>feign-jackson</artifactId>
186186
<version>${feign-version}</version>
187187
</dependency>
188188
<dependency>
189-
<groupId>com.netflix.feign</groupId>
189+
<groupId>io.github.openfeign</groupId>
190190
<artifactId>feign-slf4j</artifactId>
191191
<version>${feign-version}</version>
192192
</dependency>
@@ -236,9 +236,9 @@
236236
<maven.compiler.source>${java.version}</maven.compiler.source>
237237
<maven.compiler.target>${java.version}</maven.compiler.target>
238238
<swagger-core-version>1.5.12</swagger-core-version>
239-
<feign-version>8.17.0</feign-version>
240-
<feign-form-version>2.0.2</feign-form-version>
241-
<jackson-version>2.7.5</jackson-version>
239+
<feign-version>9.4.0</feign-version>
240+
<feign-form-version>2.1.0</feign-form-version>
241+
<jackson-version>2.8.7</jackson-version>
242242
<junit-version>4.12</junit-version>
243243
<maven-plugin-version>1.0.0</maven-plugin-version>
244244
<oltu-version>1.0.1</oltu-version>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') {
9595

9696
ext {
9797
swagger_annotations_version = "1.5.9"
98-
jackson_version = "2.7.5"
99-
feign_version = "8.17.0"
100-
feign_form_version = "2.0.2"
98+
jackson_version = "2.8.7"
99+
feign_version = "9.4.0"
100+
feign_form_version = "2.1.0"
101101
junit_version = "4.12"
102102
oltu_version = "1.0.1"
103103
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ lazy val root = (project in file(".")).
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
1212
"io.swagger" % "swagger-annotations" % "1.5.9" % "compile",
13-
"com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
14-
"com.netflix.feign" % "feign-jackson" % "8.17.0" % "compile",
15-
"com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
16-
"io.github.openfeign.form" % "feign-form" % "2.0.2" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile",
19-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
20-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5" % "compile",
13+
"com.netflix.feign" % "feign-core" % "9.4.0" % "compile",
14+
"com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
15+
"com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
16+
"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-joda" % "2.8.7" % "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",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,17 +176,17 @@
176176

177177
<!-- HTTP client: Netflix Feign -->
178178
<dependency>
179-
<groupId>com.netflix.feign</groupId>
179+
<groupId>io.github.openfeign</groupId>
180180
<artifactId>feign-core</artifactId>
181181
<version>${feign-version}</version>
182182
</dependency>
183183
<dependency>
184-
<groupId>com.netflix.feign</groupId>
184+
<groupId>io.github.openfeign</groupId>
185185
<artifactId>feign-jackson</artifactId>
186186
<version>${feign-version}</version>
187187
</dependency>
188188
<dependency>
189-
<groupId>com.netflix.feign</groupId>
189+
<groupId>io.github.openfeign</groupId>
190190
<artifactId>feign-slf4j</artifactId>
191191
<version>${feign-version}</version>
192192
</dependency>
@@ -236,9 +236,9 @@
236236
<maven.compiler.source>${java.version}</maven.compiler.source>
237237
<maven.compiler.target>${java.version}</maven.compiler.target>
238238
<swagger-core-version>1.5.12</swagger-core-version>
239-
<feign-version>8.17.0</feign-version>
240-
<feign-form-version>2.0.2</feign-form-version>
241-
<jackson-version>2.7.5</jackson-version>
239+
<feign-version>9.4.0</feign-version>
240+
<feign-form-version>2.1.0</feign-form-version>
241+
<jackson-version>2.8.7</jackson-version>
242242
<junit-version>4.12</junit-version>
243243
<maven-plugin-version>1.0.0</maven-plugin-version>
244244
<oltu-version>1.0.1</oltu-version>

0 commit comments

Comments
 (0)