Skip to content

Commit 7e457f7

Browse files
wing328wing328
committed
sync master
1 parent 8d3a1a5 commit 7e457f7

File tree

761 files changed

+123
-3163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

761 files changed

+123
-3163
lines changed

‎modules/openapi-generator-cli/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
<parent>
44
<groupId>org.openapitools</groupId>
55
<artifactId>openapi-generator-project</artifactId>
6-
<<<<<<< HEAD
76
<version>4.1.0-SNAPSHOT</version>
8-
=======
9-
<version>4.0.2-SNAPSHOT</version>
10-
>>>>>>> origin/master
117
<relativePath>../..</relativePath>
128
</parent>
139
<modelVersion>4.0.0</modelVersion>

‎modules/openapi-generator-core/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
<parent>
66
<artifactId>openapi-generator-project</artifactId>
77
<groupId>org.openapitools</groupId>
8-
<<<<<<< HEAD
98
<version>4.1.0-SNAPSHOT</version>
10-
=======
11-
<version>4.0.2-SNAPSHOT</version>
12-
>>>>>>> origin/master
139
<relativePath>../..</relativePath>
1410
</parent>
1511
<modelVersion>4.0.0</modelVersion>

‎modules/openapi-generator-gradle-plugin/gradle.properties

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
openApiGeneratorVersion=4.1.0-SNAPSHOT
3-
=======
4-
openApiGeneratorVersion=4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
62

73
# BEGIN placeholders
84
# these are just placeholders to allow contributors to build directly

‎modules/openapi-generator-gradle-plugin/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
<parent>
44
<groupId>org.openapitools</groupId>
55
<artifactId>openapi-generator-project</artifactId>
6-
<<<<<<< HEAD
76
<version>4.1.0-SNAPSHOT</version>
8-
=======
9-
<version>4.0.2-SNAPSHOT</version>
10-
>>>>>>> origin/master
117
<relativePath>../..</relativePath>
128
</parent>
139
<modelVersion>4.0.0</modelVersion>

‎modules/openapi-generator-maven-plugin/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
<parent>
55
<groupId>org.openapitools</groupId>
66
<artifactId>openapi-generator-project</artifactId>
7-
<<<<<<< HEAD
87
<version>4.1.0-SNAPSHOT</version>
9-
=======
10-
<version>4.0.2-SNAPSHOT</version>
11-
>>>>>>> origin/master
128
<relativePath>../..</relativePath>
139
</parent>
1410
<artifactId>openapi-generator-maven-plugin</artifactId>

‎modules/openapi-generator-online/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
<parent>
44
<groupId>org.openapitools</groupId>
55
<artifactId>openapi-generator-project</artifactId>
6-
<<<<<<< HEAD
76
<version>4.1.0-SNAPSHOT</version>
8-
=======
9-
<version>4.0.2-SNAPSHOT</version>
10-
>>>>>>> origin/master
117
<relativePath>../..</relativePath>
128
</parent>
139
<artifactId>openapi-generator-online</artifactId>

‎modules/openapi-generator/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
<parent>
44
<groupId>org.openapitools</groupId>
55
<artifactId>openapi-generator-project</artifactId>
6-
<<<<<<< HEAD
76
<version>4.1.0-SNAPSHOT</version>
8-
=======
9-
<version>4.0.2-SNAPSHOT</version>
10-
>>>>>>> origin/master
117
<relativePath>../..</relativePath>
128
</parent>
139
<modelVersion>4.0.0</modelVersion>
@@ -317,11 +313,7 @@
317313
<dependency>
318314
<groupId>org.openapitools</groupId>
319315
<artifactId>openapi-generator-core</artifactId>
320-
<<<<<<< HEAD
321316
<version>4.1.0-SNAPSHOT</version>
322-
=======
323-
<version>4.0.2-SNAPSHOT</version>
324-
>>>>>>> origin/master
325317
</dependency>
326318
</dependencies>
327319
<repositories>

‎pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
<artifactId>openapi-generator-project</artifactId>
1010
<packaging>pom</packaging>
1111
<name>openapi-generator-project</name>
12-
<<<<<<< HEAD
1312
<version>4.1.0-SNAPSHOT</version>
14-
=======
15-
<version>4.0.2-SNAPSHOT</version>
16-
>>>>>>> origin/master
1713
<url>https://github.com/openapitools/openapi-generator</url>
1814
<scm>
1915
<connection>scm:git:[email protected]:openapitools/openapi-generator.git</connection>

‎samples/client/petstore/R/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/apex/.openapi-generator/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.2-SNAPSHOT
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.2-SNAPSHOT
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/elixir/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/go/go-petstore/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/groovy/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/haskell-http-client/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/feign/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/feign10x/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/google-api-client/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/jersey1/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/jersey2/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/rest-assured/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/resteasy/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/resttemplate/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/retrofit/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/retrofit2/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/vertx/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/java/webclient/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/javascript-es6/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/javascript-promise/.openapi-generator/VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
4.1.0-SNAPSHOT
3-
=======
4-
4.0.2-SNAPSHOT
5-
>>>>>>> origin/master
1+
4.1.0-SNAPSHOT

‎samples/client/petstore/javascript-promise/src/ApiClient.js

-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
88
* https://openapi-generator.tech
99
*
10-
<<<<<<< HEAD
1110
* OpenAPI Generator version: 4.1.0-SNAPSHOT
12-
=======
13-
* OpenAPI Generator version: 4.0.2-SNAPSHOT
14-
>>>>>>> origin/master
1511
*
1612
* Do not edit the class manually.
1713
*

‎samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js

-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
88
* https://openapi-generator.tech
99
*
10-
<<<<<<< HEAD
1110
* OpenAPI Generator version: 4.1.0-SNAPSHOT
12-
=======
13-
* OpenAPI Generator version: 4.0.2-SNAPSHOT
14-
>>>>>>> origin/master
1511
*
1612
* Do not edit the class manually.
1713
*

0 commit comments

Comments
 (0)