Permalink
Browse files

Various updates (#419)

* various updates

* update pom.xml

* update ci config with new location

* Change "swagger-codegen" to "openapi-generator" in a comment

* fix pom.xml for bash client

* minor fix to github ID

* fix pom for ios
  • Loading branch information...
wing328 committed May 11, 2018
1 parent e5be838 commit 7d75c66180f21c146529a08dab701a87e8931e82
Showing with 66 additions and 228 deletions.
  1. +18 −48 { → CI}/pom.xml.bash
  2. +3 −27 { → CI}/pom.xml.circleci
  3. +1 −31 { → CI}/pom.xml.circleci.java7
  4. +16 −46 { → CI}/pom.xml.ios
  5. +1 −25 { → CI}/pom.xml.shippable
  6. 0 { → CI}/samples.ci/client/petstore/kotlin-string/pom.xml
  7. 0 { → CI}/samples.ci/client/petstore/kotlin-threetenbp/pom.xml
  8. 0 { → CI}/samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml
  9. 0 { → CI}/samples.ci/server/petstore/java-play-framework-controller-only/pom.xml
  10. 0 { → CI}/samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml
  11. 0 { → CI}/samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml
  12. 0 { → CI}/samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml
  13. 0 { → CI}/samples.ci/server/petstore/java-play-framework-no-interface/pom.xml
  14. 0 { → CI}/samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml
  15. 0 { → CI}/samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml
  16. 0 { → CI}/samples.ci/server/petstore/java-play-framework/pom.xml
  17. 0 { → CI}/samples.ci/server/petstore/kotlin-server/ktor/pom.xml
  18. +1 −1 CODE_OF_CONDUCT.md
  19. +1 −1 CONTRIBUTING.md
  20. +1 −1 Vagrantfile
  21. +1 −1 bin/java-play-framework-petstore-server-api-package-override.sh
  22. +1 −1 bin/java-play-framework-petstore-server-controller-only.sh
  23. +1 −1 bin/java-play-framework-petstore-server-fake-endpoints.sh
  24. +1 −1 bin/java-play-framework-petstore-server-no-bean-validation.sh
  25. +1 −1 bin/java-play-framework-petstore-server-no-exception-handling.sh
  26. +1 −1 bin/java-play-framework-petstore-server-no-interface.sh
  27. +1 −1 bin/java-play-framework-petstore-server-no-swagger-ui.sh
  28. +1 −1 bin/java-play-framework-petstore-server-no-wrap-calls.sh
  29. +1 −1 bin/java-play-framework-petstore-server.sh
  30. +1 −1 bin/kotlin-client-string.sh
  31. +1 −1 bin/kotlin-client-threetenbp.sh
  32. +1 −1 bin/kotlin-server-petstore.sh
  33. +4 −4 circle.yml
  34. +1 −1 modules/openapi-generator-online/pom.xml
  35. +6 −30 pom.xml
  36. +1 −1 shippable.yml
@@ -5,16 +5,16 @@
<version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId>
<artifactId>swagger-codegen-project</artifactId>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId>
<packaging>pom</packaging>
<name>swagger-codegen-project</name>
<version>2.4.0-SNAPSHOT</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<name>openapi-generator-project</name>
<version>3.0.0-SNAPSHOT</version>
<url>https://github.com/openapi-tools/openapi-generator</url>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
<connection>scm:git:git@github.com:openapi-tools/openapi-generator.git</connection>
<developerConnection>scm:git:git@github.com:openapi-tools/openapi-generator.git</developerConnection>
<url>https://github.com/openapi-tools/openapi-generator</url>
</scm>
<developers>
<!-- original author of the project -->
@@ -58,14 +58,8 @@
</developers>
<issueManagement>
<system>github</system>
<url>https://github.com/swagger-api/swagger-codegen/issues</url>
<url>https://github.com/openapi-tools/openapi-generator/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>swagger-swaggersocket</name>
<archive>https://groups.google.com/forum/#!forum/swagger-swaggersocket</archive>
</mailingList>
</mailingLists>
<licenses>
<license>
<name>Apache License 2.0</name>
@@ -117,7 +111,7 @@
<lineEnding>LF</lineEnding>
</configuration>
</plugin>
<plugin>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
@@ -127,7 +121,7 @@
<phase>validate</phase>
<configuration>
<configLocation>google_checkstyle.xml</configLocation>
<!-- Don't include generated sources a la http://stackoverflow.com/a/30406454 -->
Don't include generated sources a la http://stackoverflow.com/a/30406454
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
@@ -146,7 +140,7 @@
<version>6.19</version>
</dependency>
</dependencies>
</plugin>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -201,7 +195,7 @@
<mode>development</mode>
<url>${project.url}</url>
<implementation-version>${project.version}</implementation-version>
<package>io.swagger</package>
<package>org.openapi-tools</package>
</manifestEntries>
</archive>
</configuration>
@@ -544,30 +538,6 @@
<module>samples/client/petstore/scala</module>
</modules>
</profile>
<profile>
<id>objc-client</id>
<activation>
<property>
<name>env</name>
<value>objc</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>swift-client</id>
<activation>
<property>
<name>env</name>
<value>swift</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>java-msf4j-server</id>
<activation>
@@ -882,10 +852,10 @@
</profile>
</profiles>
<modules>
<module>modules/swagger-codegen</module>
<module>modules/swagger-codegen-cli</module>
<module>modules/swagger-codegen-maven-plugin</module>
<module>modules/swagger-generator</module>
<module>modules/openapi-generator</module>
<module>modules/openapi-generator-cli</module>
<module>modules/openapi-generator-maven-plugin</module>
<module>modules/openapi-generator-online</module>
</modules>
<reporting>
<outputDirectory>target/site</outputDirectory>
@@ -961,7 +931,7 @@
<commons-lang-version>3.4</commons-lang-version>
<slf4j-version>1.7.12</slf4j-version>
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
<jmustache-version>1.12</jmustache-version>
<jmustache-version>1.14</jmustache-version>
<testng-version>6.9.6</testng-version>
<surefire-version>2.19.1</surefire-version>
<jmockit-version>1.25</jmockit-version>
@@ -9,7 +9,7 @@
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId>
<packaging>pom</packaging>
<name>openapi-genearator-project</name>
<name>openapi-generator-project</name>
<version>3.0.0-SNAPSHOT</version>
<url>https://github.com/openapitools/openapi-generator</url>
<scm>
@@ -199,7 +199,7 @@
<mode>development</mode>
<url>${project.url}</url>
<implementation-version>${project.version}</implementation-version>
<package>io.swagger</package>
<package>org.openapitools</package>
</manifestEntries>
</archive>
</configuration>
@@ -498,30 +498,6 @@
<module>samples/client/petstore/scala</module>
</modules>
</profile>
<profile>
<id>objc-client</id>
<activation>
<property>
<name>env</name>
<value>objc</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>swift-client</id>
<activation>
<property>
<name>env</name>
<value>swift</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>java-msf4j-server</id>
<activation>
@@ -1004,7 +980,7 @@
<commons-lang-version>3.4</commons-lang-version>
<slf4j-version>1.7.12</slf4j-version>
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
<jmustache-version>1.12</jmustache-version>
<jmustache-version>1.14</jmustache-version>
<testng-version>6.9.6</testng-version>
<surefire-version>2.19.1</surefire-version>
<jmockit-version>1.25</jmockit-version>
@@ -64,12 +64,6 @@
<system>github</system>
<url>https://github.com/openapitools/openapi-generator/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>swagger-swaggersocket</name>
<archive>https://groups.google.com/forum/#!forum/swagger-swaggersocket</archive>
</mailingList>
</mailingLists>
<licenses>
<license>
<name>Apache License 2.0</name>
@@ -205,7 +199,7 @@
<mode>development</mode>
<url>${project.url}</url>
<implementation-version>${project.version}</implementation-version>
<package>io.swagger</package>
<package>org.openapitools</package>
</manifestEntries>
</archive>
</configuration>
@@ -504,30 +498,6 @@
<module>samples/client/petstore/scala</module>
</modules>
</profile>
<profile>
<id>objc-client</id>
<activation>
<property>
<name>env</name>
<value>objc</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>swift-client</id>
<activation>
<property>
<name>env</name>
<value>swift</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>java-msf4j-server</id>
<activation>
@@ -5,16 +5,16 @@
<version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId>
<artifactId>swagger-codegen-project</artifactId>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId>
<packaging>pom</packaging>
<name>swagger-codegen-project</name>
<version>2.4.0-SNAPSHOT</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<name>openapi-generator-project</name>
<version>3.0.0-SNAPSHOT</version>
<url>https://github.com/openapitools/openapi-generator</url>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
<connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
<developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
<url>https://github.com/openapitools/openapi-generator</url>
</scm>
<developers>
<!-- original author of the project -->
@@ -58,14 +58,8 @@
</developers>
<issueManagement>
<system>github</system>
<url>https://github.com/swagger-api/swagger-codegen/issues</url>
<url>https://github.com/openapitools/openapi-generator/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>swagger-swaggersocket</name>
<archive>https://groups.google.com/forum/#!forum/swagger-swaggersocket</archive>
</mailingList>
</mailingLists>
<licenses>
<license>
<name>Apache License 2.0</name>
@@ -201,7 +195,7 @@
<mode>development</mode>
<url>${project.url}</url>
<implementation-version>${project.version}</implementation-version>
<package>io.swagger</package>
<package>org.openapitools</package>
</manifestEntries>
</archive>
</configuration>
@@ -544,30 +538,6 @@
<module>samples/client/petstore/scala</module>
</modules>
</profile>
<profile>
<id>objc-client</id>
<activation>
<property>
<name>env</name>
<value>objc</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>swift-client</id>
<activation>
<property>
<name>env</name>
<value>swift</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>java-msf4j-server</id>
<activation>
@@ -885,15 +855,15 @@
<module>samples/client/petstore/swift/rxswift/SwaggerClientTests</module>
<!-- comment out objc tests as it's timing out
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
<module>samples/client/petstore/objc/core-data/SwaggerClientTests</module>-->
<module>samples/client/petstore/objc/core-data/SwaggerClientTests</module>-->
</modules>
</profile>
</profiles>
<modules>
<module>modules/swagger-codegen</module>
<module>modules/swagger-codegen-cli</module>
<module>modules/swagger-codegen-maven-plugin</module>
<module>modules/swagger-generator</module>
<module>modules/openapi-generator</module>
<module>modules/openapi-generator-cli</module>
<module>modules/openapi-generator-maven-plugin</module>
<module>modules/openapi-generator-online</module>
</modules>
<reporting>
<outputDirectory>target/site</outputDirectory>
@@ -969,7 +939,7 @@
<commons-lang-version>3.4</commons-lang-version>
<slf4j-version>1.7.12</slf4j-version>
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
<jmustache-version>1.12</jmustache-version>
<jmustache-version>1.14</jmustache-version>
<testng-version>6.9.6</testng-version>
<surefire-version>2.19.1</surefire-version>
<jmockit-version>1.25</jmockit-version>
@@ -195,7 +195,7 @@
<mode>development</mode>
<url>${project.url}</url>
<implementation-version>${project.version}</implementation-version>
<package>io.swagger</package>
<package>org.openapitools</package>
</manifestEntries>
</archive>
</configuration>
@@ -538,30 +538,6 @@
<module>samples/client/petstore/scala</module>
</modules>
</profile>
<profile>
<id>objc-client</id>
<activation>
<property>
<name>env</name>
<value>objc</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>swift-client</id>
<activation>
<property>
<name>env</name>
<value>swift</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
</modules>
</profile>
<profile>
<id>java-msf4j-server</id>
<activation>
Oops, something went wrong.

0 comments on commit 7d75c66

Please sign in to comment.