=pro clean up build

- move license and homepage into build definition
- enable sbt-license-report plugin to properly pick it up
- remove hand-coded XML (always a good idea)
- remove ls.implicity.ly plugin
- remove STM reference from README
This commit is contained in:
Roland Kuhn 2013-11-27 10:50:41 +01:00
parent f5791a2c35
commit 88b123ed5e
4 changed files with 5 additions and 21 deletions

View file

@ -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.
Learn more at "http://akka.io":http://akka.io.

View file

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

View file

@ -29,14 +29,6 @@ object Publish {
def akkaPomExtra = {
(<inceptionYear>2009</inceptionYear>
<url>http://akka.io</url>
<licenses>
<license>
<name>Apache 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>git://github.com/akka/akka.git</url>
<connection>scm:git:git@github.com:akka/akka.git</connection>

View file

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