Skip to content

Commit 7d75c66

Browse files
wing328wing328
authored
Various updates (OpenAPITools#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
1 parent e5be838 commit 7d75c66

36 files changed

+66
-228
lines changed

‎pom.xml.bash ‎CI/pom.xml.bash

+18-48
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<version>5</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
8-
<groupId>io.swagger</groupId>
9-
<artifactId>swagger-codegen-project</artifactId>
8+
<groupId>org.openapitools</groupId>
9+
<artifactId>openapi-generator-project</artifactId>
1010
<packaging>pom</packaging>
11-
<name>swagger-codegen-project</name>
12-
<version>2.4.0-SNAPSHOT</version>
13-
<url>https://github.com/swagger-api/swagger-codegen</url>
11+
<name>openapi-generator-project</name>
12+
<version>3.0.0-SNAPSHOT</version>
13+
<url>https://github.com/openapi-tools/openapi-generator</url>
1414
<scm>
15-
<connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
16-
<developerConnection>scm:git:[email protected]:swagger-api/swagger-codegen.git</developerConnection>
17-
<url>https://github.com/swagger-api/swagger-codegen</url>
15+
<connection>scm:git:[email protected]:openapi-tools/openapi-generator.git</connection>
16+
<developerConnection>scm:git:[email protected]:openapi-tools/openapi-generator.git</developerConnection>
17+
<url>https://github.com/openapi-tools/openapi-generator</url>
1818
</scm>
1919
<developers>
2020
<!-- original author of the project -->
@@ -58,14 +58,8 @@
5858
</developers>
5959
<issueManagement>
6060
<system>github</system>
61-
<url>https://github.com/swagger-api/swagger-codegen/issues</url>
61+
<url>https://github.com/openapi-tools/openapi-generator/issues</url>
6262
</issueManagement>
63-
<mailingLists>
64-
<mailingList>
65-
<name>swagger-swaggersocket</name>
66-
<archive>https://groups.google.com/forum/#!forum/swagger-swaggersocket</archive>
67-
</mailingList>
68-
</mailingLists>
6963
<licenses>
7064
<license>
7165
<name>Apache License 2.0</name>
@@ -117,7 +111,7 @@
117111
<lineEnding>LF</lineEnding>
118112
</configuration>
119113
</plugin>
120-
<plugin>
114+
<!--<plugin>
121115
<groupId>org.apache.maven.plugins</groupId>
122116
<artifactId>maven-checkstyle-plugin</artifactId>
123117
<version>2.17</version>
@@ -127,7 +121,7 @@
127121
<phase>validate</phase>
128122
<configuration>
129123
<configLocation>google_checkstyle.xml</configLocation>
130-
<!-- Don't include generated sources a la http://stackoverflow.com/a/30406454 -->
124+
Don't include generated sources a la http://stackoverflow.com/a/30406454
131125
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
132126
<encoding>UTF-8</encoding>
133127
<consoleOutput>true</consoleOutput>
@@ -146,7 +140,7 @@
146140
<version>6.19</version>
147141
</dependency>
148142
</dependencies>
149-
</plugin>
143+
</plugin>-->
150144
<plugin>
151145
<groupId>org.apache.maven.plugins</groupId>
152146
<artifactId>maven-surefire-plugin</artifactId>
@@ -201,7 +195,7 @@
201195
<mode>development</mode>
202196
<url>${project.url}</url>
203197
<implementation-version>${project.version}</implementation-version>
204-
<package>io.swagger</package>
198+
<package>org.openapi-tools</package>
205199
</manifestEntries>
206200
</archive>
207201
</configuration>
@@ -544,30 +538,6 @@
544538
<module>samples/client/petstore/scala</module>
545539
</modules>
546540
</profile>
547-
<profile>
548-
<id>objc-client</id>
549-
<activation>
550-
<property>
551-
<name>env</name>
552-
<value>objc</value>
553-
</property>
554-
</activation>
555-
<modules>
556-
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
557-
</modules>
558-
</profile>
559-
<profile>
560-
<id>swift-client</id>
561-
<activation>
562-
<property>
563-
<name>env</name>
564-
<value>swift</value>
565-
</property>
566-
</activation>
567-
<modules>
568-
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
569-
</modules>
570-
</profile>
571541
<profile>
572542
<id>java-msf4j-server</id>
573543
<activation>
@@ -882,10 +852,10 @@
882852
</profile>
883853
</profiles>
884854
<modules>
885-
<module>modules/swagger-codegen</module>
886-
<module>modules/swagger-codegen-cli</module>
887-
<module>modules/swagger-codegen-maven-plugin</module>
888-
<module>modules/swagger-generator</module>
855+
<module>modules/openapi-generator</module>
856+
<module>modules/openapi-generator-cli</module>
857+
<module>modules/openapi-generator-maven-plugin</module>
858+
<module>modules/openapi-generator-online</module>
889859
</modules>
890860
<reporting>
891861
<outputDirectory>target/site</outputDirectory>
@@ -961,7 +931,7 @@
961931
<commons-lang-version>3.4</commons-lang-version>
962932
<slf4j-version>1.7.12</slf4j-version>
963933
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
964-
<jmustache-version>1.12</jmustache-version>
934+
<jmustache-version>1.14</jmustache-version>
965935
<testng-version>6.9.6</testng-version>
966936
<surefire-version>2.19.1</surefire-version>
967937
<jmockit-version>1.25</jmockit-version>

‎pom.xml.circleci ‎CI/pom.xml.circleci

+3-27
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<groupId>org.openapitools</groupId>
1010
<artifactId>openapi-generator-project</artifactId>
1111
<packaging>pom</packaging>
12-
<name>openapi-genearator-project</name>
12+
<name>openapi-generator-project</name>
1313
<version>3.0.0-SNAPSHOT</version>
1414
<url>https://github.com/openapitools/openapi-generator</url>
1515
<scm>
@@ -199,7 +199,7 @@
199199
<mode>development</mode>
200200
<url>${project.url}</url>
201201
<implementation-version>${project.version}</implementation-version>
202-
<package>io.swagger</package>
202+
<package>org.openapitools</package>
203203
</manifestEntries>
204204
</archive>
205205
</configuration>
@@ -498,30 +498,6 @@
498498
<module>samples/client/petstore/scala</module>
499499
</modules>
500500
</profile>
501-
<profile>
502-
<id>objc-client</id>
503-
<activation>
504-
<property>
505-
<name>env</name>
506-
<value>objc</value>
507-
</property>
508-
</activation>
509-
<modules>
510-
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
511-
</modules>
512-
</profile>
513-
<profile>
514-
<id>swift-client</id>
515-
<activation>
516-
<property>
517-
<name>env</name>
518-
<value>swift</value>
519-
</property>
520-
</activation>
521-
<modules>
522-
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
523-
</modules>
524-
</profile>
525501
<profile>
526502
<id>java-msf4j-server</id>
527503
<activation>
@@ -1004,7 +980,7 @@
1004980
<commons-lang-version>3.4</commons-lang-version>
1005981
<slf4j-version>1.7.12</slf4j-version>
1006982
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
1007-
<jmustache-version>1.12</jmustache-version>
983+
<jmustache-version>1.14</jmustache-version>
1008984
<testng-version>6.9.6</testng-version>
1009985
<surefire-version>2.19.1</surefire-version>
1010986
<jmockit-version>1.25</jmockit-version>

‎pom.xml.circleci.java7 ‎CI/pom.xml.circleci.java7

+1-31
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@
6464
<system>github</system>
6565
<url>https://github.com/openapitools/openapi-generator/issues</url>
6666
</issueManagement>
67-
<mailingLists>
68-
<mailingList>
69-
<name>swagger-swaggersocket</name>
70-
<archive>https://groups.google.com/forum/#!forum/swagger-swaggersocket</archive>
71-
</mailingList>
72-
</mailingLists>
7367
<licenses>
7468
<license>
7569
<name>Apache License 2.0</name>
@@ -205,7 +199,7 @@
205199
<mode>development</mode>
206200
<url>${project.url}</url>
207201
<implementation-version>${project.version}</implementation-version>
208-
<package>io.swagger</package>
202+
<package>org.openapitools</package>
209203
</manifestEntries>
210204
</archive>
211205
</configuration>
@@ -504,30 +498,6 @@
504498
<module>samples/client/petstore/scala</module>
505499
</modules>
506500
</profile>
507-
<profile>
508-
<id>objc-client</id>
509-
<activation>
510-
<property>
511-
<name>env</name>
512-
<value>objc</value>
513-
</property>
514-
</activation>
515-
<modules>
516-
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
517-
</modules>
518-
</profile>
519-
<profile>
520-
<id>swift-client</id>
521-
<activation>
522-
<property>
523-
<name>env</name>
524-
<value>swift</value>
525-
</property>
526-
</activation>
527-
<modules>
528-
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
529-
</modules>
530-
</profile>
531501
<profile>
532502
<id>java-msf4j-server</id>
533503
<activation>

‎pom.xml.ios ‎CI/pom.xml.ios

+16-46
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<version>5</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
8-
<groupId>io.swagger</groupId>
9-
<artifactId>swagger-codegen-project</artifactId>
8+
<groupId>org.openapitools</groupId>
9+
<artifactId>openapi-generator-project</artifactId>
1010
<packaging>pom</packaging>
11-
<name>swagger-codegen-project</name>
12-
<version>2.4.0-SNAPSHOT</version>
13-
<url>https://github.com/swagger-api/swagger-codegen</url>
11+
<name>openapi-generator-project</name>
12+
<version>3.0.0-SNAPSHOT</version>
13+
<url>https://github.com/openapitools/openapi-generator</url>
1414
<scm>
15-
<connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
16-
<developerConnection>scm:git:[email protected]:swagger-api/swagger-codegen.git</developerConnection>
17-
<url>https://github.com/swagger-api/swagger-codegen</url>
15+
<connection>scm:git:[email protected]:openapitools/openapi-generator.git</connection>
16+
<developerConnection>scm:git:[email protected]:openapitools/openapi-generator.git</developerConnection>
17+
<url>https://github.com/openapitools/openapi-generator</url>
1818
</scm>
1919
<developers>
2020
<!-- original author of the project -->
@@ -58,14 +58,8 @@
5858
</developers>
5959
<issueManagement>
6060
<system>github</system>
61-
<url>https://github.com/swagger-api/swagger-codegen/issues</url>
61+
<url>https://github.com/openapitools/openapi-generator/issues</url>
6262
</issueManagement>
63-
<mailingLists>
64-
<mailingList>
65-
<name>swagger-swaggersocket</name>
66-
<archive>https://groups.google.com/forum/#!forum/swagger-swaggersocket</archive>
67-
</mailingList>
68-
</mailingLists>
6963
<licenses>
7064
<license>
7165
<name>Apache License 2.0</name>
@@ -201,7 +195,7 @@
201195
<mode>development</mode>
202196
<url>${project.url}</url>
203197
<implementation-version>${project.version}</implementation-version>
204-
<package>io.swagger</package>
198+
<package>org.openapitools</package>
205199
</manifestEntries>
206200
</archive>
207201
</configuration>
@@ -544,30 +538,6 @@
544538
<module>samples/client/petstore/scala</module>
545539
</modules>
546540
</profile>
547-
<profile>
548-
<id>objc-client</id>
549-
<activation>
550-
<property>
551-
<name>env</name>
552-
<value>objc</value>
553-
</property>
554-
</activation>
555-
<modules>
556-
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
557-
</modules>
558-
</profile>
559-
<profile>
560-
<id>swift-client</id>
561-
<activation>
562-
<property>
563-
<name>env</name>
564-
<value>swift</value>
565-
</property>
566-
</activation>
567-
<modules>
568-
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
569-
</modules>
570-
</profile>
571541
<profile>
572542
<id>java-msf4j-server</id>
573543
<activation>
@@ -885,15 +855,15 @@
885855
<module>samples/client/petstore/swift/rxswift/SwaggerClientTests</module>
886856
<!-- comment out objc tests as it's timing out
887857
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
888-
<module>samples/client/petstore/objc/core-data/SwaggerClientTests</module>-->
858+
<module>samples/client/petstore/objc/core-data/SwaggerClientTests</module>-->
889859
</modules>
890860
</profile>
891861
</profiles>
892862
<modules>
893-
<module>modules/swagger-codegen</module>
894-
<module>modules/swagger-codegen-cli</module>
895-
<module>modules/swagger-codegen-maven-plugin</module>
896-
<module>modules/swagger-generator</module>
863+
<module>modules/openapi-generator</module>
864+
<module>modules/openapi-generator-cli</module>
865+
<module>modules/openapi-generator-maven-plugin</module>
866+
<module>modules/openapi-generator-online</module>
897867
</modules>
898868
<reporting>
899869
<outputDirectory>target/site</outputDirectory>
@@ -969,7 +939,7 @@
969939
<commons-lang-version>3.4</commons-lang-version>
970940
<slf4j-version>1.7.12</slf4j-version>
971941
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
972-
<jmustache-version>1.12</jmustache-version>
942+
<jmustache-version>1.14</jmustache-version>
973943
<testng-version>6.9.6</testng-version>
974944
<surefire-version>2.19.1</surefire-version>
975945
<jmockit-version>1.25</jmockit-version>

‎pom.xml.shippable ‎CI/pom.xml.shippable

+1-25
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<mode>development</mode>
196196
<url>${project.url}</url>
197197
<implementation-version>${project.version}</implementation-version>
198-
<package>io.swagger</package>
198+
<package>org.openapitools</package>
199199
</manifestEntries>
200200
</archive>
201201
</configuration>
@@ -538,30 +538,6 @@
538538
<module>samples/client/petstore/scala</module>
539539
</modules>
540540
</profile>
541-
<profile>
542-
<id>objc-client</id>
543-
<activation>
544-
<property>
545-
<name>env</name>
546-
<value>objc</value>
547-
</property>
548-
</activation>
549-
<modules>
550-
<module>samples/client/petstore/objc/default/SwaggerClientTests</module>
551-
</modules>
552-
</profile>
553-
<profile>
554-
<id>swift-client</id>
555-
<activation>
556-
<property>
557-
<name>env</name>
558-
<value>swift</value>
559-
</property>
560-
</activation>
561-
<modules>
562-
<module>samples/client/petstore/swift/default/SwaggerClientTests</module>
563-
</modules>
564-
</profile>
565541
<profile>
566542
<id>java-msf4j-server</id>
567543
<activation>

‎samples.ci/client/petstore/kotlin-string/pom.xml ‎CI/samples.ci/client/petstore/kotlin-string/pom.xml

File renamed without changes.

‎samples.ci/client/petstore/kotlin-threetenbp/pom.xml ‎CI/samples.ci/client/petstore/kotlin-threetenbp/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml ‎CI/samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/java-play-framework-controller-only/pom.xml ‎CI/samples.ci/server/petstore/java-play-framework-controller-only/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml ‎CI/samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml ‎CI/samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml ‎CI/samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/java-play-framework-no-interface/pom.xml ‎CI/samples.ci/server/petstore/java-play-framework-no-interface/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml ‎CI/samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml ‎CI/samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/java-play-framework/pom.xml ‎CI/samples.ci/server/petstore/java-play-framework/pom.xml

File renamed without changes.

‎samples.ci/server/petstore/kotlin-server/ktor/pom.xml ‎CI/samples.ci/server/petstore/kotlin-server/ktor/pom.xml

File renamed without changes.

0 commit comments

Comments
 (0)