Clean up POM for ASF standard

steveny2k · Sep 12, 2016 · edba148 · edba148
1 parent ae97760
commit edba148
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,10 +24,8 @@
 #
 
 branches:
- only:
- - master
- - develop
- - testing-infrastructure
+ except:
+ - livedoc
 
 language: scala
 

diff --git 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:https://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:git@github.com: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>donald@apache.org</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),

diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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.")
 }
diff --git 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")
diff --git 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