Skip to content

Commit 0c19479

Browse files
chore: update dependencies (#12599)
1 parent ca584f3 commit 0c19479

File tree

54 files changed

+61
-230
lines changed

Some content is hidden

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

54 files changed

+61
-230
lines changed

modules/swagger-codegen/src/test/resources/3_0_0/issue-605/sertemplate/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
</repository>
217217
</repositories>
218218
<properties>
219-
<swagger-core-version>2.0.9</swagger-core-version>
219+
<swagger-core-version>2.2.35</swagger-core-version>
220220
<jetty-version>9.3.27.v20190418</jetty-version>
221221
<resteasy-version>3.0.11.Final</resteasy-version>
222222
<slf4j-version>1.6.3</slf4j-version>

modules/swagger-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
<java.security.policy>grantall.policy</java.security.policy>
336336
<maven-plugin-version>1.0.0</maven-plugin-version>
337337
<jetty-version>9.4.57.v20241219</jetty-version>
338-
<inflector-version>2.0.12</inflector-version>
338+
<inflector-version>2.0.14</inflector-version>
339339
<junit-version>4.13.2</junit-version>
340340
<servlet-api.version>3.1.0</servlet-api.version>
341341
<JETTY_TEST_HTTP_PORT>8080</JETTY_TEST_HTTP_PORT>

pom.docker.xml

Lines changed: 4 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -57,54 +57,13 @@
5757
<plugin>
5858
<groupId>net.revelc.code</groupId>
5959
<artifactId>formatter-maven-plugin</artifactId>
60-
<!-- Uncomment this to format before checkstyle -->
61-
<!-- <executions>
62-
<execution>
63-
<id>format</id>
64-
<phase>validate</phase>
65-
<goals>
66-
<goal>format</goal>
67-
</goals>
68-
</execution>
69-
</executions> -->
7060
<configuration>
7161
<compilerSource>1.8</compilerSource>
7262
<compilerCompliance>1.8</compilerCompliance>
7363
<compilerTargetPlatform>1.8</compilerTargetPlatform>
7464
<lineEnding>LF</lineEnding>
7565
</configuration>
7666
</plugin>
77-
<!--<plugin>
78-
<groupId>org.apache.maven.plugins</groupId>
79-
<artifactId>maven-checkstyle-plugin</artifactId>
80-
<version>2.17</version>
81-
<executions>
82-
<execution>
83-
<id>validate</id>
84-
<phase>validate</phase>
85-
<configuration>
86-
<configLocation>google_checkstyle.xml</configLocation>
87-
Don't include generated sources a la http://stackoverflow.com/a/30406454
88-
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
89-
<encoding>UTF-8</encoding>
90-
<consoleOutput>true</consoleOutput>
91-
<failsOnError>true</failsOnError>
92-
<linkXRef>false</linkXRef>
93-
<skip>true</skip>
94-
</configuration>
95-
<goals>
96-
<goal>check</goal>
97-
</goals>
98-
</execution>
99-
</executions>
100-
<dependencies>
101-
<dependency>
102-
<groupId>com.puppycrawl.tools</groupId>
103-
<artifactId>checkstyle</artifactId>
104-
<version>6.19</version>
105-
</dependency>
106-
</dependencies>
107-
</plugin>-->
10867
<plugin>
10968
<groupId>org.apache.maven.plugins</groupId>
11069
<artifactId>maven-surefire-plugin</artifactId>
@@ -845,30 +804,6 @@
845804
<value>samples</value>
846805
</property>
847806
</activation>
848-
<modules>
849-
<!-- <module>samples/server/petstore/erlang-server</module> note: make sample compilation work -->
850-
<!-- clients -->
851-
<!--<module>samples/client/petstore/php/SwaggerClient-php</module>-->
852-
<!--<module>samples/client/petstore/ruby</module>-->
853-
<!--<module>samples/client/petstore/scala</module>-->
854-
<!--<module>samples/client/petstore/akka-scala</module>-->
855-
<!--<module>samples/client/petstore/javascript</module>-->
856-
<!--<module>samples/client/petstore/python</module>-->
857-
<!--<module>samples/client/petstore/python-tornado</module>-->
858-
<!--<module>samples/client/petstore/typescript-fetch/builds/default</module>-->
859-
<!--<module>samples/client/petstore/typescript-fetch/builds/es6-target</module>-->
860-
<!--<module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>-->
861-
<!--<module>samples/client/petstore/typescript-fetch/tests/default</module>-->
862-
<!--<module>samples/client/petstore/typescript-node/npm</module>-->
863-
<!-- comment out due to github rate limit error
864-
<module>samples/client/petstore/typescript-angularjs</module>-->
865-
<!-- comment out due to error `npm run build`
866-
<module>samples/client/petstore/typescript-jquery/npm</module>-->
867-
<!--<module>samples/client/petstore/typescript-angular-v2/npm</module>-->
868-
<!--<module>samples/client/petstore/typescript-angular-v4/npm</module>-->
869-
<!--<module>samples/client/petstore/typescript-angular-v4.3/npm</module>-->
870-
<!--<module>samples/client/petstore/bash</module>-->
871-
</modules>
872807
</profile>
873808
</profiles>
874809
<modules>
@@ -1108,19 +1043,19 @@
11081043
<properties>
11091044
<maven.compiler.release>8</maven.compiler.release>
11101045
<swagger-codegen-generators-version>1.0.58-SNAPSHOT</swagger-codegen-generators-version>
1111-
<swagger-core-version>2.2.28</swagger-core-version>
1046+
<swagger-core-version>2.2.35</swagger-core-version>
11121047
<swagger-core-version-v1>1.6.15</swagger-core-version-v1>
11131048
<swagger-parser-version>2.1.25</swagger-parser-version>
11141049
<swagger-parser-version-v1>1.0.73</swagger-parser-version-v1>
11151050
<jackson-version>2.18.2</jackson-version>
11161051
<jackson-databind-version>2.18.2</jackson-databind-version>
11171052
<scala-version>2.11.1</scala-version>
11181053
<felix-version>3.3.0</felix-version>
1119-
<commons-io-version>2.18.0</commons-io-version>
1054+
<commons-io-version>2.20.0</commons-io-version>
11201055
<commons-cli-version>1.9.0</commons-cli-version>
11211056
<junit-version>4.13.2</junit-version>
11221057
<maven-plugin-version>1.0.0</maven-plugin-version>
1123-
<commons-lang-version>3.17.0</commons-lang-version>
1058+
<commons-lang-version>3.18.0</commons-lang-version>
11241059
<slf4j-version>2.0.9</slf4j-version>
11251060
<logback-version>1.5.16</logback-version>
11261061
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
@@ -1130,7 +1065,7 @@
11301065
<jmockit-version>1.49</jmockit-version>
11311066
<reflections-version>0.10.2</reflections-version>
11321067
<mockito-version>5.15.2</mockito-version>
1133-
<snakeyaml-version>2.3</snakeyaml-version>
1068+
<snakeyaml-version>2.5</snakeyaml-version>
11341069
<handlebars-version>4.3.1</handlebars-version>
11351070
<httpclient-version>4.5.14</httpclient-version>
11361071
<jersey-version>2.46</jersey-version>

pom.xml

Lines changed: 5 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -57,54 +57,13 @@
5757
<plugin>
5858
<groupId>net.revelc.code</groupId>
5959
<artifactId>formatter-maven-plugin</artifactId>
60-
<!-- Uncomment this to format before checkstyle -->
61-
<!-- <executions>
62-
<execution>
63-
<id>format</id>
64-
<phase>validate</phase>
65-
<goals>
66-
<goal>format</goal>
67-
</goals>
68-
</execution>
69-
</executions> -->
7060
<configuration>
7161
<compilerSource>1.8</compilerSource>
7262
<compilerCompliance>1.8</compilerCompliance>
7363
<compilerTargetPlatform>1.8</compilerTargetPlatform>
7464
<lineEnding>LF</lineEnding>
7565
</configuration>
7666
</plugin>
77-
<!--<plugin>
78-
<groupId>org.apache.maven.plugins</groupId>
79-
<artifactId>maven-checkstyle-plugin</artifactId>
80-
<version>2.17</version>
81-
<executions>
82-
<execution>
83-
<id>validate</id>
84-
<phase>validate</phase>
85-
<configuration>
86-
<configLocation>google_checkstyle.xml</configLocation>
87-
Don't include generated sources a la http://stackoverflow.com/a/30406454
88-
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
89-
<encoding>UTF-8</encoding>
90-
<consoleOutput>true</consoleOutput>
91-
<failsOnError>true</failsOnError>
92-
<linkXRef>false</linkXRef>
93-
<skip>true</skip>
94-
</configuration>
95-
<goals>
96-
<goal>check</goal>
97-
</goals>
98-
</execution>
99-
</executions>
100-
<dependencies>
101-
<dependency>
102-
<groupId>com.puppycrawl.tools</groupId>
103-
<artifactId>checkstyle</artifactId>
104-
<version>6.19</version>
105-
</dependency>
106-
</dependencies>
107-
</plugin>-->
10867
<plugin>
10968
<groupId>org.apache.maven.plugins</groupId>
11069
<artifactId>maven-surefire-plugin</artifactId>
@@ -894,80 +853,17 @@
894853
</property>
895854
</activation>
896855
<modules>
897-
<!-- clients -->
898-
<!-- test java-related projects -->
899-
<!--<module>samples/client/petstore/akka-scala</module>-->
900-
<!--<module>samples/client/petstore/scala</module>-->
901-
<!--<module>samples/client/petstore/scalaz</module>-->
902-
<!--<module>samples/client/petstore/clojure</module>-->
903856
<module>samples/client/petstore/java/feign</module>
904857
<module>samples/client/petstore/java/jersey1</module>
905858
<module>samples/client/petstore/java/jersey2</module>
906859
<module>samples/client/petstore/java/okhttp-gson</module>
907860
<module>samples/client/petstore/java/retrofit</module>
908861
<module>samples/client/petstore/java/retrofit2</module>
909862
<module>samples/client/petstore/java/retrofit2rx</module>
910-
<!--<module>samples/client/petstore/jaxrs-cxf-client</module>-->
911863
<module>samples/client/petstore/java/resttemplate</module>
912864
<module>samples/client/petstore/java/resttemplate-withXml</module>
913-
<!--<module>samples/client/petstore/java/vertx</module>-->
914865
<module>samples/client/petstore/java/resteasy</module>
915-
<!--<module>samples/client/petstore/java/google-api-client</module>-->
916-
<!--<module>samples/client/petstore/kotlin/</module>-->
917-
<!-- test non-java projects -->
918-
<!--<module>samples/client/petstore/go</module>-->
919-
<!-- servers -->
920-
<!--<module>samples/server/petstore/java-vertx/rx</module>-->
921-
<!--<module>samples/server/petstore/java-vertx/async</module>-->
922866
<module>samples/server/petstore/java-inflector</module>
923-
<!--<module>samples/server/petstore/java-pkmst</module>-->
924-
<!--<module>samples/server/petstore/java-play-framework</module>-->
925-
<!--<module>samples/server/petstore/undertow</module>-->
926-
<!--<module>samples/server/petstore/jaxrs/jersey1</module>-->
927-
<!--<module>samples/server/petstore/jaxrs/jersey2</module>-->
928-
<!--<module>samples/server/petstore/jaxrs/jersey1-useTags</module>-->
929-
<!--<module>samples/server/petstore/jaxrs/jersey2-useTags</module>-->
930-
<!--<module>samples/server/petstore/jaxrs-resteasy/default</module>-->
931-
<!--<module>samples/server/petstore/jaxrs-resteasy/eap</module>-->
932-
<!--<module>samples/server/petstore/jaxrs-resteasy/eap-joda</module>-->
933-
<!--<module>samples/server/petstore/jaxrs-resteasy/eap-java8</module>-->
934-
<!--<module>samples/server/petstore/jaxrs-resteasy/joda</module>-->
935-
<!--<module>samples/server/petstore/spring-mvc</module>-->
936-
<!--<module>samples/client/petstore/spring-cloud</module>-->
937-
<!--<module>samples/server/petstore/springboot</module>-->
938-
<!--<module>samples/server/petstore/springboot-beanvalidation</module>-->
939-
<!--<module>samples/server/petstore/springboot-useoptional</module>-->
940-
<!--<module>samples/server/petstore/jaxrs-cxf</module>-->
941-
<!--<module>samples/server/petstore/jaxrs-cxf-annotated-base-path</module>-->
942-
<!--<module>samples/server/petstore/jaxrs-cxf-cdi</module>-->
943-
<!--<module>samples/server/petstore/jaxrs-cxf-non-spring-app</module>-->
944-
<!--<module>samples/server/petstore/java-msf4j</module>-->
945-
<!--<module>samples/server/petstore/jaxrs-spec-interface</module>-->
946-
<!--<module>samples/server/petstore/scala-lagom-server</module>-->
947-
948-
949-
<!-- <module>samples/server/petstore/erlang-server</module> note: make sample compilation work -->
950-
<!-- clients -->
951-
<!--<module>samples/client/petstore/php/SwaggerClient-php</module>-->
952-
<!--<module>samples/client/petstore/ruby</module>-->
953-
<!--<module>samples/client/petstore/scala</module>-->
954-
<!--<module>samples/client/petstore/akka-scala</module>-->
955-
<!--<module>samples/client/petstore/javascript</module>-->
956-
<!--<module>samples/client/petstore/python</module>-->
957-
<!--<module>samples/client/petstore/python-tornado</module>-->
958-
<!--<module>samples/client/petstore/typescript-fetch/builds/default</module>-->
959-
<!--<module>samples/client/petstore/typescript-fetch/builds/es6-target</module>-->
960-
<!--<module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>-->
961-
<!--<module>samples/client/petstore/typescript-fetch/tests/default</module>-->
962-
<!--<module>samples/client/petstore/typescript-node/npm</module>-->
963-
<!-- comment out due to github rate limit error
964-
<module>samples/client/petstore/typescript-angularjs</module>-->
965-
<!-- comment out due to error `npm run build`
966-
<module>samples/client/petstore/typescript-jquery/npm</module>-->
967-
<!--<module>samples/client/petstore/typescript-angular-v2/npm</module>-->
968-
<!--<module>samples/client/petstore/typescript-angular-v4/npm</module>-->
969-
<!--<module>samples/client/petstore/typescript-angular-v4.3/npm</module>-->
970-
<!--<module>samples/client/petstore/bash</module>-->
971867
</modules>
972868
</profile>
973869
</profiles>
@@ -1209,19 +1105,19 @@
12091105
<properties>
12101106
<maven.compiler.release>8</maven.compiler.release>
12111107
<swagger-codegen-generators-version>1.0.58-SNAPSHOT</swagger-codegen-generators-version>
1212-
<swagger-core-version>2.2.28</swagger-core-version>
1108+
<swagger-core-version>2.2.35</swagger-core-version>
12131109
<swagger-core-version-v1>1.6.15</swagger-core-version-v1>
1214-
<swagger-parser-version>2.1.25</swagger-parser-version>
1110+
<swagger-parser-version>2.1.32</swagger-parser-version>
12151111
<swagger-parser-version-v1>1.0.73</swagger-parser-version-v1>
12161112
<jackson-version>2.18.2</jackson-version>
12171113
<jackson-databind-version>2.18.2</jackson-databind-version>
12181114
<scala-version>2.11.1</scala-version>
12191115
<felix-version>3.3.0</felix-version>
1220-
<commons-io-version>2.18.0</commons-io-version>
1116+
<commons-io-version>2.20.0</commons-io-version>
12211117
<commons-cli-version>1.9.0</commons-cli-version>
12221118
<junit-version>4.13.2</junit-version>
12231119
<maven-plugin-version>1.0.0</maven-plugin-version>
1224-
<commons-lang-version>3.17.0</commons-lang-version>
1120+
<commons-lang-version>3.18.0</commons-lang-version>
12251121
<slf4j-version>2.0.9</slf4j-version>
12261122
<logback-version>1.5.16</logback-version>
12271123
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
@@ -1231,7 +1127,7 @@
12311127
<jmockit-version>1.49</jmockit-version>
12321128
<reflections-version>0.10.2</reflections-version>
12331129
<mockito-version>5.15.2</mockito-version>
1234-
<snakeyaml-version>2.3</snakeyaml-version>
1130+
<snakeyaml-version>2.5</snakeyaml-version>
12351131
<handlebars-version>4.3.1</handlebars-version>
12361132
<httpclient-version>4.5.14</httpclient-version>
12371133
<jersey-version>2.46</jersey-version>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
<java.version>1.8</java.version>
248248
<maven.compiler.source>${java.version}</maven.compiler.source>
249249
<maven.compiler.target>${java.version}</maven.compiler.target>
250-
<swagger-core-version>2.0.0</swagger-core-version>
250+
<swagger-core-version>2.2.35</swagger-core-version>
251251
<feign-version>11.6</feign-version>
252252
<feign-form-version>3.8.0</feign-form-version>
253253
<jackson-version>2.10.1</jackson-version>

samples/client/petstore/java/jersey2-java8/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
</dependency>
236236
</dependencies>
237237
<properties>
238-
<swagger-core-version>2.0.0</swagger-core-version>
238+
<swagger-core-version>2.2.35</swagger-core-version>
239239
<jersey-version>2.29.1</jersey-version>
240240
<jackson-version>2.10.1</jackson-version>
241241
<maven-plugin-version>1.0.0</maven-plugin-version>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
</dependency>
236236
</dependencies>
237237
<properties>
238-
<swagger-core-version>2.0.0</swagger-core-version>
238+
<swagger-core-version>2.2.35</swagger-core-version>
239239
<jersey-version>2.29.1</jersey-version>
240240
<jackson-version>2.10.1</jackson-version>
241241
<maven-plugin-version>1.0.0</maven-plugin-version>

samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
<java.version>1.7</java.version>
219219
<maven.compiler.source>${java.version}</maven.compiler.source>
220220
<maven.compiler.target>${java.version}</maven.compiler.target>
221-
<swagger-core-version>2.0.0</swagger-core-version>
221+
<swagger-core-version>2.2.35</swagger-core-version>
222222
<okhttp-version>2.7.5</okhttp-version>
223223
<gson-version>2.8.1</gson-version>
224224
<gson-fire-version>1.8.3</gson-fire-version>

samples/client/petstore/java/okhttp-gson/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
<java.version>1.7</java.version>
212212
<maven.compiler.source>${java.version}</maven.compiler.source>
213213
<maven.compiler.target>${java.version}</maven.compiler.target>
214-
<swagger-core-version>2.0.0</swagger-core-version>
214+
<swagger-core-version>2.2.35</swagger-core-version>
215215
<okhttp-version>2.7.5</okhttp-version>
216216
<gson-version>2.8.1</gson-version>
217217
<gson-fire-version>1.8.3</gson-fire-version>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
</dependency>
187187
</dependencies>
188188
<properties>
189-
<swagger-core-version>2.0.0</swagger-core-version>
189+
<swagger-core-version>2.2.35</swagger-core-version>
190190
<resteasy-version>3.1.3.Final</resteasy-version>
191191
<jackson-version>2.6.4</jackson-version>
192192
<jodatime-version>2.9.9</jodatime-version>

0 commit comments

Comments
 (0)