Skip to content

Update Spring, Spring Boot, and Akka versions to latest release versions #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mjkrumlauf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Spring, Spring Boot, and Akka versions to latest release versions #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 11 additions & 10 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: _*).
Expand All @@ -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",
Expand All @@ -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,
Expand Down
8 changes: 2 additions & 6 deletions src/test/scala/sample/EchoServiceSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version := "0.3.1"
version := "0.3.2-SNAPSHOT"