Skip to content

Commit 1856302

Browse files
wing328michaelpro1
wing328
authored and
michaelpro1
committed
Update Java (feign) client dependency (OpenAPITools#6068)
* update feign dependency * update feign samples
1 parent 78db2a1 commit 1856302

File tree

9 files changed

+73
-25
lines changed

9 files changed

+73
-25
lines changed

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

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

121121
ext {
122-
swagger_annotations_version = "1.5.22"
122+
swagger_annotations_version = "1.5.24"
123123
jackson_version = "2.10.3"
124124
jackson_databind_version = "2.10.3"
125125
jackson_databind_nullable_version = "0.2.1"
126126
{{#threetenbp}}
127127
jackson_threetenbp_version = "2.9.10"
128128
{{/threetenbp}}
129-
feign_version = "{{#useFeign10}}10.7.4{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
129+
feign_version = "{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
130130
feign_form_version = "{{#useFeign10}}3.8.0{{/useFeign10}}{{^useFeign10}}2.1.0{{/useFeign10}}"
131131
junit_version = "4.13"
132132
oltu_version = "1.0.1"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ lazy val root = (project in file(".")).
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.5.22" % "compile",
13-
"io.github.openfeign" % "feign-core" % "{{#useFeign10}}10.7.4{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
14-
"io.github.openfeign" % "feign-jackson" % "{{#useFeign10}}10.7.4{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
15-
"io.github.openfeign" % "feign-slf4j" % "{{#useFeign10}}10.7.4{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
12+
"io.swagger" % "swagger-annotations" % "1.5.24" % "compile",
13+
"io.github.openfeign" % "feign-core" % "{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
14+
"io.github.openfeign" % "feign-jackson" % "{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
15+
"io.github.openfeign" % "feign-slf4j" % "{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
1616
"io.github.openfeign.form" % "feign-form" % "{{#useFeign10}}3.8.0{{/useFeign10}}{{^useFeign10}}2.1.0{{/useFeign10}}" % "compile",
1717
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
1818
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<plugin>
6464
<groupId>org.apache.maven.plugins</groupId>
6565
<artifactId>maven-surefire-plugin</artifactId>
66-
<version>2.12</version>
66+
<version>3.0.0-M4</version>
6767
<configuration>
6868
<systemProperties>
6969
<property>
@@ -73,7 +73,7 @@
7373
</systemProperties>
7474
<argLine>-Xms512m -Xmx1500m</argLine>
7575
<parallel>methods</parallel>
76-
<forkMode>pertest</forkMode>
76+
<threadCount>10</threadCount>
7777
</configuration>
7878
</plugin>
7979
<plugin>
@@ -139,6 +139,22 @@
139139
</execution>
140140
</executions>
141141
</plugin>
142+
<plugin>
143+
<groupId>org.apache.maven.plugins</groupId>
144+
<artifactId>maven-compiler-plugin</artifactId>
145+
<version>3.8.1</version>
146+
<configuration>
147+
<source>1.8</source>
148+
<target>1.8</target>
149+
<fork>true</fork>
150+
<meminitial>128m</meminitial>
151+
<maxmem>512m</maxmem>
152+
<compilerArgs>
153+
<arg>-Xlint:all</arg>
154+
<arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
155+
</compilerArgs>
156+
</configuration>
157+
</plugin>
142158
<plugin>
143159
<groupId>org.apache.maven.plugins</groupId>
144160
<artifactId>maven-javadoc-plugin</artifactId>
@@ -314,8 +330,8 @@
314330
<java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
315331
<maven.compiler.source>${java.version}</maven.compiler.source>
316332
<maven.compiler.target>${java.version}</maven.compiler.target>
317-
<swagger-annotations-version>1.5.21</swagger-annotations-version>
318-
<feign-version>{{#useFeign10}}10.7.4{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}</feign-version>
333+
<swagger-annotations-version>1.5.24</swagger-annotations-version>
334+
<feign-version>{{#useFeign10}}11.0{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}</feign-version>
319335
<feign-form-version>{{#useFeign10}}3.8.0{{/useFeign10}}{{^useFeign10}}2.1.0{{/useFeign10}}</feign-form-version>
320336
<jackson-version>2.10.3</jackson-version>
321337
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-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

9797
ext {
98-
swagger_annotations_version = "1.5.22"
98+
swagger_annotations_version = "1.5.24"
9999
jackson_version = "2.10.3"
100100
jackson_databind_version = "2.10.3"
101101
jackson_databind_nullable_version = "0.2.1"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ lazy val root = (project in file(".")).
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.5.22" % "compile",
12+
"io.swagger" % "swagger-annotations" % "1.5.24" % "compile",
1313
"io.github.openfeign" % "feign-core" % "9.7.0" % "compile",
1414
"io.github.openfeign" % "feign-jackson" % "9.7.0" % "compile",
1515
"io.github.openfeign" % "feign-slf4j" % "9.7.0" % "compile",

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<plugin>
5757
<groupId>org.apache.maven.plugins</groupId>
5858
<artifactId>maven-surefire-plugin</artifactId>
59-
<version>2.12</version>
59+
<version>3.0.0-M4</version>
6060
<configuration>
6161
<systemProperties>
6262
<property>
@@ -66,7 +66,7 @@
6666
</systemProperties>
6767
<argLine>-Xms512m -Xmx1500m</argLine>
6868
<parallel>methods</parallel>
69-
<forkMode>pertest</forkMode>
69+
<threadCount>10</threadCount>
7070
</configuration>
7171
</plugin>
7272
<plugin>
@@ -132,6 +132,22 @@
132132
</execution>
133133
</executions>
134134
</plugin>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-compiler-plugin</artifactId>
138+
<version>3.8.1</version>
139+
<configuration>
140+
<source>1.8</source>
141+
<target>1.8</target>
142+
<fork>true</fork>
143+
<meminitial>128m</meminitial>
144+
<maxmem>512m</maxmem>
145+
<compilerArgs>
146+
<arg>-Xlint:all</arg>
147+
<arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
148+
</compilerArgs>
149+
</configuration>
150+
</plugin>
135151
<plugin>
136152
<groupId>org.apache.maven.plugins</groupId>
137153
<artifactId>maven-javadoc-plugin</artifactId>
@@ -281,7 +297,7 @@
281297
<java.version>1.7</java.version>
282298
<maven.compiler.source>${java.version}</maven.compiler.source>
283299
<maven.compiler.target>${java.version}</maven.compiler.target>
284-
<swagger-annotations-version>1.5.21</swagger-annotations-version>
300+
<swagger-annotations-version>1.5.24</swagger-annotations-version>
285301
<feign-version>9.7.0</feign-version>
286302
<feign-form-version>2.1.0</feign-form-version>
287303
<jackson-version>2.10.3</jackson-version>

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

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

9797
ext {
98-
swagger_annotations_version = "1.5.22"
98+
swagger_annotations_version = "1.5.24"
9999
jackson_version = "2.10.3"
100100
jackson_databind_version = "2.10.3"
101101
jackson_databind_nullable_version = "0.2.1"
102102
jackson_threetenbp_version = "2.9.10"
103-
feign_version = "10.7.4"
103+
feign_version = "11.0"
104104
feign_form_version = "3.8.0"
105105
junit_version = "4.13"
106106
oltu_version = "1.0.1"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ lazy val root = (project in file(".")).
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.5.22" % "compile",
13-
"io.github.openfeign" % "feign-core" % "10.7.4" % "compile",
14-
"io.github.openfeign" % "feign-jackson" % "10.7.4" % "compile",
15-
"io.github.openfeign" % "feign-slf4j" % "10.7.4" % "compile",
12+
"io.swagger" % "swagger-annotations" % "1.5.24" % "compile",
13+
"io.github.openfeign" % "feign-core" % "11.0" % "compile",
14+
"io.github.openfeign" % "feign-jackson" % "11.0" % "compile",
15+
"io.github.openfeign" % "feign-slf4j" % "11.0" % "compile",
1616
"io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile",
1717
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
1818
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<plugin>
5757
<groupId>org.apache.maven.plugins</groupId>
5858
<artifactId>maven-surefire-plugin</artifactId>
59-
<version>2.12</version>
59+
<version>3.0.0-M4</version>
6060
<configuration>
6161
<systemProperties>
6262
<property>
@@ -66,7 +66,7 @@
6666
</systemProperties>
6767
<argLine>-Xms512m -Xmx1500m</argLine>
6868
<parallel>methods</parallel>
69-
<forkMode>pertest</forkMode>
69+
<threadCount>10</threadCount>
7070
</configuration>
7171
</plugin>
7272
<plugin>
@@ -132,6 +132,22 @@
132132
</execution>
133133
</executions>
134134
</plugin>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-compiler-plugin</artifactId>
138+
<version>3.8.1</version>
139+
<configuration>
140+
<source>1.8</source>
141+
<target>1.8</target>
142+
<fork>true</fork>
143+
<meminitial>128m</meminitial>
144+
<maxmem>512m</maxmem>
145+
<compilerArgs>
146+
<arg>-Xlint:all</arg>
147+
<arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
148+
</compilerArgs>
149+
</configuration>
150+
</plugin>
135151
<plugin>
136152
<groupId>org.apache.maven.plugins</groupId>
137153
<artifactId>maven-javadoc-plugin</artifactId>
@@ -281,8 +297,8 @@
281297
<java.version>1.7</java.version>
282298
<maven.compiler.source>${java.version}</maven.compiler.source>
283299
<maven.compiler.target>${java.version}</maven.compiler.target>
284-
<swagger-annotations-version>1.5.21</swagger-annotations-version>
285-
<feign-version>10.7.4</feign-version>
300+
<swagger-annotations-version>1.5.24</swagger-annotations-version>
301+
<feign-version>11.0</feign-version>
286302
<feign-form-version>3.8.0</feign-form-version>
287303
<jackson-version>2.10.3</jackson-version>
288304
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>

0 commit comments

Comments
 (0)