Fix issue for some parent poms (#295) Change-Id: Ibf549db71b0f6dfc2004c3ff602e92860a38a093
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/14c29e4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/14c29e4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/14c29e4d Branch: refs/heads/master Commit: 14c29e4d425f44d1f3caad1469a2ea4e136f0f44 Parents: ed1c86e Author: Saisai Shao <sai.sai.s...@gmail.com> Authored: Mon Feb 20 16:37:26 2017 +0800 Committer: Jeff Zhang <zjf...@gmail.com> Committed: Mon Feb 20 16:37:26 2017 +0800 ---------------------------------------------------------------------- core/pom.xml | 16 ------- core/scala-2.10/pom.xml | 17 ++++++++ core/scala-2.11/pom.xml | 17 ++++++++ core/src/main/resources/build.marker | 0 .../src/main/resources/build.marker | 0 pom.xml | 44 +++++++++++++++----- repl/src/main/resources/build.marker | 0 .../cloudera/livy/repl/ProcessInterpreter.scala | 2 +- .../com/cloudera/livy/repl/ReplDriver.scala | 2 +- .../cloudera/livy/repl/SparkRInterpreter.scala | 2 +- .../livy/repl/PythonInterpreterSpec.scala | 2 +- scala-api/src/main/resources/build.marker | 0 scala/pom.xml | 13 ------ 13 files changed, 72 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index ae2be28..75da834 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -68,20 +68,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/core/scala-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/core/scala-2.10/pom.xml b/core/scala-2.10/pom.xml index 27fbcba..6ac60d6 100644 --- a/core/scala-2.10/pom.xml +++ b/core/scala-2.10/pom.xml @@ -34,4 +34,21 @@ <scala.version>${scala-2.10.version}</scala.version> <scala.binary.version>2.10</scala.binary.version> </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/core/scala-2.11/pom.xml ---------------------------------------------------------------------- diff --git a/core/scala-2.11/pom.xml b/core/scala-2.11/pom.xml index afb0c77..e9e57df 100644 --- a/core/scala-2.11/pom.xml +++ b/core/scala-2.11/pom.xml @@ -34,4 +34,21 @@ <scala.version>${scala-2.11.version}</scala.version> <scala.binary.version>2.11</scala.binary.version> </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/core/src/main/resources/build.marker ---------------------------------------------------------------------- diff --git a/core/src/main/resources/build.marker b/core/src/main/resources/build.marker new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/integration-test/minicluster-dependencies/src/main/resources/build.marker ---------------------------------------------------------------------- diff --git a/integration-test/minicluster-dependencies/src/main/resources/build.marker b/integration-test/minicluster-dependencies/src/main/resources/build.marker new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8868d35..fbc4d84 100644 --- a/pom.xml +++ b/pom.xml @@ -180,18 +180,23 @@ <module>assembly</module> <module>client-common</module> <module>client-http</module> + <module>core</module> <module>core/scala-2.10</module> <module>core/scala-2.11</module> <module>coverage</module> <module>examples</module> <module>python-api</module> + <module>repl</module> <module>repl/scala-2.10</module> <module>repl/scala-2.11</module> <module>rsc</module> + <module>scala</module> + <module>scala-api</module> <module>scala-api/scala-2.10</module> <module>scala-api/scala-2.11</module> <module>server</module> <module>test-lib</module> + <module>integration-test/minicluster-dependencies</module> <module>integration-test/minicluster-dependencies/scala-2.10</module> <module>integration-test/minicluster-dependencies/scala-2.11</module> <module>integration-test</module> @@ -622,6 +627,13 @@ <goal>testCompile</goal> </goals> </execution> + <execution> + <id>scala-compile-first</id> + <phase>process-resources</phase> + <goals> + <goal>compile</goal> + </goals> + </execution> </executions> <configuration> <scalaVersion>${scala.version}</scalaVersion> @@ -789,11 +801,6 @@ </plugin> <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> @@ -933,11 +940,6 @@ </plugin> <plugin> - <groupId>org.scalatest</groupId> - <artifactId>scalatest-maven-plugin</artifactId> - </plugin> - - <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> <version>0.7.7.201606060606</version> @@ -1017,6 +1019,28 @@ <spark.version>2.1.0</spark.version> </properties> </profile> + + <profile> + <id>skip-parent-modules</id> + <activation> + <file> + <missing>src/main/resources/build.marker</missing> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.scalatest</groupId> + <artifactId>scalatest-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/repl/src/main/resources/build.marker ---------------------------------------------------------------------- diff --git a/repl/src/main/resources/build.marker b/repl/src/main/resources/build.marker new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/repl/src/main/scala/com/cloudera/livy/repl/ProcessInterpreter.scala ---------------------------------------------------------------------- diff --git a/repl/src/main/scala/com/cloudera/livy/repl/ProcessInterpreter.scala b/repl/src/main/scala/com/cloudera/livy/repl/ProcessInterpreter.scala index 25a8654..c4fb8ca 100644 --- a/repl/src/main/scala/com/cloudera/livy/repl/ProcessInterpreter.scala +++ b/repl/src/main/scala/com/cloudera/livy/repl/ProcessInterpreter.scala @@ -18,7 +18,7 @@ package com.cloudera.livy.repl -import java.io.{BufferedReader, IOException, InputStreamReader, PrintWriter} +import java.io.{BufferedReader, InputStreamReader, IOException, PrintWriter} import java.util.concurrent.locks.ReentrantLock import scala.concurrent.Promise http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/repl/src/main/scala/com/cloudera/livy/repl/ReplDriver.scala ---------------------------------------------------------------------- diff --git a/repl/src/main/scala/com/cloudera/livy/repl/ReplDriver.scala b/repl/src/main/scala/com/cloudera/livy/repl/ReplDriver.scala index 8c705fc..c176412 100644 --- a/repl/src/main/scala/com/cloudera/livy/repl/ReplDriver.scala +++ b/repl/src/main/scala/com/cloudera/livy/repl/ReplDriver.scala @@ -26,8 +26,8 @@ import org.apache.spark.SparkConf import org.apache.spark.api.java.JavaSparkContext import com.cloudera.livy.Logging -import com.cloudera.livy.rsc.BaseProtocol.ReplState import com.cloudera.livy.rsc.{BaseProtocol, ReplJobResults, RSCConf} +import com.cloudera.livy.rsc.BaseProtocol.ReplState import com.cloudera.livy.rsc.driver._ import com.cloudera.livy.rsc.rpc.Rpc import com.cloudera.livy.sessions._ http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/repl/src/main/scala/com/cloudera/livy/repl/SparkRInterpreter.scala ---------------------------------------------------------------------- diff --git a/repl/src/main/scala/com/cloudera/livy/repl/SparkRInterpreter.scala b/repl/src/main/scala/com/cloudera/livy/repl/SparkRInterpreter.scala index 6c42fe3..cc57d72 100644 --- a/repl/src/main/scala/com/cloudera/livy/repl/SparkRInterpreter.scala +++ b/repl/src/main/scala/com/cloudera/livy/repl/SparkRInterpreter.scala @@ -28,9 +28,9 @@ import scala.collection.JavaConverters._ import scala.reflect.runtime.universe import org.apache.commons.codec.binary.Base64 +import org.apache.commons.lang.StringEscapeUtils import org.apache.spark.{SparkConf, SparkContext} import org.apache.spark.util.{ChildFirstURLClassLoader, MutableURLClassLoader, Utils} -import org.apache.commons.lang.StringEscapeUtils import org.json4s._ import org.json4s.JsonDSL._ http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/repl/src/test/scala/com/cloudera/livy/repl/PythonInterpreterSpec.scala ---------------------------------------------------------------------- diff --git a/repl/src/test/scala/com/cloudera/livy/repl/PythonInterpreterSpec.scala b/repl/src/test/scala/com/cloudera/livy/repl/PythonInterpreterSpec.scala index a2733ab..00bbc68 100644 --- a/repl/src/test/scala/com/cloudera/livy/repl/PythonInterpreterSpec.scala +++ b/repl/src/test/scala/com/cloudera/livy/repl/PythonInterpreterSpec.scala @@ -19,7 +19,7 @@ package com.cloudera.livy.repl import org.apache.spark.SparkConf -import org.json4s.{DefaultFormats, JValue, JNull} +import org.json4s.{DefaultFormats, JNull, JValue} import org.json4s.JsonDSL._ import org.scalatest._ http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/scala-api/src/main/resources/build.marker ---------------------------------------------------------------------- diff --git a/scala-api/src/main/resources/build.marker b/scala-api/src/main/resources/build.marker new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/14c29e4d/scala/pom.xml ---------------------------------------------------------------------- diff --git a/scala/pom.xml b/scala/pom.xml index 447c341..2d25d9d 100644 --- a/scala/pom.xml +++ b/scala/pom.xml @@ -100,19 +100,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <id>scala-compile-first</id> - <phase>process-resources</phase> - <goals> - <goal>compile</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build>
