loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0

Browse Source
This commit is contained in:
wing328 2017-06-28 15:36:14 +08:00
commit cd0ec4ed71
14 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/jaxrs-cxf-petstore-server-annotated-base-path.sh
View File

@ -26,6 +26,6 @@ fi
# if you've executed sbt assembly previously it will use that instead. # if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-annotated-base-path -DhideGenerationTimestamp=true,useAnnotatedBasePath=true" ags="$@ generate --artifact-id swagger-cxf-annotated-basepath -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-annotated-base-path -DhideGenerationTimestamp=true,useAnnotatedBasePath=true"
java $JAVA_OPTS -jar $executable $ags java $JAVA_OPTS -jar $executable $ags

2
bin/jaxrs-cxf-petstore-server-non-spring-application.sh
View File

@ -26,6 +26,6 @@ fi
# if you've executed sbt assembly previously it will use that instead. # if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-non-spring-app -DhideGenerationTimestamp=true,generateNonSpringApplication=true" ags="$@ generate --artifact-id swagger-cxf-server-non-spring -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf-non-spring-app -DhideGenerationTimestamp=true,generateNonSpringApplication=true"
java $JAVA_OPTS -jar $executable $ags java $JAVA_OPTS -jar $executable $ags

2
modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
View File

@ -188,7 +188,7 @@
<beanvalidation-version>1.1.0.Final</beanvalidation-version> <beanvalidation-version>1.1.0.Final</beanvalidation-version>
{{/useBeanValidation}} {{/useBeanValidation}}
<cxf-version>3.1.11</cxf-version> <cxf-version>3.1.11</cxf-version>
<jackson-jaxrs-version>2.8.4</jackson-jaxrs-version> <jackson-jaxrs-version>2.8.9</jackson-jaxrs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
</project> </project>

2
modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
View File

@ -245,7 +245,7 @@
<spring.boot-version>1.3.3.RELEASE</spring.boot-version> <spring.boot-version>1.3.3.RELEASE</spring.boot-version>
{{/generateSpringBootApplication}} {{/generateSpringBootApplication}}
<cxf-version>3.1.11</cxf-version> <cxf-version>3.1.11</cxf-version>
<jackson-jaxrs-version>2.8.4</jackson-jaxrs-version> <jackson-jaxrs-version>2.8.9</jackson-jaxrs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
</project> </project>

2
modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache
View File

@ -273,7 +273,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<swagger-core-version>1.5.9</swagger-core-version> <swagger-core-version>1.5.15</swagger-core-version>
<jersey-version>2.22.2</jersey-version> <jersey-version>2.22.2</jersey-version>
<jackson-version>2.7.5</jackson-version> <jackson-version>2.7.5</jackson-version>
{{^java8}} {{^java8}}

2
pom.xml.circleci
View File

@ -897,7 +897,7 @@
</repository> </repository>
</repositories> </repositories>
<properties> <properties>
<swagger-parser-version>1.0.28</swagger-parser-version> <swagger-parser-version>1.0.30</swagger-parser-version>
<scala-version>2.11.1</scala-version> <scala-version>2.11.1</scala-version>
<felix-version>3.3.0</felix-version> <felix-version>3.3.0</felix-version>
<swagger-core-version>1.5.15</swagger-core-version> <swagger-core-version>1.5.15</swagger-core-version>

2
samples/client/petstore/java/feign/pom.xml
View File

@ -250,7 +250,7 @@
<swagger-core-version>1.5.15</swagger-core-version> <swagger-core-version>1.5.15</swagger-core-version>
<feign-version>9.4.0</feign-version> <feign-version>9.4.0</feign-version>
<feign-form-version>2.1.0</feign-form-version> <feign-form-version>2.1.0</feign-form-version>
<jackson-version>2.8.7</jackson-version> <jackson-version>2.8.9</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version> <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>

4
samples/server/petstore/java-inflector/pom.xml
View File

@ -119,11 +119,7 @@
</repositories> </repositories>
<properties> <properties>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<<<<<<< HEAD
<swagger-inflector-version>1.0.12</swagger-inflector-version>
=======
<swagger-inflector-version>1.0.14</swagger-inflector-version> <swagger-inflector-version>1.0.14</swagger-inflector-version>
>>>>>>> origin/master
<jetty-version>9.2.9.v20150224</jetty-version> <jetty-version>9.2.9.v20150224</jetty-version>
<logback-version>1.0.1</logback-version> <logback-version>1.0.1</logback-version>
<junit-version>4.8.2</junit-version> <junit-version>4.8.2</junit-version>

2
samples/server/petstore/jaxrs-cxf-annotated-base-path/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.2.3-SNAPSHOT 2.3.0-SNAPSHOT

23
samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
View File

@ -112,6 +112,13 @@
<version>${junit-version}</version> <version>${junit-version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${beanvalidation-version}</version>
<scope>provided</scope>
</dependency>
<!-- CXF Client --> <!-- CXF Client -->
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
@ -151,6 +158,18 @@
<version>${cxf-version}</version> <version>${cxf-version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-jaxrs-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-jaxrs-version}</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository> <repository>
@ -165,13 +184,15 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.10</swagger-core-version> <swagger-core-version>1.5.15</swagger-core-version>
<jetty-version>9.2.9.v20150224</jetty-version> <jetty-version>9.2.9.v20150224</jetty-version>
<jersey2-version>2.22.2</jersey2-version> <jersey2-version>2.22.2</jersey2-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<logback-version>1.1.7</logback-version> <logback-version>1.1.7</logback-version>
<servlet-api-version>2.5</servlet-api-version> <servlet-api-version>2.5</servlet-api-version>
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
<cxf-version>3.1.11</cxf-version> <cxf-version>3.1.11</cxf-version>
<jackson-jaxrs-version>2.8.9</jackson-jaxrs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
</project> </project>

2
samples/server/petstore/jaxrs-cxf-non-spring-app/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.2.3-SNAPSHOT 2.3.0-SNAPSHOT

25
samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
View File

@ -3,7 +3,7 @@
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-cxf-server-non-spring</artifactId> <artifactId>swagger-cxf-server-non-spring</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>swagger-cxf-non-spring</name> <name>swagger-cxf-server-non-spring</name>
<version>1.0.0</version> <version>1.0.0</version>
<build> <build>
<sourceDirectory>src/main/java</sourceDirectory> <sourceDirectory>src/main/java</sourceDirectory>
@ -112,6 +112,13 @@
<version>${junit-version}</version> <version>${junit-version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${beanvalidation-version}</version>
<scope>provided</scope>
</dependency>
<!-- CXF Client --> <!-- CXF Client -->
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
@ -151,6 +158,18 @@
<version>${cxf-version}</version> <version>${cxf-version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-jaxrs-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-jaxrs-version}</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository> <repository>
@ -165,13 +184,15 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.10</swagger-core-version> <swagger-core-version>1.5.15</swagger-core-version>
<jetty-version>9.2.9.v20150224</jetty-version> <jetty-version>9.2.9.v20150224</jetty-version>
<jersey2-version>2.22.2</jersey2-version> <jersey2-version>2.22.2</jersey2-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<logback-version>1.1.7</logback-version> <logback-version>1.1.7</logback-version>
<servlet-api-version>2.5</servlet-api-version> <servlet-api-version>2.5</servlet-api-version>
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
<cxf-version>3.1.11</cxf-version> <cxf-version>3.1.11</cxf-version>
<jackson-jaxrs-version>2.8.9</jackson-jaxrs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
</project> </project>

2
samples/server/petstore/jaxrs-resteasy/default/pom.xml
View File

@ -162,7 +162,7 @@
</repository> </repository>
</repositories> </repositories>
<properties> <properties>
<swagger-core-version>1.5.9</swagger-core-version> <swagger-core-version>1.5.15</swagger-core-version>
<jetty-version>9.2.9.v20150224</jetty-version> <jetty-version>9.2.9.v20150224</jetty-version>
<resteasy-version>3.0.11.Final</resteasy-version> <resteasy-version>3.0.11.Final</resteasy-version>
<slf4j-version>1.6.3</slf4j-version> <slf4j-version>1.6.3</slf4j-version>

2
samples/server/petstore/jaxrs-resteasy/joda/pom.xml
View File

@ -154,7 +154,7 @@
</repository> </repository>
</repositories> </repositories>
<properties> <properties>
<swagger-core-version>1.5.9</swagger-core-version> <swagger-core-version>1.5.15</swagger-core-version>
<jetty-version>9.2.9.v20150224</jetty-version> <jetty-version>9.2.9.v20150224</jetty-version>
<resteasy-version>3.0.11.Final</resteasy-version> <resteasy-version>3.0.11.Final</resteasy-version>
<slf4j-version>1.6.3</slf4j-version> <slf4j-version>1.6.3</slf4j-version>