diff --git a/akka-docs/rst/java/lambda-persistence.rst b/akka-docs/rst/java/lambda-persistence.rst
index 6192fb7692..977d6d27eb 100644
--- a/akka-docs/rst/java/lambda-persistence.rst
+++ b/akka-docs/rst/java/lambda-persistence.rst
@@ -61,7 +61,7 @@ LevelDB based plugins will require the following additional dependency declarati
org.fusesource.leveldbjni
leveldbjni-all
- 1.7
+ 1.8
Architecture
diff --git a/akka-docs/rst/java/logging.rst b/akka-docs/rst/java/logging.rst
index 49de92d61b..d2ac7a1d30 100644
--- a/akka-docs/rst/java/logging.rst
+++ b/akka-docs/rst/java/logging.rst
@@ -268,7 +268,7 @@ It has one single dependency; the slf4j-api jar. In runtime you also need a SLF4
ch.qos.logback
logback-classic
- 1.0.13
+ 1.1.3
You need to enable the Slf4jLogger in the ``loggers`` element in
diff --git a/akka-docs/rst/java/persistence.rst b/akka-docs/rst/java/persistence.rst
index f4b327b002..39b9c8755d 100644
--- a/akka-docs/rst/java/persistence.rst
+++ b/akka-docs/rst/java/persistence.rst
@@ -65,7 +65,7 @@ LevelDB based plugins will require the following additional dependency declarati
org.fusesource.leveldbjni
leveldbjni-all
- 1.7
+ 1.8
Architecture
diff --git a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
index f069abc62d..d158d7c795 100644
--- a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
+++ b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
@@ -24,6 +24,12 @@ The following parts are not binary compatible with 2.3.x:
* experimental modules, such as akka-persistence and akka-contrib
* features, classes, methods that were deprecated in 2.3.x and removed in 2.4.x
+The dependency to **Netty** has been updated from version 3.8.0.Final to 3.10.3.Final. The changes in
+those versions might not be fully binary compatible, but we believe that it will not be a problem
+in practice. No changes were needed to the Akka source code for this update. Users of libraries that
+depend on 3.8.0.Final that break with 3.10.3.Final should be able to manually downgrade the dependency
+to 3.8.0.Final and Akka will still work with that version.
+
Advanced Notice: TypedActors will go away
========================================
diff --git a/akka-docs/rst/scala/logging.rst b/akka-docs/rst/scala/logging.rst
index af216ff7ec..c087e43264 100644
--- a/akka-docs/rst/scala/logging.rst
+++ b/akka-docs/rst/scala/logging.rst
@@ -304,7 +304,7 @@ It has one single dependency; the slf4j-api jar. In runtime you also need a SLF4
.. code-block:: scala
- libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.0.13"
+ libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.1.3"
You need to enable the Slf4jLogger in the ``loggers`` element in
diff --git a/akka-docs/rst/scala/persistence.rst b/akka-docs/rst/scala/persistence.rst
index 97ad8e8889..ff38172341 100644
--- a/akka-docs/rst/scala/persistence.rst
+++ b/akka-docs/rst/scala/persistence.rst
@@ -51,7 +51,7 @@ in-memory heap based journal, local file-system based snapshot-store and LevelDB
LevelDB based plugins will require the following additional dependency declaration::
"org.iq80.leveldb" % "leveldb" % "0.7"
- "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.7"
+ "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8"
Architecture
============
diff --git a/akka-persistence/src/main/resources/reference.conf b/akka-persistence/src/main/resources/reference.conf
index 933d341e34..a2820916ff 100644
--- a/akka-persistence/src/main/resources/reference.conf
+++ b/akka-persistence/src/main/resources/reference.conf
@@ -166,7 +166,7 @@ akka.persistence.journal.leveldb-shared {
#
# SBT:
# "org.iq80.leveldb" % "leveldb" % "0.7"
-# "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.7"
+# "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8"
#
# Maven:
#
@@ -177,5 +177,5 @@ akka.persistence.journal.leveldb-shared {
#
# org.fusesource.leveldbjni
# leveldbjni-all
-# 1.7
+# 1.8
#
diff --git a/akka-samples/akka-sample-cluster-java/build.sbt b/akka-samples/akka-sample-cluster-java/build.sbt
index bbebc998cd..82a32abfff 100644
--- a/akka-samples/akka-sample-cluster-java/build.sbt
+++ b/akka-samples/akka-sample-cluster-java/build.sbt
@@ -9,7 +9,7 @@ val project = Project(
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-java",
version := "2.4-SNAPSHOT",
- scalaVersion := "2.11.5",
+ scalaVersion := "2.11.6",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
javacOptions in doc in Compile := Seq("-source", "1.8", "-Xdoclint:none"),
diff --git a/akka-samples/akka-sample-cluster-scala/build.sbt b/akka-samples/akka-sample-cluster-scala/build.sbt
index 9ec5792599..f69748d1c0 100644
--- a/akka-samples/akka-sample-cluster-scala/build.sbt
+++ b/akka-samples/akka-sample-cluster-scala/build.sbt
@@ -9,7 +9,7 @@ val project = Project(
settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
name := "akka-sample-cluster-scala",
version := "2.4-SNAPSHOT",
- scalaVersion := "2.11.5",
+ scalaVersion := "2.11.6",
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
libraryDependencies ++= Seq(
diff --git a/akka-samples/akka-sample-main-java-lambda/build.sbt b/akka-samples/akka-sample-main-java-lambda/build.sbt
index 4ebab98512..4d0a3d86ca 100644
--- a/akka-samples/akka-sample-main-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-main-java-lambda/build.sbt
@@ -2,7 +2,7 @@ name := "akka-sample-main-java-lambda"
version := "1.0"
-scalaVersion := "2.11.5"
+scalaVersion := "2.11.6"
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
index cad80b2d6f..280d9e2172 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
@@ -22,7 +22,7 @@
2.2.3
1.2.1
0.7
- 1.7
+ 1.8
1.2.2
diff --git a/akka-samples/akka-sample-persistence-java-lambda/build.sbt b/akka-samples/akka-sample-persistence-java-lambda/build.sbt
index ca45c9fa46..15c6f05251 100644
--- a/akka-samples/akka-sample-persistence-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-persistence-java-lambda/build.sbt
@@ -2,7 +2,7 @@ name := "akka-sample-persistence-java-lambda"
version := "1.0"
-scalaVersion := "2.11.5"
+scalaVersion := "2.11.6"
javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8", "-Xlint")
diff --git a/akka-samples/akka-sample-persistence-java-lambda/pom.xml b/akka-samples/akka-sample-persistence-java-lambda/pom.xml
index 30497d04be..8b8db9afcc 100644
--- a/akka-samples/akka-sample-persistence-java-lambda/pom.xml
+++ b/akka-samples/akka-sample-persistence-java-lambda/pom.xml
@@ -32,7 +32,7 @@
junit
junit
- 4.11
+ 4.12
test
diff --git a/akka-samples/akka-sample-supervision-java-lambda/build.sbt b/akka-samples/akka-sample-supervision-java-lambda/build.sbt
index ccf1af4a19..706c200805 100644
--- a/akka-samples/akka-sample-supervision-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-supervision-java-lambda/build.sbt
@@ -2,7 +2,7 @@ name := "akka-supervision-java-lambda"
version := "1.0"
-scalaVersion := "2.11.5"
+scalaVersion := "2.11.6"
javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8", "-Xlint")
@@ -13,5 +13,5 @@ testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a")
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",
"com.typesafe.akka" %% "akka-testkit" % "2.4-SNAPSHOT" % "test",
- "junit" % "junit" % "4.11" % "test",
- "com.novocode" % "junit-interface" % "0.10" % "test")
+ "junit" % "junit" % "4.12" % "test",
+ "com.novocode" % "junit-interface" % "0.11" % "test")
diff --git a/akka-samples/akka-sample-supervision-java-lambda/pom.xml b/akka-samples/akka-sample-supervision-java-lambda/pom.xml
index 462739c6f6..639f639b32 100644
--- a/akka-samples/akka-sample-supervision-java-lambda/pom.xml
+++ b/akka-samples/akka-sample-supervision-java-lambda/pom.xml
@@ -27,7 +27,7 @@
junit
junit
- 4.11
+ 4.12
test
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 86523090a4..12b7aae318 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -12,22 +12,22 @@ object Dependencies {
val scalaVersion = crossScala.head
val scalaStmVersion = sys.props.get("akka.build.scalaStmVersion").getOrElse("0.7")
val scalaTestVersion = sys.props.get("akka.build.scalaTestVersion").getOrElse("2.2.4")
- val scalaCheckVersion = sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.11.3")
+ val scalaCheckVersion = sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.11.6")
}
object Compile {
import Versions._
// Compile
- val camelCore = "org.apache.camel" % "camel-core" % "2.13.0" exclude("org.slf4j", "slf4j-api") // ApacheV2
+ val camelCore = "org.apache.camel" % "camel-core" % "2.13.4" exclude("org.slf4j", "slf4j-api") // ApacheV2
// when updating config version, update links ActorSystem ScalaDoc to link to the updated version
val config = "com.typesafe" % "config" % "1.2.1" // ApacheV2
- val netty = "io.netty" % "netty" % "3.8.0.Final" // ApacheV2
+ val netty = "io.netty" % "netty" % "3.10.3.Final" // ApacheV2
val protobuf = "com.google.protobuf" % "protobuf-java" % "2.5.0" // New BSD
val scalaStm = "org.scala-stm" %% "scala-stm" % scalaStmVersion // Modified BSD (Scala)
- val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.7" // MIT
+ val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.12" // MIT
// mirrored in OSGi sample
val uncommonsMath = "org.uncommons.maths" % "uncommons-maths" % "1.2.2a" exclude("jfree", "jcommon") exclude("jfree", "jfreechart") // ApacheV2
val osgiCore = "org.osgi" % "org.osgi.core" % "4.3.1" // ApacheV2
@@ -37,31 +37,31 @@ object Dependencies {
val sigar = "org.fusesource" % "sigar" % "1.6.4" // ApacheV2
object Test {
- val commonsMath = "org.apache.commons" % "commons-math" % "2.1" % "test" // ApacheV2
+ val commonsMath = "org.apache.commons" % "commons-math" % "2.2" % "test" // ApacheV2
val commonsIo = "commons-io" % "commons-io" % "2.4" % "test" // ApacheV2
- val commonsCodec = "commons-codec" % "commons-codec" % "1.7" % "test" // ApacheV2
- val junit = "junit" % "junit" % "4.10" % "test" // Common Public License 1.0
- val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" % "test" // EPL 1.0 / LGPL 2.1
- val mockito = "org.mockito" % "mockito-all" % "1.9.5" % "test" // MIT
+ val commonsCodec = "commons-codec" % "commons-codec" % "1.10" % "test" // ApacheV2
+ val junit = "junit" % "junit" % "4.12" % "test" // Common Public License 1.0
+ val logback = "ch.qos.logback" % "logback-classic" % "1.1.3" % "test" // EPL 1.0 / LGPL 2.1
+ val mockito = "org.mockito" % "mockito-all" % "1.10.19" % "test" // MIT
// changing the scalatest dependency must be reflected in akka-docs/rst/dev/multi-jvm-testing.rst
val scalatest = "org.scalatest" %% "scalatest" % scalaTestVersion % "test" // ApacheV2
val scalacheck = "org.scalacheck" %% "scalacheck" % scalaCheckVersion % "test" // New BSD
val pojosr = "com.googlecode.pojosr" % "de.kalpatec.pojosr.framework" % "0.2.1" % "test" // ApacheV2
val tinybundles = "org.ops4j.pax.tinybundles" % "tinybundles" % "1.0.0" % "test" // ApacheV2
val log4j = "log4j" % "log4j" % "1.2.14" % "test" // ApacheV2
- val junitIntf = "com.novocode" % "junit-interface" % "0.8" % "test" // MIT
- val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.0.1" % "test"
+ val junitIntf = "com.novocode" % "junit-interface" % "0.11" % "test" // MIT
+ val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.0.4" % "test"
// metrics, measurements, perf testing
- val metrics = "com.codahale.metrics" % "metrics-core" % "3.0.1" % "test" // ApacheV2
- val metricsJvm = "com.codahale.metrics" % "metrics-jvm" % "3.0.1" % "test" // ApacheV2
+ val metrics = "com.codahale.metrics" % "metrics-core" % "3.0.2" % "test" // ApacheV2
+ val metricsJvm = "com.codahale.metrics" % "metrics-jvm" % "3.0.2" % "test" // ApacheV2
val latencyUtils = "org.latencyutils" % "LatencyUtils" % "1.0.3" % "test" // Free BSD
val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.1.4" % "test" // CC0
val metricsAll = Seq(metrics, metricsJvm, latencyUtils, hdrHistogram)
// sigar logging
- val slf4jJul = "org.slf4j" % "jul-to-slf4j" % "1.7.7" % "test" // MIT
- val slf4jLog4j = "org.slf4j" % "log4j-over-slf4j" % "1.7.7" % "test" // MIT
+ val slf4jJul = "org.slf4j" % "jul-to-slf4j" % "1.7.12" % "test" // MIT
+ val slf4jLog4j = "org.slf4j" % "log4j-over-slf4j" % "1.7.12" % "test" // MIT
}
object Provided {
@@ -69,7 +69,7 @@ object Dependencies {
val sigarLoader = "io.kamon" % "sigar-loader" % "1.6.5-rev001" % "optional;provided;test" // ApacheV2
val levelDB = "org.iq80.leveldb" % "leveldb" % "0.7" % "optional;provided" // ApacheV2
- val levelDBNative = "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.7" % "optional;provided" // New BSD
+ val levelDBNative = "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8" % "optional;provided" // New BSD
}
}
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ac023ca4fe..32e950f1e7 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,7 @@
resolvers += Classpaths.typesafeResolver
resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
+
// need this to resolve http://jcenter.bintray.com/org/jenkins-ci/jenkins/1.26/
// which is used by plugin "org.kohsuke" % "github-api" % "1.68"
resolvers += "Bintray Jcenter" at "https://jcenter.bintray.com/"
@@ -40,3 +41,4 @@ libraryDependencies += "org.kohsuke" % "github-api" % "1.68"
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.9")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.8")