diff --git a/README.textile b/README.textile index b4882ad18c..e244f7bfd4 100644 --- a/README.textile +++ b/README.textile @@ -4,7 +4,7 @@ We believe that writing correct concurrent, fault-tolerant and scalable applicat Akka is here to change that. -Using the Actor Model together with Software Transactional Memory we raise the abstraction level and provide a better platform to build correct concurrent and scalable applications. +Using the Actor Model we raise the abstraction level and provide a better platform to build correct concurrent and scalable applications. For fault-tolerance we adopt the "Let it crash" model which the telecom industry has used with great success to build applications that self-heal and systems that never stop. @@ -12,4 +12,4 @@ Actors also provide the abstraction for transparent distribution and the basis f Akka is Open Source and available under the Apache 2 License. -Learn more at "http://akka.io":http://akka.io. \ No newline at end of file +Learn more at "http://akka.io":http://akka.io. diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 4e809bb370..fe2d87e250 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -18,9 +18,7 @@ import com.typesafe.sbt.SbtSite.site import com.typesafe.sbt.site.SphinxSupport import com.typesafe.sbt.site.SphinxSupport.{ enableOutput, generatePdf, generatedPdf, generateEpub, generatedEpub, sphinxInputs, sphinxPackages, Sphinx } import com.typesafe.sbt.preprocess.Preprocess.{ preprocess, preprocessExts, preprocessVars, simplePreprocess } -import ls.Plugin.{ lsSettings, LsKeys } import java.lang.Boolean.getBoolean -import LsKeys.{ lsync, docsUrl => lsDocsUrl, tags => lsTags } import java.io.{PrintWriter, InputStreamReader, FileInputStream, File} import java.nio.charset.Charset import java.util.Properties @@ -798,7 +796,7 @@ object AkkaBuild extends Build { else Seq.empty } - lazy val defaultSettings = baseSettings ++ mimaSettings ++ lsSettings ++ resolverSettings ++ + lazy val defaultSettings = baseSettings ++ mimaSettings ++ resolverSettings ++ Protobuf.settings ++ Seq( // compile options scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"), @@ -809,12 +807,8 @@ object AkkaBuild extends Build { ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet, - description in lsync := "Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM.", - homepage in lsync := Some(url("http://akka.io")), - lsTags in lsync := Seq("actors", "stm", "concurrency", "distributed", "fault-tolerance", "scala", "java", "futures", "dataflow", "remoting"), - lsDocsUrl in lsync := Some(url("http://akka.io/docs")), - licenses in lsync := Seq(("Apache 2", url("http://www.apache.org/licenses/LICENSE-2.0.html"))), - externalResolvers in lsync := Seq("Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases"), + licenses := Seq(("Apache License, Version 2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))), + homepage := Some(url("http://akka.io/")), initialCommands := """|import language.postfixOps diff --git a/project/Publish.scala b/project/Publish.scala index 673827087a..3b47e1bfdb 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -29,14 +29,6 @@ object Publish { def akkaPomExtra = { (2009 - http://akka.io - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - git://github.com/akka/akka.git scm:git:git@github.com:akka/akka.git diff --git a/project/plugins.sbt b/project/plugins.sbt index 1c085aefa1..99dd090fec 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -14,8 +14,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.6.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6") -addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3") - addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1") addSbtPlugin("com.typesafe.sbt" % "sbt-s3" % "0.5")