Clean up POM for ASF standard
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/edba148e Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/edba148e Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/edba148e Branch: refs/heads/release/0.10.0 Commit: edba148e91448c85bf80589126e83d39aa222c10 Parents: ae97760 Author: Donald Szeto <[email protected]> Authored: Sun Sep 11 23:20:21 2016 -0700 Committer: Donald Szeto <[email protected]> Committed: Sun Sep 11 23:20:21 2016 -0700 ---------------------------------------------------------------------- .travis.yml | 6 ++-- build.sbt | 33 +++++++++++++------- common/build.sbt | 5 ++- core/build.sbt | 4 ++- data/build.sbt | 4 ++- e2/build.sbt | 4 ++- project/Build.scala | 3 ++ .../engines/recommendation-engine/build.sbt | 6 ++-- tools/build.sbt | 4 ++- 9 files changed, 45 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/edba148e/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index e03468f..de661c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,8 @@ # branches: - only: - - master - - develop - - testing-infrastructure + except: + - livedoc language: scala http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/edba148e/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index c053502..6c33567 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ import UnidocKeys._ -name := "pio" +name := "predictionio-parent" version in ThisBuild := "0.10.0-incubating-rc1" @@ -161,28 +161,37 @@ pioUnidoc := { IO.read(baseDirectory.value / "docs" / "scaladoc" / "api-docs.js")) } -pomExtra in ThisBuild := { - <url>http://predictionio.incubator.apache.org</url> - <licenses> - <license> - <name>Apache 2</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> +homepage := Some(url("http://predictionio.incubator.apache.org";)) + +pomExtra := { + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>18</version> + </parent> <scm> <connection>scm:git:github.com/apache/incubator-predictionio</connection> - <developerConnection>scm:git:[email protected]:apache/incubator-predictionio.git</developerConnection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-predictionio.git</developerConnection> <url>github.com/apache/incubator-predictionio</url> </scm> <developers> <developer> - <id>pio</id> - <name>The PredictionIO Team</name> + <id>donald</id> + <name>Donald Szeto</name> <url>http://predictionio.incubator.apache.org</url> + <email>[email protected]</email> </developer> </developers> } +childrenPomExtra in ThisBuild := { + <parent> + <groupId>org.apache.predictionio</groupId> + <artifactId>predictionio-parent_{scalaBinaryVersion.value}</artifactId> + <version>{version.value}</version> + </parent> +} + concurrentRestrictions in Global := Seq( Tags.limit(Tags.CPU, 1), Tags.limit(Tags.Network, 1), http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/edba148e/common/build.sbt ---------------------------------------------------------------------- diff --git a/common/build.sbt b/common/build.sbt index bfabe34..74fde2a 100644 --- a/common/build.sbt +++ b/common/build.sbt @@ -15,9 +15,12 @@ * limitations under the License. */ -name := "common" +name := "predictionio-common" + libraryDependencies ++= Seq( "io.spray" %% "spray-can" % "1.3.2", "io.spray" %% "spray-routing" % "1.3.2", "org.spark-project.akka" %% "akka-actor" % "2.3.4-spark" ) + +pomExtra := childrenPomExtra.value http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/edba148e/core/build.sbt ---------------------------------------------------------------------- diff --git a/core/build.sbt b/core/build.sbt index 27f3e9f..537f1a7 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -15,7 +15,7 @@ * limitations under the License. */ -name := "core" +name := "predictionio-core" libraryDependencies ++= Seq( "com.github.scopt" %% "scopt" % "3.3.0", @@ -43,3 +43,5 @@ libraryDependencies ++= Seq( //testOptions := Seq(Tests.Filter(s => Seq("Dev").exists(s.contains(_)))) parallelExecution in Test := false + +pomExtra := childrenPomExtra.value http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/edba148e/data/build.sbt ---------------------------------------------------------------------- diff --git a/data/build.sbt b/data/build.sbt index fdd1baa..f15e86c 100644 --- a/data/build.sbt +++ b/data/build.sbt @@ -15,7 +15,7 @@ * limitations under the License. */ -name := "data" +name := "predictionio-data" libraryDependencies ++= Seq( "com.github.nscala-time" %% "nscala-time" % "2.6.0", @@ -54,3 +54,5 @@ libraryDependencies ++= Seq( "org.specs2" %% "specs2" % "2.3.13" % "test") parallelExecution in Test := false + +pomExtra := childrenPomExtra.value http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/edba148e/e2/build.sbt ---------------------------------------------------------------------- diff --git a/e2/build.sbt b/e2/build.sbt index 4655332..b220924 100644 --- a/e2/build.sbt +++ b/e2/build.sbt @@ -15,7 +15,7 @@ * limitations under the License. */ -name := "e2" +name := "predictionio-e2" parallelExecution in Test := false @@ -24,3 +24,5 @@ libraryDependencies ++= Seq( "org.apache.spark" %% "spark-mllib" % sparkVersion.value % "provided", "org.clapper" %% "grizzled-slf4j" % "1.0.2", "org.scalatest" %% "scalatest" % "2.2.5" % "test") + +pomExtra := childrenPomExtra.value http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/edba148e/project/Build.scala ---------------------------------------------------------------------- diff --git a/project/Build.scala b/project/Build.scala index 911d87f..885073a 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -28,4 +28,7 @@ object PIOBuild extends Build { val sparkVersion = SettingKey[String]( "spark-version", "The version of Apache Spark used for building.") + val childrenPomExtra = SettingKey[scala.xml.NodeSeq]( + "children-pom-extra", + "Extra POM data for children projects.") } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/edba148e/tests/pio_tests/engines/recommendation-engine/build.sbt ---------------------------------------------------------------------- diff --git a/tests/pio_tests/engines/recommendation-engine/build.sbt b/tests/pio_tests/engines/recommendation-engine/build.sbt index b75c16b..7650e15 100644 --- a/tests/pio_tests/engines/recommendation-engine/build.sbt +++ b/tests/pio_tests/engines/recommendation-engine/build.sbt @@ -24,6 +24,6 @@ name := "template-scala-parallel-recommendation" organization := "org.apache.predictionio" libraryDependencies ++= Seq( - "org.apache.predictionio" %% "core" % pioVersion.value % "provided", - "org.apache.spark" %% "spark-core" % "1.3.0" % "provided", - "org.apache.spark" %% "spark-mllib" % "1.3.0" % "provided") + "org.apache.predictionio" %% "predictionio-core" % pioVersion.value % "provided", + "org.apache.spark" %% "spark-core" % "1.3.0" % "provided", + "org.apache.spark" %% "spark-mllib" % "1.3.0" % "provided") http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/edba148e/tools/build.sbt ---------------------------------------------------------------------- diff --git a/tools/build.sbt b/tools/build.sbt index c89cf4e..e8c12a8 100644 --- a/tools/build.sbt +++ b/tools/build.sbt @@ -17,7 +17,7 @@ import sbtassembly.AssemblyPlugin.autoImport._ -name := "tools" +name := "predictionio-tools" libraryDependencies ++= Seq( "com.github.scopt" %% "scopt" % "3.2.0", @@ -65,3 +65,5 @@ outputPath in assembly := baseDirectory.value.getAbsoluteFile.getParentFile / "assembly" / ("pio-assembly-" + version.value + ".jar") cleanFiles <+= baseDirectory { base => base.getParentFile / "assembly" } + +pomExtra := childrenPomExtra.value
