raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=pro #16695 Update dependencies

Browse source 
io.netty:netty: 3.8.0.Final -> 3.10.3.Final
org.slf4j:slf4j-api: 1.7.7 -> 1.7.12
org.fusesource.leveldbjni:leveldbjni-all:optional;provided: 1.7 -> 1.8
org.apache.camel:camel-core: 2.13.0 -> 2.13.4

ch.qos.logback:logback-classic:test: 1.0.13 -> 1.1.3
junit:junit:test: 4.10 -> 4.12
org.scalatest:scalatest:test: 2.1.3 -> 2.2.4
org.mockito:mockito-all:test: 1.9.5 -> 1.10.19
org.scala-lang.modules:scala-xml:test: 1.0.1 -> 1.0.4
com.novocode:junit-interface:test : 0.8 -> 0.11
org.slf4j:jul-to-slf4j:test: 1.7.7  -> 1.7.12
org.slf4j:log4j-over-slf4j:test: 1.7.7  -> 1.7.12
com.codahale.metrics:metrics-core:test: 3.0.1  -> 3.0.2
com.codahale.metrics:metrics-jvm:test: 3.0.1  -> 3.0.2
org.scalacheck:scalacheck:test: 1.11.3 -> 1.11.6
org.apache.commons:commons-math:test: 2.1 -> 2.2
commons-codec:commons-codec:test: 1.7 -> 1.10
This commit is contained in:
Patrik Nordwall 2015-05-08 16:35:29 +02:00
parent ebc39ef9ab
commit a8687f9c4e
17 changed files with 41 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/rst/java/lambda-persistence.rst
View file

@ -61,7 +61,7 @@ LevelDB based plugins will require the following additional dependency declarati
<dependency>
<groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-all</artifactId>
<version>1.7</version>
<version>1.8</version>
</dependency>
Architecture

2
akka-docs/rst/java/logging.rst
View file

@ -268,7 +268,7 @@ It has one single dependency; the slf4j-api jar. In runtime you also need a SLF4
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.13</version>
<version>1.1.3</version>
</dependency>
You need to enable the Slf4jLogger in the ``loggers`` element in

2
akka-docs/rst/java/persistence.rst
View file

@ -65,7 +65,7 @@ LevelDB based plugins will require the following additional dependency declarati
<dependency>
<groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-all</artifactId>
<version>1.7</version>
<version>1.8</version>
</dependency>
Architecture

6
akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst
View file

@ -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
========================================

2
akka-docs/rst/scala/logging.rst
View file

@ -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

2
akka-docs/rst/scala/persistence.rst
View file

@ -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
============

4
akka-persistence/src/main/resources/reference.conf
View file

@ -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:
# <dependency>
@ -177,5 +177,5 @@ akka.persistence.journal.leveldb-shared {
# <dependency>
# <groupId>org.fusesource.leveldbjni</groupId>
# <artifactId>leveldbjni-all</artifactId>
# <version>1.7</version>
# <version>1.8</version>
# </dependency>

2
akka-samples/akka-sample-cluster-java/build.sbt
View file

@ -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"),

2
akka-samples/akka-sample-cluster-scala/build.sbt
View file

@ -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(

2
akka-samples/akka-sample-main-java-lambda/build.sbt
View file

@ -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"

2
akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
View file

@ -22,7 +22,7 @@
<scalatest.version>2.2.3</scalatest.version>
<typesafe.config.version>1.2.1</typesafe.config.version>
<leveldb.version>0.7</leveldb.version>
<leveldbjni.version>1.7</leveldbjni.version>
<leveldbjni.version>1.8</leveldbjni.version>
<uncommons-maths.version>1.2.2</uncommons-maths.version>
</properties>

2
akka-samples/akka-sample-persistence-java-lambda/build.sbt
View file

@ -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")

2
akka-samples/akka-sample-persistence-java-lambda/pom.xml
View file

@ -32,7 +32,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>

6
akka-samples/akka-sample-supervision-java-lambda/build.sbt
View file

@ -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")

2
akka-samples/akka-sample-supervision-java-lambda/pom.xml
View file

@ -27,7 +27,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>

32
project/Dependencies.scala
View file

@ -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
}
}

2
project/plugins.sbt
View file

@ -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")