You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ss...@apache.org on 2015/04/10 18:11:05 UTC
mahout git commit: NOJIRA Added math-scala, spark,
spark-shell and h2o modules to binary distribution archive
Repository: mahout
Updated Branches:
refs/heads/master 5fdd30c3c -> fb9a7c3d0
NOJIRA Added math-scala, spark, spark-shell and h2o modules to binary distribution archive
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/fb9a7c3d
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/fb9a7c3d
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/fb9a7c3d
Branch: refs/heads/master
Commit: fb9a7c3d0ed9b4c348d2945766e8546f560eacdd
Parents: 5fdd30c
Author: Stevo Slavic <ss...@gmail.com>
Authored: Fri Apr 10 14:13:02 2015 +0200
Committer: Stevo Slavic <ss...@gmail.com>
Committed: Fri Apr 10 18:08:58 2015 +0200
----------------------------------------------------------------------
.gitignore | 5 +-
distribution/pom.xml | 2 +-
distribution/src/main/assembly/bin.xml | 72 +++++++++++++++++++++++++++++
h2o/pom.xml | 28 +++++++++++
math-scala/pom.xml | 28 +++++++++++
pom.xml | 23 ++++++---
spark-shell/pom.xml | 28 +++++++++++
spark/pom.xml | 28 +++++++++++
8 files changed, 202 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/fb9a7c3d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 2c5728c..731aa5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,10 +8,7 @@ output-asf-email-examples/
.idea/
.DS_Store
*.iml
-target/maven-shared-archive-resources
-target/.plxarc
-target/supplemental-models.xml
-*/target/
+target/
examples/bin/tmp
output
mr/build/
http://git-wip-us.apache.org/repos/asf/mahout/blob/fb9a7c3d/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 3582d03..ee1c81a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -73,7 +73,7 @@
</build>
<profiles>
<profile>
- <id>release</id>
+ <id>mahout-release</id>
<properties>
<mahout.skip.distribution>false</mahout.skip.distribution>
</properties>
http://git-wip-us.apache.org/repos/asf/mahout/blob/fb9a7c3d/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml
index d6c9076..c49ddc2 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -117,6 +117,58 @@
<outputDirectory/>
</fileSet>
<fileSet>
+ <directory>${project.basedir}/../math-scala/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark-shell/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../h2o/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/../collections/target/apidocs</directory>
<outputDirectory>docs/mahout-collections</outputDirectory>
</fileSet>
@@ -141,6 +193,26 @@
<outputDirectory>docs/mahout-examples</outputDirectory>
</fileSet>
<fileSet>
+ <directory>${project.basedir}/../math-scala/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../spark-shell/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-spark-shell</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../h2o/target/site/scaladocs</directory>
+ <outputDirectory>docs/mahout-h2o/scaladocs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../h2o/target/apidocs</directory>
+ <outputDirectory>docs/mahout-h2o/javadoc</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/..</directory>
<outputDirectory/>
<useDefaultExcludes>true</useDefaultExcludes>
http://git-wip-us.apache.org/repos/asf/mahout/blob/fb9a7c3d/h2o/pom.xml
----------------------------------------------------------------------
diff --git a/h2o/pom.xml b/h2o/pom.xml
index 485e850..caab993 100644
--- a/h2o/pom.xml
+++ b/h2o/pom.xml
@@ -174,4 +174,32 @@
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>mahout-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-scaladoc</id>
+ <goals>
+ <goal>doc</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>attach-scaladoc-jar</id>
+ <goals>
+ <goal>doc-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/mahout/blob/fb9a7c3d/math-scala/pom.xml
----------------------------------------------------------------------
diff --git a/math-scala/pom.xml b/math-scala/pom.xml
index 0babaa1..d4a24c4 100644
--- a/math-scala/pom.xml
+++ b/math-scala/pom.xml
@@ -166,4 +166,32 @@
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>mahout-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-scaladoc</id>
+ <goals>
+ <goal>doc</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>attach-scaladoc-jar</id>
+ <goals>
+ <goal>doc-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/mahout/blob/fb9a7c3d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b37ad6d..b73cca4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,7 @@
<mcheckstyle.version>2.10</mcheckstyle.version>
<mfindbugs.version>2.5.2</mfindbugs.version>
<mjavadoc.version>2.9.1</mjavadoc.version>
+ <mscala.version>3.2.0</mscala.version>
<hbase.version>1.0.0</hbase.version>
<lucene.version>4.6.1</lucene.version>
<slf4j.version>1.7.10</slf4j.version>
@@ -157,9 +158,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <artifactId>mahout-hdfs</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
- <artifactId>mahout-hdfs</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -170,9 +171,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <artifactId>mahout-mr</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
- <artifactId>mahout-mr</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -183,9 +184,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <artifactId>mahout-math</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
- <artifactId>mahout-math</artifactId>
<type>test-jar</type>
</dependency>
@@ -577,7 +578,7 @@
<version>2.5.1</version>
<configuration>
<useReleaseProfile>true</useReleaseProfile>
- <releaseProfiles>release,apache-release,hadoop2</releaseProfiles>
+ <releaseProfiles>mahout-release,apache-release,hadoop2</releaseProfiles>
<goals>deploy</goals>
<autoVersionSubmodules>true</autoVersionSubmodules>
<arguments>${arguments}</arguments>
@@ -608,7 +609,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${mscala.version}</version>
<configuration>
<jvmArgs>
<jvmArg>-Xms64m</jvmArg>
@@ -757,6 +758,10 @@
<excludeSubProjects>false</excludeSubProjects>
</configuration>
</plugin>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
<modules>
@@ -852,7 +857,7 @@
</properties>
</profile>
<profile>
- <id>release</id>
+ <id>mahout-release</id>
<properties>
<skipTests>true</skipTests>
<pmd.skip>true</pmd.skip>
@@ -866,7 +871,6 @@
<executions>
<execution>
<id>attach-sources</id>
- <phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
@@ -1121,6 +1125,11 @@
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
</plugin>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>${mscala.version}</version>
+ </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/mahout/blob/fb9a7c3d/spark-shell/pom.xml
----------------------------------------------------------------------
diff --git a/spark-shell/pom.xml b/spark-shell/pom.xml
index 51f2f2f..2352cad 100644
--- a/spark-shell/pom.xml
+++ b/spark-shell/pom.xml
@@ -139,4 +139,32 @@
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>mahout-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-scaladoc</id>
+ <goals>
+ <goal>doc</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>attach-scaladoc-jar</id>
+ <goals>
+ <goal>doc-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/mahout/blob/fb9a7c3d/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index e71d29e..d2ca696 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -169,4 +169,32 @@
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>mahout-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-scaladoc</id>
+ <goals>
+ <goal>doc</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>attach-scaladoc-jar</id>
+ <goals>
+ <goal>doc-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>