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/17 11:24:25 UTC
[mahout] branch mahout-14.1 updated: Mahout 14.1 Rollback,
release prepare, changes in terminoligy (#378)
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 b041fb3 Mahout 14.1 Rollback, release prepare, changes in terminoligy (#378)
b041fb3 is described below
commit b041fb3156ae954352611738a14dca7ecec10905
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Thu Oct 17 04:24:20 2019 -0700
Mahout 14.1 Rollback, release prepare, changes in terminoligy (#378)
* [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
---
buildtools/assembly/bin.xml | 24 ++---
community/pom.xml | 4 +-
community/spark-cli-drivers/pom.xml | 4 +-
core/pom.xml | 2 +-
engine/hdfs/pom.xml | 4 +-
engine/pom.xml | 4 +-
engine/spark/pom.xml | 4 +-
pom.xml | 193 +-----------------------------------
8 files changed, 25 insertions(+), 214 deletions(-)
diff --git a/buildtools/assembly/bin.xml b/buildtools/assembly/bin.xml
index 2c07a3b..3cb6c92 100644
--- a/buildtools/assembly/bin.xml
+++ b/buildtools/assembly/bin.xml
@@ -12,8 +12,8 @@
<fileSets>
<fileSet>
- <directory>${project.build.directory}</directory>
- <outputDirectory>${project.build.directory}</outputDirectory>
+ <directory>${project.base.directory}</directory>
+ <outputDirectory>${project.base.directory}</outputDirectory>
<includes>
<include>README*</include>
<include>LICENSE*</include>
@@ -24,8 +24,8 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/lib</directory>
- <outputDirectory>${project.build.directory}lib/</outputDirectory>
+ <directory>${project.base.directory}/lib</directory>
+ <outputDirectory>${project.base.directory}/lib/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
@@ -38,11 +38,11 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/site</directory>
+ <directory>${project.base.directory}/site</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/bin</directory>
+ <directory>${project.base.directory}/bin</directory>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
<outputDirectory>bin</outputDirectory>
@@ -54,8 +54,8 @@
</fileSet>
<fileSet>
- <directory>${project.build.directory}/**/**/target/</directory>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <directory>${project.base.directory}/**/**/target/</directory>
+ <outputDirectory>${project.base.directory}/lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
@@ -70,8 +70,8 @@
</fileSet>
<fileSet>
- <directory>${project.build.directory}/examples/bin</directory>
- <outputDirectory>${project.build.directory}examples/bin/</outputDirectory>
+ <directory>${project.base.directory}/examples/bin</directory>
+ <outputDirectory>${project.base.directory}/examples/bin/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
@@ -81,8 +81,8 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/examples/bin/resources</directory>
- <outputDirectory>${project.build.directory}examples/bin/resources</outputDirectory>
+ <directory>${project.base.directory}/examples/bin/resources</directory>
+ <outputDirectory>${project.base.directory}/examples/bin/resources</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
diff --git a/community/pom.xml b/community/pom.xml
index 3c0193b..77511d3 100644
--- a/community/pom.xml
+++ b/community/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mahout-community</artifactId>
- <version> 14.1</version>
+ <version>14.1-SNAPSHOT</version>
<name>Mahout Community</name>
<description>Not officially maintained, but still very useful scripts to use Mahout with.
</description>
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index 2a68ab3..9343568 100644
--- a/community/spark-cli-drivers/pom.xml
+++ b/community/spark-cli-drivers/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-community</artifactId>
- <version> 14.1</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_2.12</artifactId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 4140f14..33c5046 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index f830bf8..8de8296 100644
--- a/engine/hdfs/pom.xml
+++ b/engine/hdfs/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-engine</artifactId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!-- modules inherit parent's group id and version. -->
<artifactId>mahout-hdfs_2.12</artifactId>
- <version> 14.1</version>
+ <version>14.1-SNAPSHOT</version>
<name>- Mahout HDFS Support</name>
<description>Scalable machine learning libraries</description>
diff --git a/engine/pom.xml b/engine/pom.xml
index 57ac1ed..89bedf5 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -21,12 +21,12 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mahout-engine</artifactId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
<name>Mahout Engine</name>
<description>Parent of Various Engines on which you can run Mahout.
</description>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index e822b80..f4350d2 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-engine</artifactId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mahout-spark_2.12</artifactId>
- <version> 14.1</version>
+ <version>14.1-SNAPSHOT</version>
<name>- Mahout Spark Engine</name>
<description>
Mahout Bindings for Apache Spark
diff --git a/pom.xml b/pom.xml
index 726d960..25b9ca8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Mahout</name>
@@ -254,7 +254,7 @@
<configuration>
<preparationGoals>clean package install</preparationGoals>
<useReleaseProfile>true</useReleaseProfile>
- <releaseProfiles>mahout-release,apache-release</releaseProfiles>
+ <releaseProfiles>apache-release</releaseProfiles>
<goals>deploy</goals>
<autoVersionSubmodules>true</autoVersionSubmodules>
<arguments>${arguments}</arguments>
@@ -441,196 +441,7 @@
-->
</modules>
</profile>
- <profile>
- <id>mahout-release</id>
- <modules>
- <module>core</module>
- <module>engine</module>
- <module>engine/hdfs</module>
- <module>engine/spark</module>
- <module>community</module>
- <module>community/spark-cli-drivers</module>
-<!--
- <module>experimental/viennacl-omp</module>
--->
- <!--<module>community/community-engines</module>-->
- <!--<module>community/community-engines/flink-batch</module>-->
- <!--<module>community/community-engines/h2o</module>-->
- <!--<module>community/mahout-mr</module>-->
- <!--<module>experimental</module>-->
- <!--<module>experimental/viennacl</module>-->
- </modules>
- <properties>
- <skipTests>false</skipTests>
- <maven.test.skip>false</maven.test.skip>
- <mahout.skip.distribution>false</mahout.skip.distribution>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${source.plugin.version}</version>
- <configuration>
- <skipSource>true</skipSource>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bin-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>${mahout.skip.distribution}</skipAssembly>
- <descriptors>
- <sourceReleaseAssemblyDescriptor>buildtools/assembly/src.xml</sourceReleaseAssemblyDescriptor>
- <descriptor>buildtools/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
-
- <execution>
- <id>src-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>true</skipAssembly>
- <descriptors>
- <descriptor>buildtools/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
-
- </plugin>
-
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <releaseProfiles>apache-release</releaseProfiles>
- <preparationGoals>clean package install</preparationGoals>
- </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>spark-cli-drivers</id>
- <modules>
- <module>community/spark-cli-drivers</module>
- </modules>
- </profile>
- <profile>
- <id>viennacl</id>
- <modules>
- <module>experimental/viennacl</module>
- </modules>
- </profile>
- <profile>
- <id>viennacl-omp</id>
- <modules>
- <module>experimental/viennacl-omp</module>
- </modules>
- </profile>
- <profile>
- <!-- most of this profile lives in other places, like distribution -->
- <id>release.prepare</id>
- <properties>
- <skipTests>true</skipTests>
- <pmd.skip>true</pmd.skip>
- <checkstyle.skip>true</checkstyle.skip>
- <sourceReleaseAssemblyDescriptor>buildtools/assembly/src.xml</sourceReleaseAssemblyDescriptor>
- <binaryReleaseAssemblyDescriptor>buildtools/assembly/bin.xml</binaryReleaseAssemblyDescriptor>
- </properties>
- </profile>
-<!-- <profile>-->
-<!-- <id>-release</id>-->
-<!-- <properties>-->
-<!-- <skipTests>true</skipTests>-->
-<!-- <pmd.skip>true</pmd.skip>-->
-<!-- <checkstyle.skip>true</checkstyle.skip>-->
-<!-- </properties>-->
-<!-- </profile>-->
</profiles>
-
<reporting>
<plugins>
<plugin>