r***@apache.org
2018-06-19 15:44:21 UTC
Repository: mahout
Updated Branches:
refs/heads/branch-0.14.0 abcc64567 -> eff8b1fd6
MAHOUT-2039 and MAHOUT-2047 Add Maven-Enforcer, bump jdk, and other POM warnings
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/eff8b1fd
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/eff8b1fd
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/eff8b1fd
Branch: refs/heads/branch-0.14.0
Commit: eff8b1fd6a5c871331345d40bc1c9061b7ea2a40
Parents: abcc645
Author: Trevor a.k.a @rawkintrevo <***@gmail.com>
Authored: Tue Jun 19 10:42:22 2018 -0500
Committer: Trevor a.k.a @rawkintrevo <***@gmail.com>
Committed: Tue Jun 19 10:42:22 2018 -0500
----------------------------------------------------------------------
community/spark-cli-drivers/pom.xml | 4 +-
core/pom.xml | 5 +-
engine/spark/pom.xml | 7 ++-
pom.xml | 102 ++++++++-----------------------
4 files changed, 37 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/eff8b1fd/community/spark-cli-drivers/pom.xml
----------------------------------------------------------------------
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index b55bc7c..a2e6b5f 100644
--- a/community/spark-cli-drivers/pom.xml
+++ b/community/spark-cli-drivers/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>spark-cli-drivers_${scala.compat.version}</artifactId>
+ <artifactId>spark-cli-drivers_2.11</artifactId>
<name>- Mahout Spark CLI Drivers</name>
<description>These drivers will allow you to compile a handy Apache Spark App which utilizes Apache Mahout.
</description>
@@ -120,6 +120,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
+ <version>3.2.2</version>
<executions>
<execution>
<id>add-scala-sources</id>
@@ -162,6 +163,7 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
+ <version>2.0.0</version>
<executions>
<execution>
<id>test</id>
http://git-wip-us.apache.org/repos/asf/mahout/blob/eff8b1fd/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 7d15458..896977f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>core_${scala.compat.version}</artifactId>
+ <artifactId>core_2.11</artifactId>
<name>Mahout Core</name>
<description>High performance scientific and technical computing data structures and methods,
mostly based on CERN's Colt Java API
@@ -54,6 +54,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.compat.version}</artifactId>
+ <version>3.0.5</version>
</dependency>
<dependency>
@@ -123,6 +124,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
+ <version>3.2.2</version>
<executions>
<execution>
<id>add-scala-sources</id>
@@ -161,6 +163,7 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
+ <version>2.0.0</version>
<executions>
<execution>
<id>test</id>
http://git-wip-us.apache.org/repos/asf/mahout/blob/eff8b1fd/engine/spark/pom.xml
----------------------------------------------------------------------
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index df9737d..4a4b4f4 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -59,6 +59,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
+ <version>3.2.2</version>
<executions>
<execution>
<id>add-scala-sources</id>
@@ -98,6 +99,7 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
+ <version>2.0.0</version>
<executions>
<execution>
<id>test</id>
@@ -139,8 +141,8 @@
<phase>package</phase>
<configuration>
<tasks>
- <copy file="target/spark_${scala.compat.version}-${version}-spark_${spark.compat.version}.jar" tofile="../../lib/spark_${scala.compat.version}-${version}-spark_${spark.compat.version}.jar" />
- <copy file="target/spark_${scala.compat.version}-${version}-dependency-reduced.jar" tofile="../../lib/spark_${scala.compat.version}-${version}-dependency-reduced.jar" />
+ <copy file="target/spark_${scala.compat.version}-${project.version}-spark_${spark.compat.version}.jar" tofile="../../lib/spark_${scala.compat.version}-${project.version}-spark_${spark.compat.version}.jar" />
+ <copy file="target/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" tofile="../../lib/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" />
</tasks>
</configuration>
<goals>
@@ -245,6 +247,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.compat.version}</artifactId>
+ <version>3.0.5</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/mahout/blob/eff8b1fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f978e87..166a809 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,9 +95,7 @@
</otherArchives>
</mailingList>
</mailingLists>
- <prerequisites>
- <maven>3.3.3</maven>
- </prerequisites>
+
<!-- Required for Release Plugin -->
<scm>
<connection>scm:git:***@github.com:apache/mahout.git</connection>
@@ -669,57 +667,30 @@
</configuration>
</plugin>
- <!--<!– Javadocs –>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-javadoc-plugin</artifactId>-->
- <!--<version>3.0.1</version>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>aggregate</id>-->
- <!--<phase>site</phase>-->
- <!--<goals>-->
- <!--<goal>aggregate</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[1.8,)</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.3.3,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <!-- Scaladocs -->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-site-plugin</artifactId>-->
- <!--<version>3.0</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>3.4.1</version>-->
- <!--<configuration>-->
- <!--<jvmArgs>-->
- <!--<jvmArg>-Xms64m</jvmArg>-->
- <!--<jvmArg>-Xmx1024m</jvmArg>-->
- <!--</jvmArgs>-->
- <!--<args>-->
- <!--<arg>-target:jvm-${maven.compiler.target}</arg>-->
- <!--<arg>-deprecation</arg>-->
- <!--<arg>-feature</arg>-->
- <!--<arg>-language:existentials</arg>-->
- <!--<arg>-language:implicitConversions</arg>-->
- <!--<arg>-language:postfixOps</arg>-->
- <!--</args>-->
- <!--<sourceDir>src/main/scala</sourceDir>-->
- <!--<testSourceDir>src/test/scala</testSourceDir>-->
- <!--</configuration>-->
- <!--</plugin>-->
- <!--</reportPlugins>-->
- <!--</configuration>-->
- <!--</plugin>-->
</plugins>
</pluginManagement>
@@ -1009,30 +980,7 @@
<!--</plugins>-->
<!--</pluginManagement>-->
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-enforcer-plugin</artifactId>-->
- <!--<version>1.4</version>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>enforce-versions</id>-->
- <!--<goals>-->
- <!--<goal>enforce</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<rules>-->
- <!--<requireJavaVersion>-->
- <!--<version>[1.7,)</version>-->
- <!--</requireJavaVersion>-->
- <!--<requireMavenVersion>-->
- <!--<version>[3.3.3,)</version>-->
- <!--</requireMavenVersion>-->
- <!--</rules>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
+
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-surefire-plugin</artifactId>-->
Updated Branches:
refs/heads/branch-0.14.0 abcc64567 -> eff8b1fd6
MAHOUT-2039 and MAHOUT-2047 Add Maven-Enforcer, bump jdk, and other POM warnings
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/eff8b1fd
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/eff8b1fd
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/eff8b1fd
Branch: refs/heads/branch-0.14.0
Commit: eff8b1fd6a5c871331345d40bc1c9061b7ea2a40
Parents: abcc645
Author: Trevor a.k.a @rawkintrevo <***@gmail.com>
Authored: Tue Jun 19 10:42:22 2018 -0500
Committer: Trevor a.k.a @rawkintrevo <***@gmail.com>
Committed: Tue Jun 19 10:42:22 2018 -0500
----------------------------------------------------------------------
community/spark-cli-drivers/pom.xml | 4 +-
core/pom.xml | 5 +-
engine/spark/pom.xml | 7 ++-
pom.xml | 102 ++++++++-----------------------
4 files changed, 37 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/eff8b1fd/community/spark-cli-drivers/pom.xml
----------------------------------------------------------------------
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index b55bc7c..a2e6b5f 100644
--- a/community/spark-cli-drivers/pom.xml
+++ b/community/spark-cli-drivers/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>spark-cli-drivers_${scala.compat.version}</artifactId>
+ <artifactId>spark-cli-drivers_2.11</artifactId>
<name>- Mahout Spark CLI Drivers</name>
<description>These drivers will allow you to compile a handy Apache Spark App which utilizes Apache Mahout.
</description>
@@ -120,6 +120,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
+ <version>3.2.2</version>
<executions>
<execution>
<id>add-scala-sources</id>
@@ -162,6 +163,7 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
+ <version>2.0.0</version>
<executions>
<execution>
<id>test</id>
http://git-wip-us.apache.org/repos/asf/mahout/blob/eff8b1fd/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 7d15458..896977f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>core_${scala.compat.version}</artifactId>
+ <artifactId>core_2.11</artifactId>
<name>Mahout Core</name>
<description>High performance scientific and technical computing data structures and methods,
mostly based on CERN's Colt Java API
@@ -54,6 +54,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.compat.version}</artifactId>
+ <version>3.0.5</version>
</dependency>
<dependency>
@@ -123,6 +124,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
+ <version>3.2.2</version>
<executions>
<execution>
<id>add-scala-sources</id>
@@ -161,6 +163,7 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
+ <version>2.0.0</version>
<executions>
<execution>
<id>test</id>
http://git-wip-us.apache.org/repos/asf/mahout/blob/eff8b1fd/engine/spark/pom.xml
----------------------------------------------------------------------
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index df9737d..4a4b4f4 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -59,6 +59,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
+ <version>3.2.2</version>
<executions>
<execution>
<id>add-scala-sources</id>
@@ -98,6 +99,7 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
+ <version>2.0.0</version>
<executions>
<execution>
<id>test</id>
@@ -139,8 +141,8 @@
<phase>package</phase>
<configuration>
<tasks>
- <copy file="target/spark_${scala.compat.version}-${version}-spark_${spark.compat.version}.jar" tofile="../../lib/spark_${scala.compat.version}-${version}-spark_${spark.compat.version}.jar" />
- <copy file="target/spark_${scala.compat.version}-${version}-dependency-reduced.jar" tofile="../../lib/spark_${scala.compat.version}-${version}-dependency-reduced.jar" />
+ <copy file="target/spark_${scala.compat.version}-${project.version}-spark_${spark.compat.version}.jar" tofile="../../lib/spark_${scala.compat.version}-${project.version}-spark_${spark.compat.version}.jar" />
+ <copy file="target/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" tofile="../../lib/spark_${scala.compat.version}-${project.version}-dependency-reduced.jar" />
</tasks>
</configuration>
<goals>
@@ -245,6 +247,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.compat.version}</artifactId>
+ <version>3.0.5</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/mahout/blob/eff8b1fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f978e87..166a809 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,9 +95,7 @@
</otherArchives>
</mailingList>
</mailingLists>
- <prerequisites>
- <maven>3.3.3</maven>
- </prerequisites>
+
<!-- Required for Release Plugin -->
<scm>
<connection>scm:git:***@github.com:apache/mahout.git</connection>
@@ -669,57 +667,30 @@
</configuration>
</plugin>
- <!--<!– Javadocs –>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-javadoc-plugin</artifactId>-->
- <!--<version>3.0.1</version>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>aggregate</id>-->
- <!--<phase>site</phase>-->
- <!--<goals>-->
- <!--<goal>aggregate</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[1.8,)</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.3.3,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <!-- Scaladocs -->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-site-plugin</artifactId>-->
- <!--<version>3.0</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>3.4.1</version>-->
- <!--<configuration>-->
- <!--<jvmArgs>-->
- <!--<jvmArg>-Xms64m</jvmArg>-->
- <!--<jvmArg>-Xmx1024m</jvmArg>-->
- <!--</jvmArgs>-->
- <!--<args>-->
- <!--<arg>-target:jvm-${maven.compiler.target}</arg>-->
- <!--<arg>-deprecation</arg>-->
- <!--<arg>-feature</arg>-->
- <!--<arg>-language:existentials</arg>-->
- <!--<arg>-language:implicitConversions</arg>-->
- <!--<arg>-language:postfixOps</arg>-->
- <!--</args>-->
- <!--<sourceDir>src/main/scala</sourceDir>-->
- <!--<testSourceDir>src/test/scala</testSourceDir>-->
- <!--</configuration>-->
- <!--</plugin>-->
- <!--</reportPlugins>-->
- <!--</configuration>-->
- <!--</plugin>-->
</plugins>
</pluginManagement>
@@ -1009,30 +980,7 @@
<!--</plugins>-->
<!--</pluginManagement>-->
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-enforcer-plugin</artifactId>-->
- <!--<version>1.4</version>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>enforce-versions</id>-->
- <!--<goals>-->
- <!--<goal>enforce</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<rules>-->
- <!--<requireJavaVersion>-->
- <!--<version>[1.7,)</version>-->
- <!--</requireJavaVersion>-->
- <!--<requireMavenVersion>-->
- <!--<version>[3.3.3,)</version>-->
- <!--</requireMavenVersion>-->
- <!--</rules>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
+
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-surefire-plugin</artifactId>-->