added tests
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/89484d87 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/89484d87 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/89484d87 Branch: refs/heads/master Commit: 89484d8791bbeba6ccd42271de67d76541529100 Parents: 9f83099 Author: rawkintrevo <[email protected]> Authored: Thu Jul 27 23:56:33 2017 -0500 Committer: rawkintrevo <[email protected]> Committed: Thu Jul 27 23:56:33 2017 -0500 ---------------------------------------------------------------------- h2o/pom.xml | 27 ++++++++++++++--- h2o/scala-2.10/pom.xml | 56 ++++++++++++++++++++++++++++++++++++ h2o/scala-2.11/pom.xml | 56 ++++++++++++++++++++++++++++++++++++ math-scala/pom.xml | 12 +++++--- math-scala/scala-2.10/pom.xml | 16 ++++++++++- math-scala/scala-2.11/pom.xml | 35 +++++++++++++++++++++- pom.xml | 2 +- spark/spark-1.6/pom.xml | 3 +- spark/spark-2.0/pom.xml | 3 +- spark/spark-2.1/pom.xml | 3 +- viennacl-omp/scala-2.10/pom.xml | 14 ++++----- viennacl-omp/scala-2.11/pom.xml | 14 ++++----- viennacl/scala-2.10/pom.xml | 12 ++++---- viennacl/scala-2.11/pom.xml | 14 ++++----- 14 files changed, 226 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/h2o/pom.xml ---------------------------------------------------------------------- diff --git a/h2o/pom.xml b/h2o/pom.xml index 6374a70..aefabe1 100644 --- a/h2o/pom.xml +++ b/h2o/pom.xml @@ -27,13 +27,13 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>mahout-h2o_${scala.compat.version}</artifactId> + <artifactId>mahout-h2o</artifactId> <name>Mahout H2O backend</name> <description> H2O Backend for Mahout DSL </description> - <packaging>jar</packaging> + <packaging>pom</packaging> @@ -50,7 +50,7 @@ <phase>package</phase> <configuration> <tasks> - <copy file="target/mahout-h2o_${scala.compat.version}-${version}.jar" tofile="../mahout-h2o_${scala.compat.version}-${version}.jar" /> + <copy file="target/mahout-h2o_${scala.compat.version}-${project.version}.jar" tofile="../mahout-h2o_${scala.compat.version}-${project.version}.jar" /> </tasks> </configuration> <goals> @@ -71,7 +71,7 @@ </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/dependency-reduced.xml</descriptor> + <descriptor>../src/main/assembly/dependency-reduced.xml</descriptor> </descriptors> </configuration> </execution> @@ -239,5 +239,24 @@ </plugins> </build> </profile> + <profile> + <id>all-scala</id> + <modules> + <module>scala-2.10</module> + <module>scala-2.11</module> + </modules> + </profile> + <profile> + <id>scala-2.10</id> + <modules> + <module>scala-2.10</module> + </modules> + </profile> + <profile> + <id>scala-2.11</id> + <modules> + <module>scala-2.11</module> + </modules> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/h2o/scala-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/h2o/scala-2.10/pom.xml b/h2o/scala-2.10/pom.xml new file mode 100644 index 0000000..71177d2 --- /dev/null +++ b/h2o/scala-2.10/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-h2o</artifactId> + <version>0.13.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-h2o_2.10</artifactId> + <name>Mahout H2O Scala 2.10 backend</name> + + + <properties> + <scala.compat.version>2.10</scala.compat.version> + <scala.version>2.10.4</scala.version> + </properties> + + <packaging>jar</packaging> + + <build> + <sourceDirectory>../src/main</sourceDirectory> + <testSourceDirectory>../src/test</testSourceDirectory> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/h2o/scala-2.11/pom.xml ---------------------------------------------------------------------- diff --git a/h2o/scala-2.11/pom.xml b/h2o/scala-2.11/pom.xml new file mode 100644 index 0000000..868c919 --- /dev/null +++ b/h2o/scala-2.11/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-h2o</artifactId> + <version>0.13.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-h2o_2.11</artifactId> + <name>Mahout H2O Scala 2.10 backend</name> + + + <properties> + <scala.compat.version>2.11</scala.compat.version> + <scala.version>2.11.8</scala.version> + </properties> + + <packaging>jar</packaging> + + <build> + <sourceDirectory>../src/main</sourceDirectory> + <testSourceDirectory>../src/test</testSourceDirectory> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/math-scala/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/pom.xml b/math-scala/pom.xml index 966f2bc..9a046c5 100644 --- a/math-scala/pom.xml +++ b/math-scala/pom.xml @@ -45,10 +45,11 @@ <artifactId>maven-jar-plugin</artifactId> <executions> <execution> + <id>test-jar</id> <goals> <goal>test-jar</goal> </goals> - <phase>package</phase> + <!--<phase>package</phase>--> </execution> </executions> </plugin> @@ -67,21 +68,21 @@ <executions> <execution> <id>add-scala-sources</id> - <phase>initialize</phase> + <!--<phase>initialize</phase>--> <goals> <goal>add-source</goal> </goals> </execution> <execution> <id>scala-compile</id> - <phase>process-resources</phase> + <!--<phase>process-resources</phase>--> <goals> <goal>compile</goal> </goals> </execution> <execution> <id>scala-test-compile</id> - <phase>process-test-resources</phase> + <!--<phase>process-test-resources</phase>--> <goals> <goal>testCompile</goal> </goals> @@ -132,6 +133,7 @@ </execution> </executions> </plugin> + <!-- remove jars from top directory on clean --> <plugin> <artifactId>maven-clean-plugin</artifactId> @@ -181,6 +183,8 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.compat.version}</artifactId> + <version>3.0.3</version> + <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/math-scala/scala-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/scala-2.10/pom.xml b/math-scala/scala-2.10/pom.xml index 8a46eed..29ed125 100644 --- a/math-scala/scala-2.10/pom.xml +++ b/math-scala/scala-2.10/pom.xml @@ -38,7 +38,8 @@ <packaging>jar</packaging> <build> - <sourceDirectory>../src/main/scala</sourceDirectory> + <sourceDirectory>../src/main</sourceDirectory> + <testSourceDirectory>../src/test</testSourceDirectory> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> @@ -49,7 +50,20 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>test-jar</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/math-scala/scala-2.11/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/scala-2.11/pom.xml b/math-scala/scala-2.11/pom.xml index 8d4840d..5967fc6 100644 --- a/math-scala/scala-2.11/pom.xml +++ b/math-scala/scala-2.11/pom.xml @@ -38,7 +38,8 @@ <packaging>jar</packaging> <build> - <sourceDirectory>../src/main/scala</sourceDirectory> + <sourceDirectory>../src/main</sourceDirectory> + <testSourceDirectory>../src/test</testSourceDirectory> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> @@ -49,7 +50,39 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + </execution> + </executions> + </plugin> + + + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <executions> + <execution> + <id>add-scala-sources</id> + <phase>initialize</phase> + </execution> + <execution> + <id>scala-compile</id> + <phase>process-resources</phase> + </execution> + <execution> + <id>scala-test-compile</id> + <phase>process-test-resources</phase> + </execution> + </executions> + </plugin> + </plugins> </build> + + </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6a716b0..8f0fa29 100644 --- a/pom.xml +++ b/pom.xml @@ -924,7 +924,7 @@ <profile> <id>scala-2.10</id> <activation> - <property><name>!scala-2.11</name></property> + <property><name>!*scala*</name></property> </activation> <properties> <scala.compat.version>2.10</scala.compat.version> http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/spark/spark-1.6/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-1.6/pom.xml b/spark/spark-1.6/pom.xml index 4dc7fcb..084e456 100644 --- a/spark/spark-1.6/pom.xml +++ b/spark/spark-1.6/pom.xml @@ -42,7 +42,8 @@ </properties> <build> - <sourceDirectory>../src/main/scala</sourceDirectory> + <sourceDirectory>../src/main</sourceDirectory> + <testSourceDirectory>../src/test</testSourceDirectory> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/spark/spark-2.0/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.0/pom.xml b/spark/spark-2.0/pom.xml index 1e10426..2be45a1 100644 --- a/spark/spark-2.0/pom.xml +++ b/spark/spark-2.0/pom.xml @@ -42,7 +42,8 @@ </properties> <build> - <sourceDirectory>../src/main/scala</sourceDirectory> + <sourceDirectory>../src/main</sourceDirectory> + <testSourceDirectory>../src/test</testSourceDirectory> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/spark/spark-2.1/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.1/pom.xml b/spark/spark-2.1/pom.xml index 1de20ca..382cb03 100644 --- a/spark/spark-2.1/pom.xml +++ b/spark/spark-2.1/pom.xml @@ -42,7 +42,8 @@ </properties> <build> - <sourceDirectory>../src/main/scala</sourceDirectory> + <sourceDirectory>../src/main</sourceDirectory> + <testSourceDirectory>../src/test</testSourceDirectory> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/viennacl-omp/scala-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.10/pom.xml b/viennacl-omp/scala-2.10/pom.xml index d4610f1..87f7ae7 100644 --- a/viennacl-omp/scala-2.10/pom.xml +++ b/viennacl-omp/scala-2.10/pom.xml @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.mahout</groupId> - <artifactId>mahout</artifactId> + <artifactId>mahout-native-viennacl-omp</artifactId> <version>0.13.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>mahout-native-viennacl-omp_2.10</artifactId> - <name>Mahout Native VienniaCL OpenMP Bindings</name> + <name>Mahout Native VienniaCL OpenMP Scala 2.10 Bindings</name> <description>Native Structures and interfaces to be used from Mahout math-scala. </description> @@ -182,11 +182,11 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - </plugin> + <!--<plugin>--> + <!--<groupId>org.codehaus.mojo</groupId>--> + <!--<artifactId>exec-maven-plugin</artifactId>--> + <!--<version>1.2.1</version>--> + <!--</plugin>--> <!-- copy jars to top directory, which is MAHOUT_HOME --> <plugin> http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/viennacl-omp/scala-2.11/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/pom.xml b/viennacl-omp/scala-2.11/pom.xml index d3dc5dc..436b446 100644 --- a/viennacl-omp/scala-2.11/pom.xml +++ b/viennacl-omp/scala-2.11/pom.xml @@ -22,14 +22,14 @@ <parent> <groupId>org.apache.mahout</groupId> - <artifactId>mahout</artifactId> + <artifactId>mahout-native-viennacl-omp</artifactId> <version>0.13.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>mahout-native-viennacl-omp_2.11</artifactId> - <name>Mahout Native VienniaCL OpenMP Bindings</name> + <name>Mahout Native VienniaCL OpenMP Scala 2.11 Bindings</name> <description>Native Structures and interfaces to be used from Mahout math-scala. </description> @@ -182,11 +182,11 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - </plugin> + <!--<plugin>--> + <!--<groupId>org.codehaus.mojo</groupId>--> + <!--<artifactId>exec-maven-plugin</artifactId>--> + <!--<version>1.2.1</version>--> + <!--</plugin>--> <!-- copy jars to top directory, which is MAHOUT_HOME --> <plugin> http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/viennacl/scala-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl/scala-2.10/pom.xml b/viennacl/scala-2.10/pom.xml index d886955..41af7b8 100644 --- a/viennacl/scala-2.10/pom.xml +++ b/viennacl/scala-2.10/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.mahout</groupId> - <artifactId>mahout</artifactId> + <artifactId>mahout-native-viennacl</artifactId> <version>0.13.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -182,11 +182,11 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - </plugin> + <!--<plugin>--> + <!--<groupId>org.codehaus.mojo</groupId>--> + <!--<artifactId>exec-maven-plugin</artifactId>--> + <!--<version>1.2.1</version>--> + <!--</plugin>--> <!-- copy jars to top directory, which is MAHOUT_HOME --> <plugin> http://git-wip-us.apache.org/repos/asf/mahout/blob/89484d87/viennacl/scala-2.11/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl/scala-2.11/pom.xml b/viennacl/scala-2.11/pom.xml index b3d13d0..59ba971 100644 --- a/viennacl/scala-2.11/pom.xml +++ b/viennacl/scala-2.11/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.mahout</groupId> - <artifactId>mahout</artifactId> + <artifactId>mahout-native-viennacl</artifactId> <version>0.13.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -183,11 +183,11 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - </plugin> + <!--<plugin>--> + <!--<groupId>org.codehaus.mojo</groupId>--> + <!--<artifactId>exec-maven-plugin</artifactId>--> + <!--<version>1.2.1</version>--> + <!--</plugin>--> <!-- copy jars to top directory, which is MAHOUT_HOME --> <plugin> @@ -199,7 +199,7 @@ <phase>package</phase> <configuration> <tasks> - <copy file="target/mahout-native-viennacl_2.11-${version}.jar" tofile="../../mahout-native-viennacl_2.11-${version}.jar" /> + <copy file="target/mahout-native-viennacl_2.11-${project.version}.jar" tofile="../../mahout-native-viennacl_2.11-${project.version}.jar" /> </tasks> </configuration> <goals>
