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/02/15 18:50:36 UTC
[mahout] branch master updated: HOTFIX - Assembly release voodoo
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 357f674 HOTFIX - Assembly release voodoo
357f674 is described below
commit 357f674d8db2c8d9fd2824726ded4784206dd3b0
Author: Trevor a.k.a @rawkintrevo <tr...@gmail.com>
AuthorDate: Fri Feb 15 12:49:10 2019 -0600
HOTFIX - Assembly release voodoo
---
pom.xml | 441 ++++++++++++++--------------------------------------------------
1 file changed, 93 insertions(+), 348 deletions(-)
diff --git a/pom.xml b/pom.xml
index 103e9e6..bb9334d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,9 +114,10 @@
<slf4j.version>1.7.22</slf4j.version>
<scala.version>2.11.6</scala.version>
<scala.compat.version>2.11</scala.compat.version>
-
+ <source.plugin.version>3.0.1</source.plugin.version>
<spark.version>2.3.0</spark.version>
<spark.compat.version>2.3</spark.compat.version>
+ <depgraph.plugin.version>3.3.0</depgraph.plugin.version>
<!-- `mvn site` throws a hissy fit searching no longer existing repos if this is not set false -->
<dependency.locations.enabled>false</dependency.locations.enabled>
@@ -221,333 +222,6 @@
<version>1.2.17</version>
</dependency>
- <!-- our modules -->
- <!--
- <dependency>
- <artifactId>mahout-hdfs</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <artifactId>mahout-hdfs</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <artifactId>mahout-mr</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <artifactId>mahout-mr</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <artifactId>mahout-math</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <artifactId>mahout-math</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <artifactId>mahout-integration</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <artifactId>mahout-buildtools</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <artifactId>mahout-examples</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
- <artifactId>mahout-spark_${scala.compat.version}</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>mahout-flink_${scala.compat.version}</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>mahout-h2o_${scala.compat.version}</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>mahout-native-viennacl_${scala.compat.version}</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
- -->
-
- <!-- 3rd party -->
- <!--
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>net.sf.kosmosfs</groupId>
- <artifactId>kfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xmlenc</groupId>
- <artifactId>xmlenc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-benchmark</artifactId>
- <version>${lucene.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${lucene.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest_${scala.compat.version}</artifactId>
- <version>2.2.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.6</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
-
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <version>3.2</version>
- </dependency>
-
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.4</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>14.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.mahout.commons</groupId>
- <artifactId>commons-cli</artifactId>
- <version>2.0-mahout</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>${hbase.version}</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- -->
</dependencies>
</dependencyManagement>
@@ -754,43 +428,63 @@
<id>apache-release</id>
<properties>
<skipTests>false</skipTests>
+ <maven.test.skip>false</maven.test.skip>
</properties>
<build>
<plugins>
- <!--maven source-->
- <!--maven jar-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${source.plugin.version}</version>
+ <configuration>
+ <skipSource>true</skipSource>
+ </configuration>
<executions>
<execution>
- <id>bin-assembly</id>
- <phase>package</phase>
+ <id>attach-sources</id>
<goals>
- <goal>single</goal>
+ <goal>jar-no-fork</goal>
</goals>
- <configuration>
- <!--<skipAssembly>${mahout.skip.distribution}</skipAssembly>-->
- <descriptors>
- <descriptor>buildtools/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ <executions>
<execution>
- <id>src-assembly</id>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>1.0.6</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
- <!--<skipAssembly>${mahout.skip.distribution}</skipAssembly>-->
- <descriptors>
- <descriptor>buildtools/assembly/src.xml</descriptor>
- </descriptors>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>source-release</descriptorRef>
+ </descriptorRefs>
<tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
</executions>
@@ -802,8 +496,59 @@
<preparationGoals>clean install</preparationGoals>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ <skipExec>true</skipExec>
+ </configuration>
+ </plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <configuration>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>javadoc-no-fork</report>
+ <report>test-javadoc-no-fork</report>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>html</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.github.ferstl</groupId>
+ <artifactId>depgraph-maven-plugin</artifactId>
+ <version>${depgraph.plugin.version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
</profile>
<profile>
<id>viennacl</id>