You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2019/10/18 08:00:40 UTC
[mahout] branch mahout-14.1 updated: Mahout 14.1 Rollback (#380)
This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch mahout-14.1
in repository https://gitbox.apache.org/repos/asf/mahout.git
The following commit(s) were added to refs/heads/mahout-14.1 by this push:
new 53fe38b Mahout 14.1 Rollback (#380)
53fe38b is described below
commit 53fe38bc1142b26ce947fd7351a2e183746f7b60
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Fri Oct 18 01:00:33 2019 -0700
Mahout 14.1 Rollback (#380)
* [MAHOUT-2017] small tweaks after large refactor several upgrades [MAHOUT-2072]
* [MAHOUT-2017] use {project.base.directory} over {project.build.directory}/
* [MAHOUT-2017] small fixes to release binaries explain some issues
* set back 14.1-SAPSHOT version
* [maven-release-plugin] prepare release mahout-14.1
* [maven-release-plugin] prepare release mahout-14.1
* [maven-release-plugin] prepare for next development iteration
* [MAHOUT-2071] move assembly files to mvn defined standard location per: https://maven.apache.org/guides/mini/guide-assemblies.html
* [MAHOUT-2071] bring in dependancies to assembly pom
* rollback to version 14.1-SNAPSHOT
* [MAHOUT-2071] cleanup root pom.xml
* [MAHOUT-2071] fixup assembly bin.xml and src.xml files
* [MAHOUT-2074] - Dockerfiles!!
* [MAHOUT-2074] - entrypioint work
* [maven-release-plugin] prepare release mahout-14.1
* merging upstream
* [maven-release-plugin] prepare for next development iteration
* remove <scm /> from all but root pom.xml
* remove mahout-release from root pom.xml
* release recycling
---
community/community-engines/flink-batch/pom.xml | 4 +-
community/community-engines/pom.xml | 4 +-
community/mahout-mr/integration/pom.xml | 4 +-
community/mahout-mr/mr-examples/pom.xml | 4 +-
community/mahout-mr/mr/pom.xml | 5 +-
community/mahout-mr/pom.xml | 4 +-
community/pom.xml | 4 +-
community/spark-cli-drivers/pom.xml | 4 +-
core/pom.xml | 4 +-
engine/hdfs/pom.xml | 4 +-
engine/pom.xml | 4 +-
engine/spark/pom.xml | 4 +-
examples/pom.xml | 4 +-
pom.xml | 257 ++++++++++++++++++++++--
14 files changed, 270 insertions(+), 40 deletions(-)
diff --git a/community/community-engines/flink-batch/pom.xml b/community/community-engines/flink-batch/pom.xml
index 9c8bd85..08d5457 100644
--- a/community/community-engines/flink-batch/pom.xml
+++ b/community/community-engines/flink-batch/pom.xml
@@ -39,13 +39,13 @@
<packaging>jar</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!--<scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
- </scm>
+ </scm>-->
<build>
<plugins>
diff --git a/community/community-engines/pom.xml b/community/community-engines/pom.xml
index c26a006..82b1bf6 100644
--- a/community/community-engines/pom.xml
+++ b/community/community-engines/pom.xml
@@ -28,13 +28,13 @@
</parent>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!--<scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
- </scm>
+ </scm>-->
<artifactId>mahout-community-engines_2.12</artifactId>
<name>- Mahout Community Supported Engines</name>
diff --git a/community/mahout-mr/integration/pom.xml b/community/mahout-mr/integration/pom.xml
index a79b713..11ab705 100644
--- a/community/mahout-mr/integration/pom.xml
+++ b/community/mahout-mr/integration/pom.xml
@@ -36,14 +36,14 @@
<packaging>jar</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!-- <scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
</scm>
-
+-->
<build>
diff --git a/community/mahout-mr/mr-examples/pom.xml b/community/mahout-mr/mr-examples/pom.xml
index 0640757..c6fa964 100644
--- a/community/mahout-mr/mr-examples/pom.xml
+++ b/community/mahout-mr/mr-examples/pom.xml
@@ -33,13 +33,13 @@
<packaging>jar</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!--<scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
- </scm>
+ </scm>-->
<properties>
<mahout.skip.example>false</mahout.skip.example>
diff --git a/community/mahout-mr/mr/pom.xml b/community/mahout-mr/mr/pom.xml
index dcf3564..9426654 100644
--- a/community/mahout-mr/mr/pom.xml
+++ b/community/mahout-mr/mr/pom.xml
@@ -35,16 +35,15 @@
<packaging>jar</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!--<scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
- </scm>
+ </scm>-->
<properties>
- <hadoop.version>2.4.1</hadoop.version>
<lucene.version>5.5.2</lucene.version>
</properties>
<build>
diff --git a/community/mahout-mr/pom.xml b/community/mahout-mr/pom.xml
index 7e4c7e1..747221e 100644
--- a/community/mahout-mr/pom.xml
+++ b/community/mahout-mr/pom.xml
@@ -35,14 +35,14 @@
<packaging>pom</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!-- <scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
</scm>
-
+-->
<modules>
<module>mr</module>
<module>integration</module>
diff --git a/community/pom.xml b/community/pom.xml
index 77511d3..892335c 100644
--- a/community/pom.xml
+++ b/community/pom.xml
@@ -36,14 +36,14 @@
<packaging>pom</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!-- <scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
</scm>
-
+-->
<build>
<plugins>
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index 9343568..5ce062b 100644
--- a/community/spark-cli-drivers/pom.xml
+++ b/community/spark-cli-drivers/pom.xml
@@ -35,14 +35,14 @@
<packaging>jar</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!-- <scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
</scm>
-
+-->
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
diff --git a/core/pom.xml b/core/pom.xml
index 33c5046..054dae0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,14 +35,14 @@
<packaging>jar</packaging>
- <!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
+ <!-- <!– per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.–>
<scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
- </scm>
+ </scm>-->
<dependencies>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index 1f62617..cd1b6d6 100644
--- a/engine/hdfs/pom.xml
+++ b/engine/hdfs/pom.xml
@@ -37,14 +37,14 @@
<packaging>jar</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!--<scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
</scm>
-
+-->
<build>
<plugins>
<!-- ensure licenses -->
diff --git a/engine/pom.xml b/engine/pom.xml
index 89bedf5..d6ab468 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -34,14 +34,14 @@
<packaging>pom</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!--<scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
</scm>
-
+-->
<!-- <modules>-->
<!-- <module>hdfs</module>-->
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index 1cd845b..4aef009 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -37,14 +37,14 @@
<packaging>jar</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!--<scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
</scm>
-
+-->
<properties>
</properties>
diff --git a/examples/pom.xml b/examples/pom.xml
index 029de0f..2301ed5 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -33,12 +33,12 @@
<packaging>jar</packaging>
<!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.-->
- <scm>
+ <!-- <scm>
<connection>scm:git:git@github.com:apache/mahout.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url>
<tag>mahout-14.1
</tag>
</scm>
-
+-->
</project>
diff --git a/pom.xml b/pom.xml
index d7d4118..8c5c743 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,9 @@
http://openjdk.java.net/jeps/212 -->
<additionalparam>-Xdoclint:-html</additionalparam>
<!--EndHack-->
- <compile.flags></compile.flags>
+
+ <compile.flags/>
+
@@ -393,7 +395,7 @@
<version>[1.8,)</version>
</requireJavaVersion>
<requireMavenVersion>
- <version>[3.3.3,)</version>
+ <version>[3.3.9,)</version>
</requireMavenVersion>
</rules>
</configuration>
@@ -444,17 +446,7 @@
-->
</modules>
</profile>
- </profiles>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <configLocation>buildtools/src/main/resources/mahout-checkstyle.xml</configLocation>
- </configuration>
- </plugin>
+ <profile>
<id>release.prepare</id>
<properties>
<skipTests>true</skipTests>
@@ -739,6 +731,245 @@
<artifactId>scala-maven-plugin</artifactId>
<version>4.0.2</version>
<configuration>
+=======
+ <configuration>
+ <failsOnError>false</failsOnError>
+ <!-- classpath -->
+ <configLocation>mahout-checkstyle.xml</configLocation>
+ <consoleOutput>true</consoleOutput>
+ <linkXRef>false</linkXRef>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sourcecheck</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ <goal>cpd-check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sourcecheck</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>set.eclipse.output</id>
+ <properties>
+ <eclipse.outputDirectory>${basedir}/eclipse-classes</eclipse.outputDirectory>
+ </properties>
+ </profile>
+ <profile>
+ <id>setup.eclipse</id>
+ <build>
+ <defaultGoal>process-test-sources</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>setup.eclipse.project</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>ci</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>env.JENKINS_URL</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>remove-old-mahout-artifacts</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>remove-project-artifact</goal>
+ </goals>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+</profiles>
+<reporting>
+<plugins>
+ <!-- surefire runs unit tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${msurefire.version}</version>
+ </plugin>
+ <!-- checkstyle -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${mcheckstyle.version}</version>
+ <configuration>
+ <!-- classpath -->
+ <configLocation>mahout-checkstyle.xml</configLocation>
+ <consoleOutput>true</consoleOutput>
+ </configuration>
+ </plugin>
+ <!-- test coverage plugin -->
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <version>3.1.12</version>
+ <configuration>
+ <generateHistorical>true</generateHistorical>
+ <licenseLocation>buildtools/clover.license</licenseLocation>
+ <generatePdf>false</generatePdf>
+ <generateXml>true</generateXml>
+ <generateHtml>true</generateHtml>
+ </configuration>
+ </plugin>
+ <!-- generate java doc -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${mjavadoc.version}</version>
+ </plugin>
+ <!-- code duplication - copy and paste detection -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>${mpmd.version}</version>
+ <configuration>
+ <rulesets>
+ <!-- classpath -->
+ <ruleset>mahout-pmd-ruleset.xml</ruleset>
+ </rulesets>
+ <targetJdk>${maven.compiler.target}</targetJdk>
+ <linkXRef>false</linkXRef>
+ <includeTests>true</includeTests>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+ <!-- catch code tags -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <tags>
+ <tag>TODO</tag>
+ <tag>todo</tag>
+ </tags>
+ </configuration>
+ </plugin>
+ <!-- findbugs -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${mfindbugs.version}</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <threshold>Low</threshold>
+ <effort>Default</effort>
+ <!--visitors>FindDeadLocalStores,UnreadFields</visitors-->
+ <!--omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors-->
+ <debug>true</debug>
+ <relaxed>true</relaxed>
+ <!-- classpath -->
+ <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <columnNames>Type,Key,Summary,Status,Resolution,Assignee</columnNames>
+ <sortColumnNames>Type,Key</sortColumnNames>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.8</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>dependencies</report>
+ <report>dependency-convergence</report>
+ <report>dependency-management</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.7.1</version>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <!--<version>2.2</version>-->
+ </plugin>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>4.0.2</version>
+ <configuration>
<jvmArgs>
<jvmArg>-Xms64m</jvmArg>
<jvmArg>-Xmx1024m</jvmArg>