Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
</repository>
</repositories>
<properties>
<swagger-core-version>2.0.9</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<jetty-version>9.3.27.v20190418</jetty-version>
<resteasy-version>3.0.11.Final</resteasy-version>
<slf4j-version>1.6.3</slf4j-version>
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
<java.security.policy>grantall.policy</java.security.policy>
<maven-plugin-version>1.0.0</maven-plugin-version>
<jetty-version>9.4.57.v20241219</jetty-version>
<inflector-version>2.0.12</inflector-version>
<inflector-version>2.0.14</inflector-version>
<junit-version>4.13.2</junit-version>
<servlet-api.version>3.1.0</servlet-api.version>
<JETTY_TEST_HTTP_PORT>8080</JETTY_TEST_HTTP_PORT>
Expand Down
73 changes: 4 additions & 69 deletions pom.docker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,54 +57,13 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<!-- Uncomment this to format before checkstyle -->
<!-- <executions>
<execution>
<id>format</id>
<phase>validate</phase>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions> -->
<configuration>
<compilerSource>1.8</compilerSource>
<compilerCompliance>1.8</compilerCompliance>
<compilerTargetPlatform>1.8</compilerTargetPlatform>
<lineEnding>LF</lineEnding>
</configuration>
</plugin>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<configuration>
<configLocation>google_checkstyle.xml</configLocation>
Don't include generated sources a la http://stackoverflow.com/a/30406454
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
<skip>true</skip>
</configuration>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
</dependency>
</dependencies>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -845,30 +804,6 @@
<value>samples</value>
</property>
</activation>
<modules>
<!-- <module>samples/server/petstore/erlang-server</module> note: make sample compilation work -->
<!-- clients -->
<!--<module>samples/client/petstore/php/SwaggerClient-php</module>-->
<!--<module>samples/client/petstore/ruby</module>-->
<!--<module>samples/client/petstore/scala</module>-->
<!--<module>samples/client/petstore/akka-scala</module>-->
<!--<module>samples/client/petstore/javascript</module>-->
<!--<module>samples/client/petstore/python</module>-->
<!--<module>samples/client/petstore/python-tornado</module>-->
<!--<module>samples/client/petstore/typescript-fetch/builds/default</module>-->
<!--<module>samples/client/petstore/typescript-fetch/builds/es6-target</module>-->
<!--<module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>-->
<!--<module>samples/client/petstore/typescript-fetch/tests/default</module>-->
<!--<module>samples/client/petstore/typescript-node/npm</module>-->
<!-- comment out due to github rate limit error
<module>samples/client/petstore/typescript-angularjs</module>-->
<!-- comment out due to error `npm run build`
<module>samples/client/petstore/typescript-jquery/npm</module>-->
<!--<module>samples/client/petstore/typescript-angular-v2/npm</module>-->
<!--<module>samples/client/petstore/typescript-angular-v4/npm</module>-->
<!--<module>samples/client/petstore/typescript-angular-v4.3/npm</module>-->
<!--<module>samples/client/petstore/bash</module>-->
</modules>
</profile>
</profiles>
<modules>
Expand Down Expand Up @@ -1108,19 +1043,19 @@
<properties>
<maven.compiler.release>8</maven.compiler.release>
<swagger-codegen-generators-version>1.0.58-SNAPSHOT</swagger-codegen-generators-version>
<swagger-core-version>2.2.28</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<swagger-core-version-v1>1.6.15</swagger-core-version-v1>
<swagger-parser-version>2.1.25</swagger-parser-version>
<swagger-parser-version-v1>1.0.73</swagger-parser-version-v1>
<jackson-version>2.18.2</jackson-version>
<jackson-databind-version>2.18.2</jackson-databind-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<commons-io-version>2.18.0</commons-io-version>
<commons-io-version>2.20.0</commons-io-version>
<commons-cli-version>1.9.0</commons-cli-version>
<junit-version>4.13.2</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<commons-lang-version>3.17.0</commons-lang-version>
<commons-lang-version>3.18.0</commons-lang-version>
<slf4j-version>2.0.9</slf4j-version>
<logback-version>1.5.16</logback-version>
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
Expand All @@ -1130,7 +1065,7 @@
<jmockit-version>1.49</jmockit-version>
<reflections-version>0.10.2</reflections-version>
<mockito-version>5.15.2</mockito-version>
<snakeyaml-version>2.3</snakeyaml-version>
<snakeyaml-version>2.5</snakeyaml-version>
<handlebars-version>4.3.1</handlebars-version>
<httpclient-version>4.5.14</httpclient-version>
<jersey-version>2.46</jersey-version>
Expand Down
114 changes: 5 additions & 109 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,54 +57,13 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<!-- Uncomment this to format before checkstyle -->
<!-- <executions>
<execution>
<id>format</id>
<phase>validate</phase>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions> -->
<configuration>
<compilerSource>1.8</compilerSource>
<compilerCompliance>1.8</compilerCompliance>
<compilerTargetPlatform>1.8</compilerTargetPlatform>
<lineEnding>LF</lineEnding>
</configuration>
</plugin>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<configuration>
<configLocation>google_checkstyle.xml</configLocation>
Don't include generated sources a la http://stackoverflow.com/a/30406454
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
<skip>true</skip>
</configuration>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.19</version>
</dependency>
</dependencies>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -894,80 +853,17 @@
</property>
</activation>
<modules>
<!-- clients -->
<!-- test java-related projects -->
<!--<module>samples/client/petstore/akka-scala</module>-->
<!--<module>samples/client/petstore/scala</module>-->
<!--<module>samples/client/petstore/scalaz</module>-->
<!--<module>samples/client/petstore/clojure</module>-->
<module>samples/client/petstore/java/feign</module>
<module>samples/client/petstore/java/jersey1</module>
<module>samples/client/petstore/java/jersey2</module>
<module>samples/client/petstore/java/okhttp-gson</module>
<module>samples/client/petstore/java/retrofit</module>
<module>samples/client/petstore/java/retrofit2</module>
<module>samples/client/petstore/java/retrofit2rx</module>
<!--<module>samples/client/petstore/jaxrs-cxf-client</module>-->
<module>samples/client/petstore/java/resttemplate</module>
<module>samples/client/petstore/java/resttemplate-withXml</module>
<!--<module>samples/client/petstore/java/vertx</module>-->
<module>samples/client/petstore/java/resteasy</module>
<!--<module>samples/client/petstore/java/google-api-client</module>-->
<!--<module>samples/client/petstore/kotlin/</module>-->
<!-- test non-java projects -->
<!--<module>samples/client/petstore/go</module>-->
<!-- servers -->
<!--<module>samples/server/petstore/java-vertx/rx</module>-->
<!--<module>samples/server/petstore/java-vertx/async</module>-->
<module>samples/server/petstore/java-inflector</module>
<!--<module>samples/server/petstore/java-pkmst</module>-->
<!--<module>samples/server/petstore/java-play-framework</module>-->
<!--<module>samples/server/petstore/undertow</module>-->
<!--<module>samples/server/petstore/jaxrs/jersey1</module>-->
<!--<module>samples/server/petstore/jaxrs/jersey2</module>-->
<!--<module>samples/server/petstore/jaxrs/jersey1-useTags</module>-->
<!--<module>samples/server/petstore/jaxrs/jersey2-useTags</module>-->
<!--<module>samples/server/petstore/jaxrs-resteasy/default</module>-->
<!--<module>samples/server/petstore/jaxrs-resteasy/eap</module>-->
<!--<module>samples/server/petstore/jaxrs-resteasy/eap-joda</module>-->
<!--<module>samples/server/petstore/jaxrs-resteasy/eap-java8</module>-->
<!--<module>samples/server/petstore/jaxrs-resteasy/joda</module>-->
<!--<module>samples/server/petstore/spring-mvc</module>-->
<!--<module>samples/client/petstore/spring-cloud</module>-->
<!--<module>samples/server/petstore/springboot</module>-->
<!--<module>samples/server/petstore/springboot-beanvalidation</module>-->
<!--<module>samples/server/petstore/springboot-useoptional</module>-->
<!--<module>samples/server/petstore/jaxrs-cxf</module>-->
<!--<module>samples/server/petstore/jaxrs-cxf-annotated-base-path</module>-->
<!--<module>samples/server/petstore/jaxrs-cxf-cdi</module>-->
<!--<module>samples/server/petstore/jaxrs-cxf-non-spring-app</module>-->
<!--<module>samples/server/petstore/java-msf4j</module>-->
<!--<module>samples/server/petstore/jaxrs-spec-interface</module>-->
<!--<module>samples/server/petstore/scala-lagom-server</module>-->


<!-- <module>samples/server/petstore/erlang-server</module> note: make sample compilation work -->
<!-- clients -->
<!--<module>samples/client/petstore/php/SwaggerClient-php</module>-->
<!--<module>samples/client/petstore/ruby</module>-->
<!--<module>samples/client/petstore/scala</module>-->
<!--<module>samples/client/petstore/akka-scala</module>-->
<!--<module>samples/client/petstore/javascript</module>-->
<!--<module>samples/client/petstore/python</module>-->
<!--<module>samples/client/petstore/python-tornado</module>-->
<!--<module>samples/client/petstore/typescript-fetch/builds/default</module>-->
<!--<module>samples/client/petstore/typescript-fetch/builds/es6-target</module>-->
<!--<module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>-->
<!--<module>samples/client/petstore/typescript-fetch/tests/default</module>-->
<!--<module>samples/client/petstore/typescript-node/npm</module>-->
<!-- comment out due to github rate limit error
<module>samples/client/petstore/typescript-angularjs</module>-->
<!-- comment out due to error `npm run build`
<module>samples/client/petstore/typescript-jquery/npm</module>-->
<!--<module>samples/client/petstore/typescript-angular-v2/npm</module>-->
<!--<module>samples/client/petstore/typescript-angular-v4/npm</module>-->
<!--<module>samples/client/petstore/typescript-angular-v4.3/npm</module>-->
<!--<module>samples/client/petstore/bash</module>-->
</modules>
</profile>
</profiles>
Expand Down Expand Up @@ -1209,19 +1105,19 @@
<properties>
<maven.compiler.release>8</maven.compiler.release>
<swagger-codegen-generators-version>1.0.58-SNAPSHOT</swagger-codegen-generators-version>
<swagger-core-version>2.2.28</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<swagger-core-version-v1>1.6.15</swagger-core-version-v1>
<swagger-parser-version>2.1.25</swagger-parser-version>
<swagger-parser-version>2.1.32</swagger-parser-version>
<swagger-parser-version-v1>1.0.73</swagger-parser-version-v1>
<jackson-version>2.18.2</jackson-version>
<jackson-databind-version>2.18.2</jackson-databind-version>
<scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version>
<commons-io-version>2.18.0</commons-io-version>
<commons-io-version>2.20.0</commons-io-version>
<commons-cli-version>1.9.0</commons-cli-version>
<junit-version>4.13.2</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<commons-lang-version>3.17.0</commons-lang-version>
<commons-lang-version>3.18.0</commons-lang-version>
<slf4j-version>2.0.9</slf4j-version>
<logback-version>1.5.16</logback-version>
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
Expand All @@ -1231,7 +1127,7 @@
<jmockit-version>1.49</jmockit-version>
<reflections-version>0.10.2</reflections-version>
<mockito-version>5.15.2</mockito-version>
<snakeyaml-version>2.3</snakeyaml-version>
<snakeyaml-version>2.5</snakeyaml-version>
<handlebars-version>4.3.1</handlebars-version>
<httpclient-version>4.5.14</httpclient-version>
<jersey-version>2.46</jersey-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/feign/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>2.0.0</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<feign-version>11.6</feign-version>
<feign-form-version>3.8.0</feign-form-version>
<jackson-version>2.10.1</jackson-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey2-java8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
</dependency>
</dependencies>
<properties>
<swagger-core-version>2.0.0</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<jersey-version>2.29.1</jersey-version>
<jackson-version>2.10.1</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
</dependency>
</dependencies>
<properties>
<swagger-core-version>2.0.0</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<jersey-version>2.29.1</jersey-version>
<jackson-version>2.10.1</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
<java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>2.0.0</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<okhttp-version>2.7.5</okhttp-version>
<gson-version>2.8.1</gson-version>
<gson-fire-version>1.8.3</gson-fire-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/okhttp-gson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>2.0.0</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<okhttp-version>2.7.5</okhttp-version>
<gson-version>2.8.1</gson-version>
<gson-fire-version>1.8.3</gson-fire-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/resteasy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
</dependency>
</dependencies>
<properties>
<swagger-core-version>2.0.0</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<resteasy-version>3.1.3.Final</resteasy-version>
<jackson-version>2.6.4</jackson-version>
<jodatime-version>2.9.9</jodatime-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
</dependency>
</dependencies>
<properties>
<swagger-core-version>2.0.0</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<retrofit-version>1.9.0</retrofit-version>
<okhttp-version>2.7.5</okhttp-version>
<jodatime-version>2.9.9</jodatime-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2-play24/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>2.0.0</swagger-core-version>
<swagger-core-version>2.2.35</swagger-core-version>
<jackson-version>2.6.6</jackson-version>
<play-version>2.4.11</play-version>
<retrofit-version>2.3.0</retrofit-version>
Expand Down
Loading