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 2020/01/23 10:13:04 UTC
[mahout] branch MAHOUT-2084 created (now 41c68f3)
This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a change to branch MAHOUT-2084
in repository https://gitbox.apache.org/repos/asf/mahout.git.
at 41c68f3 [maven-release-plugin] prepare release mahout-14.1_2.11-RC4
This branch includes the following new commits:
new 776cbac [MAHOUT-2084] uppress default source release, refactor releases for compliance with: https://www.apache.org/dev/release-publishing#distribution
new a932661 filter files only to copy to release, add release dir
new dbc33df add dist/release to binary release
new 41c68f3 [maven-release-plugin] prepare release mahout-14.1_2.11-RC4
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[mahout] 04/04: [maven-release-plugin] prepare release
mahout-14.1_2.11-RC4
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch MAHOUT-2084
in repository https://gitbox.apache.org/repos/asf/mahout.git
commit 41c68f35d929033eb78912c5c9700255d23f79a8
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Thu Jan 23 02:12:54 2020 -0800
[maven-release-plugin] prepare release mahout-14.1_2.11-RC4
---
community/pom.xml | 4 ++--
community/spark-cli-drivers/pom.xml | 2 +-
core/pom.xml | 2 +-
dist/pom.xml | 6 +++---
engine/hdfs/pom.xml | 2 +-
engine/pom.xml | 2 +-
engine/spark/pom.xml | 2 +-
pom.xml | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/community/pom.xml b/community/pom.xml
index 892335c..0f30d53 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-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mahout-community</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</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 5a7a058..8de33df 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-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index 0c2875c..e7b0f0f 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-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/dist/pom.xml b/dist/pom.xml
index 8bb8f4e..796fb6e 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>mahout</artifactId>
<groupId>org.apache.mahout</groupId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
</parent>
<artifactId>dist_2.11</artifactId>
@@ -114,7 +114,7 @@
<tasks>
<copy todir="release">
<fileset dir="target">
- <type type="file"/>
+ <type type="file" />
</fileset>
</copy>
</tasks>
@@ -145,7 +145,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore/>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index 57fd60f..cfdf1a2 100644
--- a/engine/hdfs/pom.xml
+++ b/engine/hdfs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-engine</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/engine/pom.xml b/engine/pom.xml
index 9046657..11eea7e 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index 5e1da62..ae79e6b 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-engine</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index e221795..3041e65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<packaging>pom</packaging>
<name>Apache Mahout</name>
@@ -99,7 +99,7 @@
<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_${scala.compat.version}
+ <tag>mahout-14.1_2.11-RC4
</tag>
</scm>
[mahout] 03/04: add dist/release to binary release
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch MAHOUT-2084
in repository https://gitbox.apache.org/repos/asf/mahout.git
commit dbc33dfcdc7568af6d8c22f95e5ba98abdd87287
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Thu Jan 23 01:30:34 2020 -0800
add dist/release to binary release
---
dist/src/main/resources/assembly/bin.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/dist/src/main/resources/assembly/bin.xml b/dist/src/main/resources/assembly/bin.xml
index 87b36bb..e5e2c31 100644
--- a/dist/src/main/resources/assembly/bin.xml
+++ b/dist/src/main/resources/assembly/bin.xml
@@ -111,6 +111,13 @@
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+ <fileSet>
+ <directory>release</directory>
+ <outputDirectory>dist/release</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
</fileSets>
</assembly>
[mahout] 01/04: [MAHOUT-2084] uppress default source release,
refactor releases for compliance with:
https://www.apache.org/dev/release-publishing#distribution
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch MAHOUT-2084
in repository https://gitbox.apache.org/repos/asf/mahout.git
commit 776cbac6aef3d940f78caf2b650f0967e77337e0
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Thu Jan 23 01:01:45 2020 -0800
[MAHOUT-2084] uppress default source release, refactor releases for compliance with:
https://www.apache.org/dev/release-publishing#distribution
---
core/pom.xml | 9 ------
{distribution => dist}/KEYS | 0
{distribution => dist}/pom.xml | 35 ++++++++++++++++++----
.../src/main/resources/assembly/bin.xml | 0
.../src/main/resources/assembly/src.xml | 9 ++++--
engine/pom.xml | 15 ----------
pom.xml | 25 +++++++++++++++-
7 files changed, 60 insertions(+), 33 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index e220d84..0c2875c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,15 +35,6 @@
<packaging>jar</packaging>
- <!-- <!– 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>-->
-
<dependencies>
diff --git a/distribution/KEYS b/dist/KEYS
similarity index 100%
rename from distribution/KEYS
rename to dist/KEYS
diff --git a/distribution/pom.xml b/dist/pom.xml
similarity index 83%
rename from distribution/pom.xml
rename to dist/pom.xml
index 91332b9..8869808 100644
--- a/distribution/pom.xml
+++ b/dist/pom.xml
@@ -26,7 +26,7 @@
<version>14.1-SNAPSHOT</version>
</parent>
- <artifactId>distribution_2.11</artifactId>
+ <artifactId>dist_2.11</artifactId>
<name>Mahout Release Package</name>
<description>Distribution Package</description>
@@ -69,13 +69,13 @@
<executions>
<execution>
<id>distro-assembly-bin</id>
- <phase>deploy</phase>
+ <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<attach>true</attach>
- <finalName>apache-mahout-${project.version}_${scala.compat.version}-bin</finalName>
+ <finalName>apache-mahout-${project.version}_${scala.compat.version}</finalName>
<skipAssembly>false</skipAssembly>
<descriptors>
<descriptor>${project.basedir}/src/main/resources/assembly/bin.xml</descriptor>
@@ -86,13 +86,13 @@
</execution>
<execution>
<id>distro-assembly-src</id>
- <phase>deploy</phase>
+ <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<attach>true</attach>
- <finalName>apache-mahout-${project.version}_${scala.compat.version}-src</finalName>
+ <finalName>apache-mahout-${project.version}_${scala.compat.version}</finalName>
<skipAssembly>false</skipAssembly>
<descriptors>
<descriptor>${project.basedir}/src/main/resources/assembly/src.xml</descriptor>
@@ -103,6 +103,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <copy todir="release">
+ <fileset dir="target">
+ <modified/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -123,13 +145,14 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
+
</plugins>
</pluginManagement>
</build>
diff --git a/distribution/src/main/resources/assembly/bin.xml b/dist/src/main/resources/assembly/bin.xml
similarity index 100%
rename from distribution/src/main/resources/assembly/bin.xml
rename to dist/src/main/resources/assembly/bin.xml
diff --git a/distribution/src/main/resources/assembly/src.xml b/dist/src/main/resources/assembly/src.xml
similarity index 88%
rename from distribution/src/main/resources/assembly/src.xml
rename to dist/src/main/resources/assembly/src.xml
index f4d291a..eb42029 100644
--- a/distribution/src/main/resources/assembly/src.xml
+++ b/dist/src/main/resources/assembly/src.xml
@@ -24,7 +24,7 @@ yes distributed under the License is distributed on an "AS IS" BASIS,
<format>tar.bz2</format>
</formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
@@ -42,8 +42,11 @@ yes distributed under the License is distributed on an "AS IS" BASIS,
<include>entrypoint*.sh</include>
<include>bin/**</include>
<include>engine/***</include>
+ <include>engine/**/**</include>
<include>core/**</include>
+ <include>core/**/**</include>
<include>community/**</include>
+ <include>community/**/**</include>
<include>conf/**</include>
<include>bin/**</include>
<include>website/**</include>
@@ -51,7 +54,9 @@ yes distributed under the License is distributed on an "AS IS" BASIS,
<include>lib/**</include>
<include>buildtools/**</include>
<include>experimental/**</include>
- <include>distribution/**</include>
+ <include>experimental/**/**</include>
+ <include>dist/**</include>
+ <include>examples/**</include>
<include>examples/**</include>
<include>resource-managers/**</include>
</includes>
diff --git a/engine/pom.xml b/engine/pom.xml
index 1912d7e..9046657 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -32,21 +32,6 @@
<packaging>pom</packaging>
- <!-- 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>
--->
-
-<!-- <modules>-->
-<!-- <module>hdfs</module>-->
-<!-- <module>spark</module>-->
-<!-- </modules>-->
-
<dependencies>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 352d345..e221795 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,7 +172,7 @@
<module>engine/hdfs</module>
<module>community</module>
<module>community/spark-cli-drivers</module>
- <module>distribution</module>
+ <module>dist</module>
</modules>
<dependencyManagement>
@@ -614,6 +614,29 @@
</plugin>
+ <!-- Override pare t pom's assembly plugin for -Papache-release we have our assembly code and descriptors
+ in the /dist directory adhering to https://www.apache.org/dev/release-publishing#distribution -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <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>dont-exeute</phase>
+ <goals>
+ <goal>dont-execute</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
[mahout] 02/04: filter files only to copy to release,
add release dir
Posted by ap...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch MAHOUT-2084
in repository https://gitbox.apache.org/repos/asf/mahout.git
commit a9326611594c3425d7fa71feeb0b2f9cb0f1066c
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Thu Jan 23 01:09:47 2020 -0800
filter files only to copy to release, add release dir
---
dist/pom.xml | 2 +-
dist/release/.gitdirectory | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dist/pom.xml b/dist/pom.xml
index 8869808..8bb8f4e 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -114,7 +114,7 @@
<tasks>
<copy todir="release">
<fileset dir="target">
- <modified/>
+ <type type="file"/>
</fileset>
</copy>
</tasks>
diff --git a/dist/release/.gitdirectory b/dist/release/.gitdirectory
new file mode 100644
index 0000000..e69de29