mirror of
https://github.com/OpenAPITools/openapi-generator.git
synced 2025-12-11 12:32:42 +00:00
Merge remote-tracking branch 'origin/master' into 4.1.x
This commit is contained in:
@@ -1 +1,5 @@
|
||||
4.1.0-SNAPSHOT
|
||||
<<<<<<< HEAD
|
||||
4.1.0-SNAPSHOT
|
||||
=======
|
||||
4.0.2-SNAPSHOT
|
||||
>>>>>>> origin/master
|
||||
|
||||
@@ -9,13 +9,13 @@ lazy val root = (project in file(".")).
|
||||
publishArtifact in (Compile, packageDoc) := false,
|
||||
resolvers += Resolver.mavenLocal,
|
||||
libraryDependencies ++= Seq(
|
||||
"io.swagger" % "swagger-annotations" % "1.5.21",
|
||||
"io.swagger" % "swagger-annotations" % "1.5.22",
|
||||
"org.glassfish.jersey.core" % "jersey-client" % "2.6",
|
||||
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.6",
|
||||
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.6",
|
||||
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile",
|
||||
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile",
|
||||
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile",
|
||||
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
|
||||
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
|
||||
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
|
||||
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
|
||||
"com.brsanthu" % "migbase64" % "2.2",
|
||||
"org.apache.commons" % "commons-lang3" % "3.6",
|
||||
|
||||
@@ -265,12 +265,12 @@
|
||||
</dependencies>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<swagger-annotations-version>1.5.21</swagger-annotations-version>
|
||||
<swagger-annotations-version>1.5.22</swagger-annotations-version>
|
||||
<jersey-version>2.6</jersey-version>
|
||||
<commons_io_version>2.5</commons_io_version>
|
||||
<commons_lang3_version>3.6</commons_lang3_version>
|
||||
<jackson-version>2.8.11</jackson-version>
|
||||
<jackson-databind-version>2.8.11.3</jackson-databind-version>
|
||||
<jackson-version>2.9.9</jackson-version>
|
||||
<jackson-databind-version>2.9.9</jackson-databind-version>
|
||||
<threetenbp-version>2.6.4</threetenbp-version>
|
||||
<maven-plugin-version>1.0.0</maven-plugin-version>
|
||||
<junit-version>4.12</junit-version>
|
||||
|
||||
Reference in New Issue
Block a user