Merge branch 'develop' into master

swagger-api · Dec 7, 2019 · 4261ea2 · 4261ea2
2 parents b86989d + 5a63595
commit 4261ea2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,3 +5,4 @@ scala:
    - 2.10.6
    - 2.11.12
    - 2.12.6
+   - 2.13.0
diff --git a/README.md b/README.md
@@ -66,6 +66,10 @@ See the guide on [getting started with swagger](http://swagger.io) to get starte
 sbt publishLocal
 ```
 
+## Security contact
+
+Please disclose any security-related issues or vulnerabilities by emailing [[email protected]](mailto:[email protected]), instead of using the public issue tracker.
+
 License
 -------
 

diff --git a/build.sbt b/build.sbt
@@ -6,11 +6,11 @@ import Defaults._
 
 organization := "io.swagger"
 
-version := "1.0.5"
+version := "1.0.6-SNAPSHOT"
 
 scalaVersion := "2.11.12"
 
-crossScalaVersions := Seq("2.10.6", scalaVersion.value, "2.12.6")
+crossScalaVersions := Seq("2.10.6", scalaVersion.value, "2.12.6", "2.13.0")
 
 organizationHomepage in ThisBuild := Some(url("http://swagger.io"))
 
@@ -25,8 +25,8 @@ pomIncludeRepository := { x => false }
 libraryDependencies ++= Seq(
   "org.scala-lang" % "scala-reflect" % scalaVersion.value,
   "io.swagger" % "swagger-core" % "1.5.22",
-  "org.scalatest" %% "scalatest" % "3.0.5" % "test",
-  "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.8",
+  "org.scalatest" %% "scalatest" % "3.0.8" % "test",
+  "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9",
   "junit" % "junit" % "4.12" % "test"
 )
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.2
+sbt.version=1.2.8
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ scala: @@
        - 2.10.6
        - 2.11.12
        - 2.12.6
+       - 2.13.0