From 057bf8e1da950ac02888f7cd8125edbffec10a6d Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 3 Jul 2018 16:47:19 +0100 Subject: [PATCH 1/7] scala 2.13.0-M4 --- .travis.yml | 7 +++++-- build.sbt | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57d69c2..f167766 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,11 @@ jdk: scala: - 2.10.6 - 2.11.8 - - 2.12.4 + - 2.12.6 + - 2.13.0-M4 matrix: exclude: - jdk: oraclejdk7 - scala: 2.12.4 + scala: 2.12.6 + - jdk: oraclejdk7 + scala: 2.13.0-M4 diff --git a/build.sbt b/build.sbt index 3f5d67c..c9b4d21 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ version := "1.0.5-SNAPSHOT" scalaVersion := "2.11.8" -crossScalaVersions := Seq("2.10.6", scalaVersion.value, "2.12.4") +crossScalaVersions := Seq("2.10.6", scalaVersion.value, "2.12.4", "2.13.0-M4") organizationHomepage in ThisBuild := Some(url("http://swagger.io")) @@ -23,9 +23,10 @@ publishArtifact in Test := false pomIncludeRepository := { x => false } libraryDependencies ++= Seq( - "io.swagger" % "swagger-core" % "1.5.18", - "org.scalatest" %% "scalatest" % "3.0.5" % "test", - "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.5", + "org.scala-lang" % "scala-reflect" % scalaVersion.value, + "io.swagger" % "swagger-core" % "1.5.20", + "org.scalatest" %% "scalatest" % "3.0.6-SNAP1" % "test", + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.6", "junit" % "junit" % "4.12" % "test" ) From 0bf53b14b15a4924498409feff9c14c2e6194bd2 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 3 Jul 2018 16:48:26 +0100 Subject: [PATCH 2/7] scala 2.13.0-M4 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c9b4d21..b6dfdbf 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ version := "1.0.5-SNAPSHOT" scalaVersion := "2.11.8" -crossScalaVersions := Seq("2.10.6", scalaVersion.value, "2.12.4", "2.13.0-M4") +crossScalaVersions := Seq("2.10.6", scalaVersion.value, "2.12.6", "2.13.0-M4") organizationHomepage in ThisBuild := Some(url("http://swagger.io")) From 392a9e5b4073db91e7870bf79ae6402d5ebbd710 Mon Sep 17 00:00:00 2001 From: frantuma Date: Mon, 8 Apr 2019 12:43:35 +0200 Subject: [PATCH 3/7] bump next snapshot 1.0.6-SNAPSHOT --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6b30ed4..9c3dc9a 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ import Defaults._ organization := "io.swagger" -version := "1.0.5-SNAPSHOT" +version := "1.0.6-SNAPSHOT" scalaVersion := "2.11.12" From 55e5b959991322e58c20320790dee703919bcd78 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Wed, 5 Jun 2019 10:38:12 -0500 Subject: [PATCH 4/7] Readme Update Master - Security Section Added --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 3fe3081..0baf9f9 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,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 [security@swagger.io](mailto:security@swagger.io), instead of using the public issue tracker. + License ------- From b0af86afb1b818506c2836149b82e9f21a40d966 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 13 Jun 2019 17:27:48 +0100 Subject: [PATCH 5/7] scala 2.13.0 build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8a4054b..eb688e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: scala jdk: - openjdk8 scala: + - 2.10.6 - 2.11.12 - 2.12.6 - 2.13.0 From 1c035ae9d24b293be97a2e6b2dcea3c595afe6cb Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 13 Jun 2019 17:33:07 +0100 Subject: [PATCH 6/7] scala 2.13.0 build --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 0531343..c0bab04 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.2 +sbt.version=1.2.8 From b08d0d6a4bf9cd64c0720ee800b463f922737966 Mon Sep 17 00:00:00 2001 From: frantuma Date: Sat, 7 Dec 2019 13:59:19 +0100 Subject: [PATCH 7/7] update swagger-core and jackson versions --- README.md | 2 +- build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b3245ef..3996b70 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This project is compatible with [swagger-core](https://github.com/swagger-api/sw To enable the swagger-scala-module, include the appropriate version in your project: ``` - "io.swagger" %% "swagger-scala-module" % "1.0.3" + "io.swagger" %% "swagger-scala-module" % "1.0.6-SNAPSHOT" ``` Which will include the proper cross-publish version of swagger-scala-module. diff --git a/build.sbt b/build.sbt index 876f9e8..ae240fc 100644 --- a/build.sbt +++ b/build.sbt @@ -24,9 +24,9 @@ pomIncludeRepository := { x => false } libraryDependencies ++= Seq( "org.scala-lang" % "scala-reflect" % scalaVersion.value, - "io.swagger" % "swagger-core" % "1.5.22", + "io.swagger" % "swagger-core" % "1.5.24", "org.scalatest" %% "scalatest" % "3.0.8" % "test", - "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9", + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.10", "junit" % "junit" % "4.12" % "test" )