diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/build.sbt.mustache index 30510f4da30..971bc97364b 100644 --- a/modules/swagger-codegen/src/main/resources/akka-scala/build.sbt.mustache +++ b/modules/swagger-codegen/src/main/resources/akka-scala/build.sbt.mustache @@ -4,13 +4,12 @@ organization := "{{groupId}}" scalaVersion := "2.11.12" libraryDependencies ++= Seq( - "io.swagger" % "swagger-core" % "1.5.15", "com.typesafe" % "config" % "1.3.2", "com.typesafe.akka" %% "akka-actor" % "2.5.8", "io.spray" % "spray-client" % "1.3.1", "joda-time" % "joda-time" % "2.9.9", - "org.joda" % "joda-convert" % "1.9.2", "org.json4s" %% "json4s-jackson" % "3.5.3", + // test dependencies "org.scalatest" %% "scalatest" % "3.0.4" % "test", "junit" % "junit" % "4.12" % "test" ) diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache index da8f9d9043f..0cc69bdc424 100644 --- a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache @@ -13,90 +13,86 @@ UTF-8 UTF-8 - 1.8 - 2.11.12 - 3.5.3 - 3.2.11 - 1.3.1 - 2.5.8 - 1.9.2 - 2.9.9 - 1.5.15 - 1.0.0 - 4.12 - 3.0.4 + 1.8 + 2.11.12 + 3.5.3 + 3.2.11 + 1.3.1 + 2.5.8 + 2.9.9 - 3.3.1 + 4.12 + 3.0.4 + + 3.3.1 org.scala-lang scala-library - ${scala-version} - - - io.swagger - swagger-core - ${swagger-core-version} + ${scala.version} + provided joda-time joda-time - ${joda-time-version} - - - org.joda - joda-convert - ${joda-convert-version} + ${joda.time.version} com.typesafe config - 1.2.1 + 1.3.2 com.typesafe.akka akka-actor_2.11 - ${akka-version} + ${akka.version} io.spray spray-client - ${spray-version} + ${spray.version} org.json4s json4s-jackson_2.11 - ${json4s-jackson-version} + ${json4s.jackson.version} + org.scalatest scalatest_2.11 - ${scala-test-version} + ${scala.test.version} test junit junit - ${junit-version} + ${junit.version} test - - - maven-mongodb-plugin-repo - maven mongodb plugin repository - http://maven-mongodb-plugin.googlecode.com/svn/maven/repo - default - - - + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + org.apache.maven.plugins maven-enforcer-plugin @@ -181,7 +177,7 @@ - src/main/java + src/main/java @@ -195,7 +191,7 @@ - src/test/java + src/test/java @@ -207,14 +203,14 @@ maven-compiler-plugin 3.7.0 - ${jdk.version} - ${jdk.version} + ${java.version} + ${java.version} net.alchim31.maven scala-maven-plugin - ${scala-maven-plugin-version} + ${scala.maven.plugin.version} scala-compile-first @@ -244,15 +240,4 @@ - - - - org.scala-tools - maven-scala-plugin - - ${scala-version} - - - - - + \ No newline at end of file diff --git a/samples/client/petstore/akka-scala/build.sbt b/samples/client/petstore/akka-scala/build.sbt index 6a714038224..de6f172c1f4 100644 --- a/samples/client/petstore/akka-scala/build.sbt +++ b/samples/client/petstore/akka-scala/build.sbt @@ -4,13 +4,12 @@ organization := "io.swagger" scalaVersion := "2.11.12" libraryDependencies ++= Seq( - "io.swagger" % "swagger-core" % "1.5.15", "com.typesafe" % "config" % "1.3.2", "com.typesafe.akka" %% "akka-actor" % "2.5.8", "io.spray" % "spray-client" % "1.3.1", "joda-time" % "joda-time" % "2.9.9", - "org.joda" % "joda-convert" % "1.9.2", "org.json4s" %% "json4s-jackson" % "3.5.3", + // test dependencies "org.scalatest" %% "scalatest" % "3.0.4" % "test", "junit" % "junit" % "4.12" % "test" ) diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml index c2850648f1d..fcd419565d5 100644 --- a/samples/client/petstore/akka-scala/pom.xml +++ b/samples/client/petstore/akka-scala/pom.xml @@ -13,90 +13,86 @@ UTF-8 UTF-8 - 1.8 - 2.11.12 - 3.5.3 - 3.2.11 - 1.3.1 - 2.5.8 - 1.9.2 - 2.9.9 - 1.5.15 - 1.0.0 - 4.12 - 3.0.4 + 1.8 + 2.11.12 + 3.5.3 + 3.2.11 + 1.3.1 + 2.5.8 + 2.9.9 - 3.3.1 + 4.12 + 3.0.4 + + 3.3.1 org.scala-lang scala-library - ${scala-version} - - - io.swagger - swagger-core - ${swagger-core-version} + ${scala.version} + provided joda-time joda-time - ${joda-time-version} - - - org.joda - joda-convert - ${joda-convert-version} + ${joda.time.version} com.typesafe config - 1.2.1 + 1.3.2 com.typesafe.akka akka-actor_2.11 - ${akka-version} + ${akka.version} io.spray spray-client - ${spray-version} + ${spray.version} org.json4s json4s-jackson_2.11 - ${json4s-jackson-version} + ${json4s.jackson.version} + org.scalatest scalatest_2.11 - ${scala-test-version} + ${scala.test.version} test junit junit - ${junit-version} + ${junit.version} test - - - maven-mongodb-plugin-repo - maven mongodb plugin repository - http://maven-mongodb-plugin.googlecode.com/svn/maven/repo - default - - - + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + org.apache.maven.plugins maven-enforcer-plugin @@ -181,7 +177,7 @@ - src/main/java + src/main/java @@ -195,7 +191,7 @@ - src/test/java + src/test/java @@ -207,14 +203,14 @@ maven-compiler-plugin 3.7.0 - ${jdk.version} - ${jdk.version} + ${java.version} + ${java.version} net.alchim31.maven scala-maven-plugin - ${scala-maven-plugin-version} + ${scala.maven.plugin.version} scala-compile-first @@ -244,15 +240,4 @@ - - - - org.scala-tools - maven-scala-plugin - - ${scala-version} - - - - - + \ No newline at end of file