loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-07 11:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.3.x' into 6.0.x

Browse Source
This commit is contained in:
William Cheng
2021-07-12 17:11:35 +08:00
parent 702e274659 39fbf53150
commit 35f933b27f
3874 changed files with 120282 additions and 21640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION
View File

@@ -1 +1,5 @@
6.0.0-SNAPSHOT
<<<<<<< HEAD
6.0.0-SNAPSHOT
=======
5.3.0-SNAPSHOT
>>>>>>> origin/5.3.x

6
samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION
View File

@@ -1 +1,5 @@
6.0.0-SNAPSHOT
<<<<<<< HEAD
6.0.0-SNAPSHOT
=======
5.3.0-SNAPSHOT
>>>>>>> origin/5.3.x

6
samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION
View File

@@ -1 +1,5 @@
6.0.0-SNAPSHOT
<<<<<<< HEAD
6.0.0-SNAPSHOT
=======
5.3.0-SNAPSHOT
>>>>>>> origin/5.3.x

2
samples/server/petstore/jaxrs/jersey2-useTags/pom.xml
View File

@@ -186,7 +186,7 @@
<jersey2-version>2.22.2</jersey2-version>
<jackson-version>2.9.9</jackson-version>
<junit-version>4.13.1</junit-version>
<logback-version>1.1.7</logback-version>
<logback-version>1.2.0</logback-version>
<servlet-api-version>2.5</servlet-api-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

6
samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION
View File

@@ -1 +1,5 @@
6.0.0-SNAPSHOT
<<<<<<< HEAD
6.0.0-SNAPSHOT
=======
5.3.0-SNAPSHOT
>>>>>>> origin/5.3.x

2
samples/server/petstore/jaxrs/jersey2/pom.xml
View File

@@ -186,7 +186,7 @@
<jersey2-version>2.22.2</jersey2-version>
<jackson-version>2.9.9</jackson-version>
<junit-version>4.13.1</junit-version>
<logback-version>1.1.7</logback-version>
<logback-version>1.2.0</logback-version>
<servlet-api-version>2.5</servlet-api-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>