From e06687c13ac7d997efa4490e99be3c3811a6d8f8 Mon Sep 17 00:00:00 2001
From: Krumlauf <krumlamj@LNGDAYM-4169310.legal.regn.net>
Date: Fri, 27 Jan 2017 21:25:51 -0500
Subject: [PATCH] Update Spring, Spring Boot, and Akka versions to latest
 release versions

---
 README.md                                   |  2 +-
 build.sbt                                   | 21 +++++++++++----------
 src/test/scala/sample/EchoServiceSpec.scala |  8 ++------
 version.sbt                                 |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index d7b882f..d42dc79 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Pre-configured server components require little more than a route to get a servi
 ##### build.sbt
 
 ````scala
-libraryDependencies ++= "com.github.scalaspring" %% "akka-http-spring-boot" % "0.3.1"
+libraryDependencies ++= "com.github.scalaspring" %% "akka-http-spring-boot" % "0.3.2-SNAPSHOT"
 ````
 
 ##### Creating a service
diff --git a/build.sbt b/build.sbt
index 84bee8b..f70896f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,11 +1,11 @@
 import sbt.Keys._
 
 // Common dependency versions
-val akkaVersion = "2.4.2"
-val akkaHttpVersion = "2.4.2"
-val akkaHttpTestKitVersion = "2.4.2-RC3"
-val springVersion = "4.2.5.RELEASE"
-val springBootVersion = "1.3.3.RELEASE"
+val akkaVersion = "2.4.16"
+val akkaHttpVersion = "10.0.3"
+val akkaHttpTestKitVersion = "10.0.3"
+val springVersion = "4.3.6.RELEASE"
+val springBootVersion = "1.4.4.RELEASE"
 
 lazy val `akka-http-spring-boot` = (project in file(".")).
   settings(net.virtualvoid.sbt.graph.Plugin.graphSettings: _*).
@@ -23,9 +23,9 @@ lazy val `akka-http-spring-boot` = (project in file(".")).
       //"com.typesafe.akka" %% "akka-actor" % akkaVersion,
       "org.springframework" % "spring-context" % springVersion,
       "org.springframework.boot" % "spring-boot-starter" % springBootVersion,
-      "com.typesafe.akka" %% "akka-http-experimental" % akkaHttpVersion,
-      "com.typesafe.akka" %% "akka-http-spray-json-experimental" % akkaHttpVersion,
-      "com.github.scalaspring" %% "akka-spring-boot" % "0.3.1"
+      "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
+      "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpVersion,
+      "com.github.scalaspring" %% "akka-spring-boot" % "0.3.2-SNAPSHOT"
       // The following dependencies support configuration validation
       //"javax.validation" % "validation-api" % "1.1.0.Final",
       //"javax.el" % "javax.el-api" % "3.0.1-b04",
@@ -40,9 +40,10 @@ lazy val `akka-http-spring-boot` = (project in file(".")).
       "org.scalatest" %% "scalatest" % "2.2.4",
       "com.github.scalaspring" %% "scalatest-spring" % "0.3.1",
       "org.springframework" % "spring-test" % springVersion,
+      "org.springframework.boot" % "spring-boot-starter-test" % springBootVersion,
       "com.typesafe.akka" %% "akka-testkit" % akkaVersion,
-      "com.typesafe.akka" %% "akka-http-testkit-experimental" % akkaHttpTestKitVersion,
-      "com.jsuereth" %% "scala-arm" % "1.4"
+      "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpTestKitVersion,
+      "com.jsuereth" %% "scala-arm" % "2.0"
     ).map { _ % "test" },
     // Publishing settings
     publishMavenStyle       := true,
diff --git a/src/test/scala/sample/EchoServiceSpec.scala b/src/test/scala/sample/EchoServiceSpec.scala
index 7db8092..e185a34 100644
--- a/src/test/scala/sample/EchoServiceSpec.scala
+++ b/src/test/scala/sample/EchoServiceSpec.scala
@@ -2,15 +2,11 @@ package sample
 
 import akka.http.scaladsl.model.StatusCodes._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
-import com.github.scalaspring.akka.http.AkkaStreamsAutoConfiguration
 import com.github.scalaspring.scalatest.TestContextManagement
 import org.scalatest.{FlatSpec, Matchers}
-import org.springframework.context.annotation.{Configuration, Import}
-import org.springframework.test.context.ContextConfiguration
+import org.springframework.boot.test.context.SpringBootTest
 
-@Configuration
-@ContextConfiguration(classes = Array(classOf[EchoServiceSpec]))
-@Import(Array(classOf[AkkaStreamsAutoConfiguration]))
+@SpringBootTest
 class EchoServiceSpec extends FlatSpec with TestContextManagement with EchoService with ScalatestRouteTest with Matchers {
 
   "Echo service" should "echo" in {
diff --git a/version.sbt b/version.sbt
index 8ec80ca..f9511d2 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version := "0.3.1"
\ No newline at end of file
+version := "0.3.2-SNAPSHOT"
\ No newline at end of file