From ea08994d243a3e7c4f0470c34763bf63540a86c4 Mon Sep 17 00:00:00 2001 From: Roland Date: Fri, 21 Dec 2012 14:53:05 +0100 Subject: [PATCH] update to staged 2.10.0 release, CrossVersion.binary, see #2684 --- akka-contrib/docs/jul.rst | 4 ++-- akka-docs/rst/dev/multi-jvm-testing.rst | 6 +++--- akka-sbt-plugin/sample/project/Build.scala | 6 +++--- project/AkkaBuild.scala | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/akka-contrib/docs/jul.rst b/akka-contrib/docs/jul.rst index b0d1c0a668..3283f94184 100644 --- a/akka-contrib/docs/jul.rst +++ b/akka-contrib/docs/jul.rst @@ -1,5 +1,5 @@ Java Logging (JUL) -================= +================== This extension module provides a logging backend which uses the `java.util.logging` (j.u.l) API to do the endpoint logging for `akka.event.Logging`. @@ -14,4 +14,4 @@ To access the `akka.event.Logging` API from non-Actor code, mix in `akka.contrib This module is preferred over SLF4J with its JDK14 backend, due to integration issues resulting in the incorrect handling of `threadId`, `className` and `methodName`. -This extension module was contributed by Sam Halliday. \ No newline at end of file +This extension module was contributed by Sam Halliday. diff --git a/akka-docs/rst/dev/multi-jvm-testing.rst b/akka-docs/rst/dev/multi-jvm-testing.rst index bee19cbe71..befb4be953 100644 --- a/akka-docs/rst/dev/multi-jvm-testing.rst +++ b/akka-docs/rst/dev/multi-jvm-testing.rst @@ -69,10 +69,10 @@ Here is an example Build.scala file that uses the MultiJvm plugin: // ---- test dependencies ---- "com.typesafe.akka" %% "akka-testkit" % "@version@" % - "test" cross CrossVersion.full, + "test" @crossString@, "com.typesafe.akka" %% "akka-remote-tests-experimental" % "@version@" % - "test" cross CrossVersion.full, - "org.scalatest" %% "scalatest" % "1.8-B2" % "test" cross CrossVersion.full, + "test" @crossString@, + "org.scalatest" %% "scalatest" % "1.8" % "test" cross CrossVersion.full, "junit" % "junit" % "4.5" % "test" ) } diff --git a/akka-sbt-plugin/sample/project/Build.scala b/akka-sbt-plugin/sample/project/Build.scala index 94d85f25a8..c4c37dde1b 100644 --- a/akka-sbt-plugin/sample/project/Build.scala +++ b/akka-sbt-plugin/sample/project/Build.scala @@ -7,7 +7,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions} object HelloKernelBuild extends Build { val Organization = "akka.sample" val Version = "2.2-SNAPSHOT" - val ScalaVersion = "2.10.0-RC5" + val ScalaVersion = "2.10.0" lazy val HelloKernel = Project( id = "hello-kernel", @@ -52,7 +52,7 @@ object Dependency { val Akka = "2.2-SNAPSHOT" } - val akkaKernel = "com.typesafe.akka" %% "akka-kernel" % V.Akka cross CrossVersion.full - val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % V.Akka cross CrossVersion.full + val akkaKernel = "com.typesafe.akka" %% "akka-kernel" % V.Akka + val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % V.Akka val logback = "ch.qos.logback" % "logback-classic" % "1.0.0" } diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 25c4d51005..5771e64e4d 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -36,9 +36,8 @@ object AkkaBuild extends Build { lazy val buildSettings = Seq( organization := "com.typesafe.akka", version := "2.2-SNAPSHOT", - // FIXME: use 2.10.0 for final // Also change ScalaVersion in akka-sbt-plugin/sample/project/Build.scala - scalaVersion := System.getProperty("akka.scalaVersion", "2.10.0-RC5") + scalaVersion := System.getProperty("akka.scalaVersion", "2.10.0") ) lazy val akka = Project( @@ -502,7 +501,8 @@ object AkkaBuild extends Build { scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Ywarn-adapted-args"), javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"), - crossVersion := CrossVersion.full, + // if changing this between binary and full, also change at the bottom of akka-sbt-plugin/sample/project/Build.scala + crossVersion := CrossVersion.binary, ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet, @@ -693,10 +693,10 @@ object Dependencies { val config = "com.typesafe" % "config" % "1.0.0" // ApacheV2 val netty = "io.netty" % "netty" % "3.5.8.Final" // ApacheV2 val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD - val scalaStm = "org.scala-stm" % "scala-stm" % "0.6" cross CrossVersion.full // Modified BSD (Scala) + val scalaStm = "org.scala-stm" % "scala-stm" % "0.6" cross CrossVersion.full // Modified BSD (Scala) val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.2" // MIT - val zeroMQClient = "org.zeromq" % "zeromq-scala-binding" % "0.0.6" cross CrossVersion.full // ApacheV2 + val zeroMQClient = "org.zeromq" % "zeromq-scala-binding_2.10" % "0.0.7" // ApacheV2 val uncommonsMath = "org.uncommons.maths" % "uncommons-maths" % "1.2.2a" exclude("jfree", "jcommon") exclude("jfree", "jfreechart") // ApacheV2 val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint" % "0.3.2" // ApacheV2 val osgiCore = "org.osgi" % "org.osgi.core" % "4.2.0" // ApacheV2 @@ -716,7 +716,7 @@ object Dependencies { val junit = "junit" % "junit" % "4.10" % "test" // Common Public License 1.0 val logback = "ch.qos.logback" % "logback-classic" % "1.0.7" % "test" // EPL 1.0 / LGPL 2.1 val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" // MIT - val scalatest = "org.scalatest" % "scalatest" % "1.8-B1" % "test" cross CrossVersion.full // ApacheV2 + val scalatest = "org.scalatest" % "scalatest" % "1.8" % "test" cross CrossVersion.full // ApacheV2 val scalacheck = "org.scalacheck" % "scalacheck" % "1.10.0" % "test" cross CrossVersion.full // New BSD val ariesProxy = "org.apache.aries.proxy" % "org.apache.aries.proxy.impl" % "0.3" % "test" // ApacheV2 val pojosr = "com.googlecode.pojosr" % "de.kalpatec.pojosr.framework" % "0.1.4" % "test" // ApacheV2