Skip to content

Commit

Permalink
MAHOUT-1563: Eliminated warnings about multiple scala versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@sslavic
sslavic committed Mar 29, 2015
1 parent cc361cb commit 6cf991c
Show file tree
Hide file tree
Showing 7 changed files with 158 additions and 370 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ Release 0.10.0 - unreleased

MAHOUT-1583: cbind() operator for Scala DRMs (dlyubimov)

MAHOUT-1563: Eliminated warnings about multiple scala versions (sslavic)

MAHOUT-1541, MAHOUT-1568, MAHOUT-1569: Created text-delimited file I/O traits and classes on spark, a MahoutDriver for a CLI and a ItemSimilairtyDriver using the CLI

MAHOUT-1573: More explicit parallelism adjustments in math-scala DRM apis; elements of automatic parallelism management (dlyubimov)
Expand Down
144 changes: 32 additions & 112 deletions h2o/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,83 +36,12 @@

<packaging>jar</packaging>

<repositories>
<repository>
<id>oss.sonatype.org-releases</id>
<url>http://oss.sonatype.org/content/repositories/releases</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<!-- this is needed for scalatest plugin until they publish it to central -->
<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
</pluginRepositories>

<build>
<defaultGoal>install</defaultGoal>

<plugins>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/mahout</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-test-sources/mahout</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>

<!-- create test jar so other modules can reuse the math test utility classes. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
Expand All @@ -121,15 +50,15 @@
<mainClass>water.H2O</mainClass>
</manifest>
</archive>
</configuration>
<executions>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</executions>
</plugin>

<plugin>
Expand All @@ -141,54 +70,47 @@
</plugin>

<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>add-scala-sources</id>
<phase>initialize</phase>
<goals>
<goal>add-source</goal>
</goals>
</execution>
<execution>
<id>scala-compile</id>
<phase>process-resources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<sourceDir>src/main/scala</sourceDir>
<jvmArgs>
<jvmArg>-Xms64m</jvmArg>
<jvmArg>-Xmx1024m</jvmArg>
</jvmArgs>
</configuration>
</plugin>

<!--this is what scalatest recommends to do to enable scala tests -->

<!-- disable surefire -->
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-surefire-plugin</artifactId>-->
<!--<version>2.7</version>-->
<!--<configuration>-->
<!--<skipTests>true</skipTests>-->
<!--</configuration>-->
<!--</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<!-- enable scalatest -->
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>1.0-M2</version>
<configuration>
<reportsDirectory>${project.build.directory}/scalatest-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>
</configuration>
<executions>
<execution>
<id>test</id>
Expand All @@ -206,7 +128,7 @@

<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-math-scala_2.10</artifactId>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -219,7 +141,7 @@

<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-math-scala_2.10</artifactId>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -249,9 +171,7 @@
<!-- scala stuff -->
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId>
<version>2.0</version>
<scope>test</scope>
<artifactId>scalatest_${scala.compat.version}</artifactId>
</dependency>

</dependencies>
Expand Down
103 changes: 28 additions & 75 deletions math-scala/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,54 +36,9 @@

<packaging>jar</packaging>

<!-- this is needed for scalatest plugin until they publish it to central -->
<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
</pluginRepositories>

<build>
<defaultGoal>install</defaultGoal>

<plugins>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/mahout</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-test-sources/mahout</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>

<!-- create test jar so other modules can reuse the math test utility classes. -->
<!-- create test jar so other modules can reuse the math-scala test utility classes. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand All @@ -106,47 +61,47 @@
</plugin>

<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<executions>
<execution>
<id>add-scala-sources</id>
<phase>initialize</phase>
<goals>
<goal>add-source</goal>
</goals>
</execution>
<execution>
<id>scala-compile</id>
<phase>process-resources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<sourceDir>src/main/scala</sourceDir>
<jvmArgs>
<jvmArg>-Xms64m</jvmArg>
<jvmArg>-Xmx1024m</jvmArg>
</jvmArgs>
</configuration>
</plugin>

<!--this is what scalatest recommends to do to enable scala tests -->

<!-- disable surefire -->
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-surefire-plugin</artifactId>-->
<!--<version>2.7</version>-->
<!--<configuration>-->
<!--<skipTests>true</skipTests>-->
<!--</configuration>-->
<!--</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<!-- enable scalatest -->
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>1.0-M2</version>
<configuration>
<reportsDirectory>${project.build.directory}/scalatest-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>
</configuration>
<executions>
<execution>
<id>test</id>
Expand All @@ -172,10 +127,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>

<dependency>
<groupId>com.github.scopt</groupId>
<artifactId>scopt_${scala.major}</artifactId>
<artifactId>scopt_${scala.compat.version}</artifactId>
<version>3.3.0</version>
</dependency>

Expand Down Expand Up @@ -207,9 +162,7 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.major}</artifactId>
<version>2.0</version>
<scope>test</scope>
<artifactId>scalatest_${scala.compat.version}</artifactId>
</dependency>

</dependencies>
Expand Down
2 changes: 0 additions & 2 deletions math/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
<packaging>jar</packaging>

<build>
<defaultGoal>install</defaultGoal>

<plugins>
<plugin>
<groupId>org.apache.mahout</groupId>
Expand Down
Loading

0 comments on commit 6cf991c

Please sign in to comment.