forked from loafle/openapi-generator-original
Merge remote-tracking branch 'origin/5.3.x' into 6.0.x
This commit is contained in:
@@ -1 +1,5 @@
|
||||
6.0.0-SNAPSHOT
|
||||
<<<<<<< HEAD
|
||||
6.0.0-SNAPSHOT
|
||||
=======
|
||||
5.3.0-SNAPSHOT
|
||||
>>>>>>> origin/5.3.x
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
<swagger-core-version>1.5.18</swagger-core-version>
|
||||
<jetty-version>9.2.9.v20150224</jetty-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>
|
||||
<cxf-version>3.2.7</cxf-version>
|
||||
<jackson-jaxrs-version>2.9.7</jackson-jaxrs-version>
|
||||
|
||||
Reference in New Issue
Block a user