Skip to content

Commit 812f9af

Browse files
committed
update fegin
1 parent 3a649a3 commit 812f9af

9 files changed

Lines changed: 15 additions & 9 deletions

File tree

modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ ext {
104104
swagger_annotations_version = "1.6.11"
105105
{{#jackson}}
106106
jackson_version = "2.21.1"
107+
jackson_annotations_version = "2.21"
107108
jackson_databind_version = "2.21.1"
108109
{{/jackson}}
109110
{{#openApiNullable}}
@@ -139,7 +140,7 @@ dependencies {
139140
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
140141
{{/joda}}
141142
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
142-
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
143+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
143144
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
144145
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
145146
{{/jackson}}

modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ lazy val root = (project in file(".")).
2525
{{/feign-hc5}}
2626
{{#jackson}}
2727
"com.fasterxml.jackson.core" % "jackson-core" % "2.21.1" % "compile",
28-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21.1" % "compile",
28+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21" % "compile",
2929
"com.fasterxml.jackson.core" % "jackson-databind" % "2.21.1" % "compile",
3030
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.21.1" % "compile",
3131
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.15.2" % "compile",

modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
<dependency>
291291
<groupId>com.fasterxml.jackson.core</groupId>
292292
<artifactId>jackson-annotations</artifactId>
293-
<version>${jackson-version}</version>
293+
<version>${jackson-annotations-version}</version>
294294
</dependency>
295295
<dependency>
296296
<groupId>com.fasterxml.jackson.core</groupId>
@@ -410,6 +410,7 @@
410410
<feign-form-version>3.8.0</feign-form-version>
411411
{{#jackson}}
412412
<jackson-version>2.21.1</jackson-version>
413+
<jackson-annotations-version>2.21</jackson-annotations-version>
413414
<jackson-databind-version>2.21.1</jackson-databind-version>
414415
{{/jackson}}
415416
{{#gson}}

samples/client/petstore/java/feign-no-nullable/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ test {
103103
ext {
104104
swagger_annotations_version = "1.6.11"
105105
jackson_version = "2.21.1"
106+
jackson_annotations_version = "2.21"
106107
jackson_databind_version = "2.21.1"
107108
jakarta_annotation_version = "1.3.5"
108109
feign_version = "13.5"
@@ -121,7 +122,7 @@ dependencies {
121122
implementation "io.github.openfeign:feign-okhttp:$feign_version"
122123
implementation "io.github.openfeign.form:feign-form:$feign_form_version"
123124
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
124-
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
125+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
125126
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
126127
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
127128
implementation "com.brsanthu:migbase64:2.2"

samples/client/petstore/java/feign-no-nullable/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ lazy val root = (project in file(".")).
1717
"io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile",
1818
"io.github.openfeign" % "feign-okhttp" % "13.5" % "compile",
1919
"com.fasterxml.jackson.core" % "jackson-core" % "2.21.1" % "compile",
20-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21.1" % "compile",
20+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21" % "compile",
2121
"com.fasterxml.jackson.core" % "jackson-databind" % "2.21.1" % "compile",
2222
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.21.1" % "compile",
2323
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.15.2" % "compile",

samples/client/petstore/java/feign-no-nullable/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<dependency>
256256
<groupId>com.fasterxml.jackson.core</groupId>
257257
<artifactId>jackson-annotations</artifactId>
258-
<version>${jackson-version}</version>
258+
<version>${jackson-annotations-version}</version>
259259
</dependency>
260260
<dependency>
261261
<groupId>com.fasterxml.jackson.core</groupId>
@@ -326,6 +326,7 @@
326326
<feign-version>13.2.1</feign-version>
327327
<feign-form-version>3.8.0</feign-form-version>
328328
<jackson-version>2.21.1</jackson-version>
329+
<jackson-annotations-version>2.21</jackson-annotations-version>
329330
<jackson-databind-version>2.21.1</jackson-databind-version>
330331
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
331332
<beanvalidation-version>2.0.2</beanvalidation-version>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ test {
103103
ext {
104104
swagger_annotations_version = "1.6.11"
105105
jackson_version = "2.21.1"
106+
jackson_annotations_version = "2.21"
106107
jackson_databind_version = "2.21.1"
107108
jackson_databind_nullable_version = "0.2.9"
108109
jakarta_annotation_version = "1.3.5"
@@ -121,7 +122,7 @@ dependencies {
121122
implementation "io.github.openfeign:feign-okhttp:$feign_version"
122123
implementation "io.github.openfeign.form:feign-form:$feign_form_version"
123124
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
124-
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
125+
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version"
125126
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
126127
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
127128
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ lazy val root = (project in file(".")).
1717
"io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile",
1818
"io.github.openfeign" % "feign-okhttp" % "13.5" % "compile",
1919
"com.fasterxml.jackson.core" % "jackson-core" % "2.21.1" % "compile",
20-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21.1" % "compile",
20+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.21" % "compile",
2121
"com.fasterxml.jackson.core" % "jackson-databind" % "2.21.1" % "compile",
2222
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.21.1" % "compile",
2323
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.15.2" % "compile",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
<dependency>
251251
<groupId>com.fasterxml.jackson.core</groupId>
252252
<artifactId>jackson-annotations</artifactId>
253-
<version>${jackson-version}</version>
253+
<version>${jackson-annotations-version}</version>
254254
</dependency>
255255
<dependency>
256256
<groupId>com.fasterxml.jackson.core</groupId>
@@ -319,6 +319,7 @@
319319
<feign-version>13.2.1</feign-version>
320320
<feign-form-version>3.8.0</feign-form-version>
321321
<jackson-version>2.21.1</jackson-version>
322+
<jackson-annotations-version>2.21</jackson-annotations-version>
322323
<jackson-databind-version>2.21.1</jackson-databind-version>
323324
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
324325
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>

0 commit comments

Comments
 (0)