This is an automated email from the ASF dual-hosted git repository. rawkintrevo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mahout.git
commit 0e97d216288cb529948d3a95b54985a8993d8530 Author: Trevor a.k.a @rawkintrevo <[email protected]> AuthorDate: Fri Feb 22 12:10:33 2019 -0600 HOTFIX: Making build work --- community/pom.xml | 6 ------ community/spark-cli-drivers/pom.xml | 1 + engine/spark/pom.xml | 24 ------------------------ pom.xml | 7 +++++++ 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/community/pom.xml b/community/pom.xml index 98bd33e..b7fc1c1 100644 --- a/community/pom.xml +++ b/community/pom.xml @@ -67,12 +67,6 @@ </profile> <profile> <id>spark-cli-drivers</id> - <activation> - <property> - <name>skipCli</name> - <value>!true</value> - </property> - </activation> <modules> <module>spark-cli-drivers</module> </modules> diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml index 5eea0ce..5df7fbd 100644 --- a/community/spark-cli-drivers/pom.xml +++ b/community/spark-cli-drivers/pom.xml @@ -111,6 +111,7 @@ <configuration> <tasks> <copy file="target/spark-cli-drivers_${scala.compat.version}-${project.version}.jar" tofile="../../lib/spark-cli-drivers_${scala.compat.version}-${project.version}.jar" /> + <copy file="target/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" tofile="../../lib/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" /> </tasks> </configuration> <goals> diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml index a70fefb..7ad27f4 100644 --- a/engine/spark/pom.xml +++ b/engine/spark/pom.xml @@ -108,28 +108,6 @@ </executions> </plugin> - <!-- create an all dependencies job.jar --> - <!-- todo: before release we need a better way to do this MAHOUT-1636 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>dependency-reduced</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/dependency-reduced.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - - <!-- copy jars to top directory, which is MAHOUT_HOME --> <plugin> <artifactId>maven-antrun-plugin</artifactId> @@ -140,9 +118,7 @@ <phase>package</phase> <configuration> <tasks> - <!--<copy file="target/spark_${scala.compat.version}-${project.version}-spark_${spark.compat.version}.jar" tofile="../../lib/spark_${scala.compat.version}-${project.version}-spark_${spark.compat.version}.jar" />--> <copy file="target/spark_${scala.compat.version}-${project.version}.jar" tofile="../../lib/spark_${scala.compat.version}-${project.version}.jar" /> - <copy file="target/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" tofile="../../lib/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" /> </tasks> </configuration> <goals> diff --git a/pom.xml b/pom.xml index bb9334d..28334cf 100644 --- a/pom.xml +++ b/pom.xml @@ -415,6 +415,7 @@ <profile> <id>all</id> <modules> + <module>community/spark-cli-drivers</module> <module>community/community-engines</module> <module>community/community-engines/flink-batch</module> <module>community/community-engines/h2o</module> @@ -551,6 +552,12 @@ </reporting> </profile> <profile> + <id>spark-cli-drivers</id> + <modules> + <module>community/spark-cli-drivers</module> + </modules> + </profile> + <profile> <id>viennacl</id> <modules> <module>experimental/viennacl</module>
