You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ra...@apache.org on 2019/01/18 21:58:03 UTC
[mahout] branch master updated: HOTFIX: Adding JavaDocs
functionality back in
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
The following commit(s) were added to refs/heads/master by this push:
new 58b6cd3 HOTFIX: Adding JavaDocs functionality back in
new eb90d88 Merge pull request #367 from rawkintrevo/master
58b6cd3 is described below
commit 58b6cd361c9aa954876f7f1b96180cc63aa27eeb
Author: Trevor a.k.a @rawkintrevo <tr...@gmail.com>
AuthorDate: Fri Jan 18 15:56:38 2019 -0600
HOTFIX: Adding JavaDocs functionality back in
---
core/pom.xml | 12 ++++++++++
engine/hdfs/pom.xml | 12 ++++++++++
engine/spark/pom.xml | 17 +++++++++++---
pom.xml | 65 +++++++++++++++++++++++++++++++++++++---------------
4 files changed, 84 insertions(+), 22 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 59ede09..6d46e97 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -280,6 +280,18 @@
<goal>run</goal>
</goals>
</execution>
+ <execution>
+ <id>copy-javadocs</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <copy file="target/core_${scala.compat.version}-${project.version}-javadoc.jar" tofile="../docs/core_${scala.compat.version}-${project.version}-javadoc.jar" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index a278ad1..5e9410d 100644
--- a/engine/hdfs/pom.xml
+++ b/engine/hdfs/pom.xml
@@ -64,6 +64,18 @@
<goal>run</goal>
</goals>
</execution>
+ <execution>
+ <id>copy-javadocs</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <copy file="target/mahout-hdfs-${project.version}-javadoc.jar" tofile="../../docs/mahout-hdfs-${project.version}-javadoc.jar" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index 10aa807..1e0ef8b 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -48,9 +48,7 @@
</plugin>
<!-- Pre-refactor plugins start here -->
- <!--<plugin>-->
- <!--<artifactId>maven-javadoc-plugin</artifactId>-->
- <!--</plugin>-->
+
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -131,6 +129,7 @@
</executions>
</plugin>
+
<!-- copy jars to top directory, which is MAHOUT_HOME -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -150,6 +149,18 @@
<goal>run</goal>
</goals>
</execution>
+ <execution>
+ <id>copy-javadocs</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <copy file="target/spark_${scala.compat.version}-${project.version}-javadoc.jar" tofile="../../docs/spark_${scala.compat.version}-${project.version}.jar" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<!-- create test jar so other modules can reuse the math test utility classes.
diff --git a/pom.xml b/pom.xml
index 3ac87d2..e852a1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -577,6 +577,41 @@
</configuration>
</plugin>
+ <!-- generate java doc -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${mjavadoc.version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+
+ <!-- Create Scala Docs -->
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>3.4.4</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>doc-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ </plugin>
+
</plugins>
<pluginManagement>
@@ -645,6 +680,13 @@
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
+ <fileset>
+ <directory>doc/</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
</filesets>
</configuration>
</plugin>
@@ -690,7 +732,6 @@
</configuration>
</plugin>
-
</plugins>
</pluginManagement>
@@ -776,24 +817,10 @@
<module>experimental/viennacl-omp</module>
</modules>
</profile>
- <profile>
- <id>docs</id>
- <reporting>
- <plugins>
- <!-- generate java doc -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${mjavadoc.version}</version>
- </plugin>
- </plugins>
- </reporting>
- <build>
- <plugins>
-
- </plugins>
- </build>
- </profile>
+ <!--<profile>-->
+ <!--<id>docs</id>-->
+ <!---->
+ <!--</profile>-->
</profiles>
<reporting>