Release 3.0.0-RC

Linschoten · Linschoten · commit a1abdca471b5 · 2019-08-14T17:11:57.000+02:00
diff --git a/build.sbt b/build.sbt
@@ -232,41 +232,41 @@ lazy val integration = project.in(file("integration"))
   .enablePlugins(MultiJvmPlugin)
   .configs(MultiJvm)
 
-lazy val examples = project
-  .in(file("examples"))
-  .enablePlugins(JavaAppPackaging)
-  .settings(commonSettings)
-  .settings(noPublishSettings)
-  .settings(
-    moduleName := "examples",
-    scalacOptions ++= Seq(
-      "-Ypartial-unification"
-    ),
-    libraryDependencies ++=
-      compileDeps(
-        slf4jApi,
-        slf4jSimple,
-        http4s,
-        http4sDsl,
-        http4sServer,
-        http4sCirce,
-        circe,
-        circeGeneric,
-        kamon,
-        kamonPrometheus
-      ) ++ testDeps(
-        scalaTest,
-        scalaCheck,
-        junitInterface,
-        slf4jApi,
-        mockito,
-        logback
-      )
-  )
-  .settings(
-    maintainer in Docker := "The Apollo Squad",
-    packageSummary in Docker := "A web-shop checkout service example running baker",
-    packageName in Docker := "checkout-service-baker-example",
-    dockerExposedPorts := Seq(8080)
-  )
-  .dependsOn(bakertypes, runtime, recipeCompiler, recipeDsl, intermediateLanguage)
+//lazy val examples = project
+//  .in(file("examples"))
+//  .enablePlugins(JavaAppPackaging)
+//  .settings(commonSettings)
+//  .settings(noPublishSettings)
+//  .settings(
+//    moduleName := "examples",
+//    scalacOptions ++= Seq(
+//      "-Ypartial-unification"
+//    ),
+//    libraryDependencies ++=
+//      compileDeps(
+//        slf4jApi,
+//        slf4jSimple,
+//        http4s,
+//        http4sDsl,
+//        http4sServer,
+//        http4sCirce,
+//        circe,
+//        circeGeneric,
+//        kamon,
+//        kamonPrometheus
+//      ) ++ testDeps(
+//        scalaTest,
+//        scalaCheck,
+//        junitInterface,
+//        slf4jApi,
+//        mockito,
+//        logback
+//      )
+//  )
+//  .settings(
+//    maintainer in Docker := "The Apollo Squad",
+//    packageSummary in Docker := "A web-shop checkout service example running baker",
+//    packageName in Docker := "checkout-service-baker-example",
+//    dockerExposedPorts := Seq(8080)
+//  )
+//  .dependsOn(bakertypes, runtime, recipeCompiler, recipeDsl, intermediateLanguage)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -3,7 +3,7 @@ import sbt._
 //noinspection TypeAnnotation
 object Dependencies {
 
-  val akkaVersion = "2.5.17"
+  val akkaVersion = "2.5.22"
   val http4sVersion = "0.20.0"
   val circeVersion = "0.11.1"
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -18,9 +18,9 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.25")
+//addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.25")
 
 libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.25"
-
-// For the example application
-addSbtPlugin("io.kamon" % "sbt-kanela-runner" % "2.0.1")
+//
+//// For the example application
+//addSbtPlugin("io.kamon" % "sbt-kanela-runner" % "2.0.1")
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "3.0.0-SNAPSHOT"
+version in ThisBuild := "3.0.0-RC"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version in ThisBuild := "3.0.0-SNAPSHOT"`
	`1`	`+version in ThisBuild := "3.0.0-RC"`