Fix publishing and update organization (groupId)

- fix problem with double organization in pom
- fix scaladoc generation by adding class dir to doc classpath in akka-actor
- update organization to com.typesafe.akka
This commit is contained in:
Peter Vlugter 2011-10-06 15:44:15 +02:00
parent 78193d7a62
commit 972f4b538f
4 changed files with 12 additions and 12 deletions

View file

@ -266,7 +266,7 @@ private[akka] class ActorCell(
subject
}
@deprecated("Dog slow and racy")
@deprecated("Dog slow and racy", "now")
def linkedActors: JCollection[ActorRef] = _linkedActors match {
case Nil JCollections.emptyList[ActorRef]()
case some JCollections.unmodifiableCollection(JavaConverters.asJavaCollectionConverter(some.map(_.child)).asJavaCollection)

View file

@ -53,7 +53,7 @@ object ActorSerialization {
replicationScheme: ReplicationScheme): Array[Byte] =
toBinary(a, srlMailBox, replicationScheme)
@deprecated("BROKEN, REMOVE ME")
@deprecated("BROKEN, REMOVE ME", "NOW")
private[akka] def toSerializedActorRefProtocol[T <: Actor](
actorRef: ActorRef,
serializeMailBox: Boolean,

View file

@ -12,7 +12,7 @@ object AkkaBuild extends Build {
System.setProperty("akka.mode", "test") // Is there better place for this?
lazy val buildSettings = Seq(
organization := "se.scalablesolutions.akka",
organization := "com.typesafe.akka",
version := "2.0-SNAPSHOT",
scalaVersion := "2.9.1"
)
@ -35,7 +35,9 @@ object AkkaBuild extends Build {
settings = defaultSettings ++ Seq(
autoCompilerPlugins := true,
libraryDependencies <+= scalaVersion { v => compilerPlugin("org.scala-lang.plugins" % "continuations" % v) },
scalacOptions += "-P:continuations:enable"
scalacOptions += "-P:continuations:enable",
// to fix scaladoc generation
fullClasspath in doc in Compile <<= fullClasspath in Compile
)
)

View file

@ -11,7 +11,9 @@ object Publish {
crossPaths := false,
pomExtra := akkaPomExtra,
publishTo := akkaPublishTo,
credentials ++= akkaCredentials
credentials ++= akkaCredentials,
organizationName := "Typesafe Inc.",
organizationHomepage := Some(url("http://www.typesafe.com"))
)
lazy val versionSettings = Seq(
@ -21,10 +23,6 @@ object Publish {
def akkaPomExtra = {
<inceptionYear>2009</inceptionYear>
<url>http://akka.io</url>
<organization>
<name>Typesafe Inc.</name>
<url>http://www.typesafe.com</url>
</organization>
<licenses>
<license>
<name>Apache 2</name>