Skip to content

Commit

Permalink
Various updates (OpenAPITools#419)
Browse files Browse the repository at this point in the history 
* 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
wing328 authored May 11, 2018
1 parent e5be838 commit 7d75c66
Show file tree
Hide file tree
Showing 36 changed files with 66 additions and 228 deletions.
66 changes: 18 additions & 48 deletions pom.xml.bash → CI/pom.xml.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:[email protected]:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
<connection>scm:git:[email protected]:openapi-tools/openapi-generator.git</connection>
<developerConnection>scm:git:[email protected]:openapi-tools/openapi-generator.git</developerConnection>
<url>https://github.com/openapi-tools/openapi-generator</url>
</scm>
<developers>
<!-- original author of the project -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -146,7 +140,7 @@
<version>6.19</version>
</dependency>
</dependencies>
</plugin>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
30 changes: 3 additions & 27 deletions pom.xml.circleci → CI/pom.xml.circleci
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
32 changes: 1 addition & 31 deletions pom.xml.circleci.java7 → CI/pom.xml.circleci.java7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
62 changes: 16 additions & 46 deletions pom.xml.ios → CI/pom.xml.ios
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:[email protected]:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
<connection>scm:git:[email protected]:openapitools/openapi-generator.git</connection>
<developerConnection>scm:git:[email protected]:openapitools/openapi-generator.git</developerConnection>
<url>https://github.com/openapitools/openapi-generator</url>
</scm>
<developers>
<!-- original author of the project -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
26 changes: 1 addition & 25 deletions pom.xml.shippable → CI/pom.xml.shippable
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
0 ....ci/client/petstore/kotlin-string/pom.xml → ....ci/client/petstore/kotlin-string/pom.xml
View file
File renamed without changes.
0 ...client/petstore/kotlin-threetenbp/pom.xml → ...client/petstore/kotlin-threetenbp/pom.xml
View file
File renamed without changes.
0 ...ay-framework-api-package-override/pom.xml → ...ay-framework-api-package-override/pom.xml
View file
File renamed without changes.
0 ...va-play-framework-controller-only/pom.xml → ...va-play-framework-controller-only/pom.xml
View file
File renamed without changes.
0 ...ava-play-framework-fake-endpoints/pom.xml → ...ava-play-framework-fake-endpoints/pom.xml
View file
File renamed without changes.
0 ...play-framework-no-bean-validation/pom.xml → ...play-framework-no-bean-validation/pom.xml
View file
File renamed without changes.
0 ...y-framework-no-exception-handling/pom.xml → ...y-framework-no-exception-handling/pom.xml
View file
File renamed without changes.
0 .../java-play-framework-no-interface/pom.xml → .../java-play-framework-no-interface/pom.xml
View file
File renamed without changes.
0 ...java-play-framework-no-swagger-ui/pom.xml → ...java-play-framework-no-swagger-ui/pom.xml
View file
File renamed without changes.
0 ...java-play-framework-no-wrap-calls/pom.xml → ...java-play-framework-no-wrap-calls/pom.xml
View file
File renamed without changes.
0 ...rver/petstore/java-play-framework/pom.xml → ...rver/petstore/java-play-framework/pom.xml
View file
File renamed without changes.
0 ...erver/petstore/kotlin-server/ktor/pom.xml → ...erver/petstore/kotlin-server/ktor/pom.xml
View file
File renamed without changes.
Loading

0 comments on commit 7d75c66

Please sign in to comment.