Skip to content

Commit

Permalink
MAHOUT-1681: Renamed mahout-math-scala to mahout-samsara
Browse files Browse the repository at this point in the history
  • Loading branch information
sslavic committed Apr 14, 2015
1 parent 63e82ea commit f7b69fa
Show file tree
Hide file tree
Showing 87 changed files with 19 additions and 20 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ Mahout Change Log

Release 0.11.0 - unreleased

MAHOUT-1681: Renamed mahout-math-scala to mahout-samsara

MAHOUT-1680: Renamed mahout-distribution to apache-mahout-distribution

Release 0.10.0 - 2015-04-11
Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
<artifactId>mahout-samsara_${scala.compat.version}</artifactId>
</dependency>
</dependencies>
</project>
8 changes: 4 additions & 4 deletions distribution/src/main/assembly/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<outputDirectory/>
</fileSet>
<fileSet>
<directory>${project.basedir}/../math-scala/target</directory>
<directory>${project.basedir}/../samsara/target</directory>
<includes>
<include>mahout-*.jar</include>
<include>mahout-*.job</include>
Expand Down Expand Up @@ -193,12 +193,12 @@
<outputDirectory>docs/mahout-examples</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/../math-scala/target/site/scaladocs</directory>
<outputDirectory>docs/mahout-examples</outputDirectory>
<directory>${project.basedir}/../samsara/target/site/scaladocs</directory>
<outputDirectory>docs/mahout-samsara</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/../spark/target/site/scaladocs</directory>
<outputDirectory>docs/mahout-examples</outputDirectory>
<outputDirectory>docs/mahout-spark</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/../spark-shell/target/site/scaladocs</directory>
Expand Down
4 changes: 2 additions & 2 deletions h2o/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@

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

Expand All @@ -140,7 +140,7 @@

<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
<artifactId>mahout-samsara_${scala.compat.version}</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,12 @@
</dependency>

<dependency>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
<artifactId>mahout-samsara_${scala.compat.version}</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
<artifactId>mahout-samsara_${scala.compat.version}</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
<classifier>tests</classifier>
Expand Down Expand Up @@ -772,7 +772,7 @@
<module>integration</module>
<module>examples</module>
<module>distribution</module>
<module>math-scala</module>
<module>samsara</module>
<module>spark</module>
<module>spark-shell</module>
<module>h2o</module>
Expand Down
11 changes: 4 additions & 7 deletions math-scala/pom.xml → samsara/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,15 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
<name>Mahout Math Scala bindings</name>
<description>High performance scientific and technical computing data structures and methods,
mostly based on CERN's
Colt Java API
</description>
<artifactId>mahout-samsara_${scala.compat.version}</artifactId>
<name>Mahout Samsara</name>
<description>Mahout Math Scala bindings</description>

<packaging>jar</packaging>

<build>
<plugins>
<!-- create test jar so other modules can reuse the math-scala test utility classes. -->
<!-- create test jar so other modules can reuse the samsara test utility classes. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spark-shell/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@

<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
<artifactId>mahout-samsara_${scala.compat.version}</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@

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

<dependency>
Expand All @@ -150,7 +150,7 @@

<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
<artifactId>mahout-samsara_${scala.compat.version}</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down

0 comments on commit f7b69fa

Please sign in to comment.