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/11/02 08:37:33 UTC
[mahout] branch mahout-14.1 updated (4c034d0 -> 359b852)
This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a change to branch mahout-14.1
in repository https://gitbox.apache.org/repos/asf/mahout.git.
from 4c034d0 [maven-release-plugin] prepare for next development iteration
new 9b3a056 rollback releaase
new 6366f61 tweaks to release
new 3b992bd remove some hardcoding
new d91d623 Creatye a distribution module. move assembly into there
new 88fbbaa tweaks
new 5ccfa8b tweak
new 91a8865 rollback snapshots
new 429d019 succesful builds
new a4a8325 succesful builds
new 1a200e6 add submodule poms back to distro.
new a468d8e release recycling
new 941d7b4 rename Dockerfile to dockerfile.Spark.. this file is still [WIP]
new 378b2a0 change a couple of things in DockerFile
new cb48531 remove viernnacl-omp from distro
new 9d070af remove viernnacl-omp from distro-- in all places
new 4d88d5e remove viernnacl-omp from distro-- in all places --correctly
new 359b852 [maven-release-plugin] prepare release mahout-14.1
The 17 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.
Summary of changes:
Dockerfile | 9 +-
buildtools/pom.xml | 2 +-
community/pom.xml | 4 +-
community/spark-cli-drivers/pom.xml | 4 +-
core/pom.xml | 2 +-
distribution/pom.xml | 129 +++++++++++++
.../src/main/resources/assembly}/bin.xml | 60 +++---
distribution/src/main/resources/assembly/src.xml | 66 +++++++
engine/hdfs/pom.xml | 8 +-
engine/pom.xml | 4 +-
engine/spark/pom.xml | 8 +-
experimental/pom.xml | 8 +-
experimental/viennacl-omp/pom.xml | 6 +-
experimental/viennacl/pom.xml | 4 +-
pom.xml | 87 +++------
src/main/resources/assemblies/src.xml | 79 --------
src/pom.xml | 202 ---------------------
17 files changed, 280 insertions(+), 402 deletions(-)
create mode 100644 distribution/pom.xml
rename {src/main/resources/assemblies => distribution/src/main/resources/assembly}/bin.xml (56%)
create mode 100644 distribution/src/main/resources/assembly/src.xml
delete mode 100644 src/main/resources/assemblies/src.xml
delete mode 100644 src/pom.xml
[mahout] 11/17: release recycling
Posted by ap...@apache.org.
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
commit a468d8effd709a70198ba5567418e05b9d71111c
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Sat Nov 2 00:36:50 2019 -0700
release recycling
---
community/spark-cli-drivers/pom.xml | 4 ++--
core/pom.xml | 2 +-
distribution/pom.xml | 7 ++++++-
engine/hdfs/pom.xml | 4 ++--
engine/spark/pom.xml | 6 +++---
experimental/pom.xml | 8 ++++----
experimental/viennacl-omp/pom.xml | 6 ++++--
experimental/viennacl/pom.xml | 4 ++--
pom.xml | 11 +++++------
9 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index 1759cab..5ce062b 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 4c2de51..054dae0 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/distribution/pom.xml b/distribution/pom.xml
index 0fba910..59077ea 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>mahout</artifactId>
<groupId>org.apache.mahout</groupId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
@@ -54,6 +54,11 @@
<artifactId>mahout-spark-cli-drivers_${scala.compat.version}</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-spark-cli-drivers_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index 7c6e62e..222ecc9 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/spark/pom.xml b/engine/spark/pom.xml
index 55157f8..d278b3e 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
@@ -271,7 +271,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.1</version>
+ <version>14.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/experimental/pom.xml b/experimental/pom.xml
index 773706a..2af1317 100644
--- a/experimental/pom.xml
+++ b/experimental/pom.xml
@@ -23,25 +23,25 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>experimental</artifactId>
- <name>Mahout Experimental</name>
+ <name>Mahout Experimental Solvers</name>
<description>Provided, and under work, be careful using in production.
</description>
<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>
-
+-->
<properties>
</properties>
diff --git a/experimental/viennacl-omp/pom.xml b/experimental/viennacl-omp/pom.xml
index 4a322d4..4ea1b74 100644
--- a/experimental/viennacl-omp/pom.xml
+++ b/experimental/viennacl-omp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
- <artifactId>experimental</artifactId>
+ <artifactId>mahout</artifactId>
<version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -35,6 +35,7 @@
<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>
@@ -42,6 +43,7 @@
<tag>mahout-14.1
</tag>
</scm>
+-->
<build>
<plugins>
@@ -215,7 +217,7 @@
</execution>
</executions>
</plugin>
- <!-- delete jars on claen in top directory, which is MAHOUT_HOME -->
+ <!-- delete jars on cleen in top directory, which is MAHOUT_HOME -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
diff --git a/experimental/viennacl/pom.xml b/experimental/viennacl/pom.xml
index e7635b3..34728e5 100644
--- a/experimental/viennacl/pom.xml
+++ b/experimental/viennacl/pom.xml
@@ -36,13 +36,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/pom.xml b/pom.xml
index a01fc12..584f520 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>
@@ -447,11 +447,10 @@
<!--<module>community/community-engines/flink-batch</module>-->
<!--<module>community/community-engines/h2o</module>-->
<!--<module>community/mahout-mr</module>-->
- <!--<module>experimental</module>-->
+ <module>experimental</module>
<!--<module>experimental/viennacl</module>-->
-<!--
<module>experimental/viennacl-omp</module>
--->
+
</modules>
</profile>
@@ -470,13 +469,13 @@
<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</module>
+ <module>experimental/viennacl-omp</module>
<module>distribution</module>
</modules>
[mahout] 01/17: rollback releaase
Posted by ap...@apache.org.
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
commit 9b3a056f93f424bedbb4e725a8c7fb4900bd0332
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Mon Oct 28 15:28:11 2019 -0700
rollback releaase
---
community/spark-cli-drivers/pom.xml | 2 +-
core/pom.xml | 2 +-
engine/hdfs/pom.xml | 2 +-
engine/spark/pom.xml | 2 +-
pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index ddae73a..a5bd7a6 100644
--- a/community/spark-cli-drivers/pom.xml
+++ b/community/spark-cli-drivers/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_2.12</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index cc5ffa0..054dae0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index 57abcc2..b2c8dcd 100644
--- a/engine/hdfs/pom.xml
+++ b/engine/hdfs/pom.xml
@@ -29,7 +29,7 @@
<!-- modules inherit parent's group id and version. -->
<artifactId>mahout-hdfs_2.12</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<name>- Mahout HDFS Support</name>
<description>Scalable machine learning libraries</description>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index 0fbfb29..549fcaf 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>mahout-spark_2.12</artifactId>
- <version>14.2-SNAPSHOT</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 1b674dc..942bbb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Mahout</name>
[mahout] 13/17: change a couple of things in DockerFile
Posted by ap...@apache.org.
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
commit 378b2a0ad71337b8983afb47e6a4157906bb345b
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Sat Nov 2 01:08:47 2019 -0700
change a couple of things in DockerFile
---
Dockerfile.Spark => Dockerfile | 9 ++++++---
.../kubernetes/docker/src/main/dockerfiles/Dockerfile | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Dockerfile.Spark b/Dockerfile
similarity index 93%
rename from Dockerfile.Spark
rename to Dockerfile
index bad0917..0897f83 100644
--- a/Dockerfile.Spark
+++ b/Dockerfile
@@ -61,13 +61,16 @@ RUN set -ex && \
# rm /bin/sh && \
# ln -sv /bin/bash /bin/sh && \
# echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su && \
- # chgrp root /etc/passwd && chmod ug+rw /etc/passwd
+ chgrp root /etc/passwd && chmod ug+rw /etc/passwd
+
+# build mahout
+RUN mvn clean package install
ENV MAHOUT_HOME /opt/mahout
COPY lib ${MAHPOUT_HOME}/lib
COPY bin ${MAHPOUT_HOME}/bin
-COPY resource-managers/kubernetes/docker/src/main/dockerfiles/entrypoint.sh ${MAHPOUT_HOME}
-COPY resource-managers/kubernetes/docker/src/main/dockerfiles/Dockerfile ${MAHPOUT_HOME}
+COPY entrypoint.sh ${MAHPOUT_HOME}
+COPY Dockerfile ${MAHPOUT_HOME}
COPY examples ${MAHPOUT_HOME}/examples
ENV SPARK_HOME /opt/spark
diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/Dockerfile
index 5c7c89a..6f588ab 100644
--- a/resource-managers/kubernetes/docker/src/main/dockerfiles/Dockerfile
+++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/Dockerfile
@@ -22,8 +22,8 @@ ARG spark_uid=185
# Before building the mahout docker image, we must build a spark distrobution following
# the instructions in http://spark.apache.org/docs/latest/building-spark.html.
-# this Dockerfile.Spark will build the Spark version 2.4.3 against Scala 2.12.
-# docker build -t mahout:latest -f resource_managers/docker/kubernetes/src/main/dockerfiles/Dockerfile.Spark .
+# this Dockerfile will build the Spark version 2.4.3 against Scala 2.12.
+# docker build -t mahout:latest -f resource_managers/docker/kubernetes/src/main/dockerfiles/Dockerfile .
RUN set -ex && \
[mahout] 17/17: [maven-release-plugin] prepare release mahout-14.1
Posted by ap...@apache.org.
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
commit 359b8524c4df4c7ec8038524cc7267dac35a0037
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Sat Nov 2 01:37:28 2019 -0700
[maven-release-plugin] prepare release mahout-14.1
---
community/pom.xml | 4 ++--
community/spark-cli-drivers/pom.xml | 4 ++--
core/pom.xml | 2 +-
distribution/pom.xml | 2 +-
engine/hdfs/pom.xml | 4 ++--
engine/pom.xml | 4 ++--
engine/spark/pom.xml | 6 +++---
pom.xml | 2 +-
8 files changed, 14 insertions(+), 14 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 5ce062b..1759cab 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>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_2.12</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 054dae0..4c2de51 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/distribution/pom.xml b/distribution/pom.xml
index 59077ea..6d8454a 100644
--- a/distribution/pom.xml
+++ b/distribution/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>distribution</artifactId>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index 222ecc9..7c6e62e 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-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!-- modules inherit parent's group id and version. -->
<artifactId>mahout-hdfs_2.12</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<name>- Mahout HDFS Support</name>
<description>Scalable machine learning libraries</description>
diff --git a/engine/pom.xml b/engine/pom.xml
index d6ab468..2a3c38b 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-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mahout-engine</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</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 d278b3e..55157f8 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-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mahout-spark_2.12</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<name>- Mahout Spark Engine</name>
<description>
Mahout Bindings for Apache Spark
@@ -271,7 +271,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index bf91fe7..dedc1f3 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>
[mahout] 04/17: Creatye a distribution module. move assembly into
there
Posted by ap...@apache.org.
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
commit d91d623ee03cb353197f48f1acbabc210bf300cc
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Wed Oct 30 00:35:39 2019 -0700
Creatye a distribution module. move assembly into there
---
distribution/pom.xml | 109 +++++++++++++++++++++
src/pom.xml => distribution/src/_pom.xml | 19 ++--
.../src/main/resources/assembly}/bin.xml | 0
.../src/main/resources/assembly}/src.xml | 0
pom.xml | 67 +++----------
5 files changed, 132 insertions(+), 63 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
new file mode 100644
index 0000000..885f61d
--- /dev/null
+++ b/distribution/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>mahout</artifactId>
+ <groupId>org.apache.mahout</groupId>
+ <version>14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>distribution</artifactId>
+
+ <name>Mahout Release Package</name>
+ <description>Distribution Package</description>
+
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-core_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-hdfs_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-spark_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-spark-cli-drivers_${scala.compat.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+
+
+ <profiles>
+ <profile>
+ <id>mahout-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>bin-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>apache-mahout-${project.version}</finalName>
+ <skipAssembly>false</skipAssembly>
+ <descriptors>
+ <descriptor>${project.basedir}/distribution/src/main/resources/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>
+ <finalName>apache-mahout-${project.version}</finalName>
+ <skipAssembly>false</skipAssembly>
+ <descriptors>
+ <descriptor>${project.basedir}/distribution/src/main/resources/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
diff --git a/src/pom.xml b/distribution/src/_pom.xml
similarity index 95%
rename from src/pom.xml
rename to distribution/src/_pom.xml
index 3eda183..95290ad 100644
--- a/src/pom.xml
+++ b/distribution/src/_pom.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!–
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -12,20 +14,23 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
+–>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
<version>14.1-SNAPSHOT</version>
- <relativePath>./../pom.xml</relativePath>
+ <relativePath>../../_pom.xml</relativePath>
</parent>
- <artifactId>apache-mahout-distribution</artifactId>
+
+ <artifactId>distribution</artifactId>
<name>Mahout Release Package</name>
<description>Distribution Package</description>
+
<packaging>pom</packaging>
- <build>
+
+ <build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -47,7 +52,7 @@
<configuration>
<skipAssembly>false</skipAssembly>
<descriptors>
- <descriptor>${project.basedir}/src/main/resources/assemblies/bin.xml</descriptor>
+ <descriptor>${project.basedir}/distribution/src/main/resources/assembly/bin.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
@@ -62,7 +67,7 @@
<configuration>
<skipAssembly>false</skipAssembly>
<descriptors>
- <descriptor>${project.basedir}/src/main/resources/assemblies/src.xml</descriptor>
+ <descriptor>${project.basedir}/distribution/src/main/resources/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>true</appendAssemblyId>
@@ -199,4 +204,4 @@
<artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>-->
diff --git a/src/main/resources/assemblies/bin.xml b/distribution/src/main/resources/assembly/bin.xml
similarity index 100%
rename from src/main/resources/assemblies/bin.xml
rename to distribution/src/main/resources/assembly/bin.xml
diff --git a/src/main/resources/assemblies/src.xml b/distribution/src/main/resources/assembly/src.xml
similarity index 100%
rename from src/main/resources/assemblies/src.xml
rename to distribution/src/main/resources/assembly/src.xml
diff --git a/pom.xml b/pom.xml
index 9145a83..2ae0568 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
@@ -176,6 +177,7 @@
<module>engine/hdfs</module>
<!-- <module>community</module>-->
<module>community/spark-cli-drivers</module>
+ <module>distribution</module>
</modules>
@@ -454,7 +456,7 @@
</modules>
</profile>
- <profile>
+ <profile>
<id>release.prepare</id>
<properties>
@@ -462,9 +464,9 @@
<pmd.skip>true</pmd.skip>
<checkstyle.skip>true</checkstyle.skip>
<skipAssembly>false</skipAssembly>
-
</properties>
</profile>
+
<profile>
<id>mahout-release</id>
<modules>
@@ -478,59 +480,12 @@
<module>community</module>
-->
<module>community/spark-cli-drivers</module>
+ <module>distribution</module>
</modules>
- <properties>
- <skipTests>true</skipTests>
- <pmd.skip>true</pmd.skip>
- <checkstyle.skip>true</checkstyle.skip>
- <mahout.skip.distribution>false</mahout.skip.distribution>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>apache-mahout-distribution</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>bin-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>false</skipAssembly>
- <descriptors>
- <descriptor>${project.basedir}/src/main/resources/assemblies/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- <execution>
- <id>src-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>false</skipAssembly>
- <descriptors>
- <descriptor>${project.basedir}/src/main/resources/assemblies/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </properties>
+
+
</profile>
+
<profile>
<id>sourcecheck</id>
<build>
@@ -560,7 +515,7 @@
<configLocation>mahout-checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<linkXRef>false</linkXRef>
- <sourceDirectory>${basedir}/src</sourceDirectory>
+ <sourceDirectory>distribution/src</sourceDirectory>
</configuration>
</execution>
</executions>
[mahout] 15/17: remove viernnacl-omp from distro-- in all places
Posted by ap...@apache.org.
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
commit 9d070afbd7ebd95132012d088cc905cf6579a223
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Sat Nov 2 01:18:40 2019 -0700
remove viernnacl-omp from distro-- in all places
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4a921b9..eaf0c31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -478,8 +478,8 @@
<module>community</module>
<module>community/spark-cli-drivers</module>
<module>experimental</module>
- <module>experimental/viennacl-omp</module>
- <module>distribution</module>
+<!-- <module>experimental/viennacl-omp</module>
+ <module>distribution</module>-->
</modules>
[mahout] 03/17: remove some hardcoding
Posted by ap...@apache.org.
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
commit 3b992bd76ccd2282be70885c2398543635f3f71b
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Mon Oct 28 23:35:24 2019 -0700
remove some hardcoding
---
buildtools/pom.xml | 2 +-
engine/hdfs/pom.xml | 4 ++--
engine/spark/pom.xml | 2 +-
pom.xml | 46 +++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index cbbaa25..727f6bd 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -39,7 +39,7 @@
</properties>
<prerequisites>
- <maven>3.3.3</maven>
+ <maven>3.3.9</maven>
</prerequisites>
<build>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index b2c8dcd..e53ce7d 100644
--- a/engine/hdfs/pom.xml
+++ b/engine/hdfs/pom.xml
@@ -183,13 +183,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index 549fcaf..700e24f 100644
--- a/engine/spark/pom.xml
+++ b/engine/spark/pom.xml
@@ -252,7 +252,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 942bbb9..9145a83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -484,7 +484,51 @@
<pmd.skip>true</pmd.skip>
<checkstyle.skip>true</checkstyle.skip>
<mahout.skip.distribution>false</mahout.skip.distribution>
-
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>apache-mahout-distribution</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>bin-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <skipAssembly>false</skipAssembly>
+ <descriptors>
+ <descriptor>${project.basedir}/src/main/resources/assemblies/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <skipAssembly>false</skipAssembly>
+ <descriptors>
+ <descriptor>${project.basedir}/src/main/resources/assemblies/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</properties>
</profile>
<profile>
[mahout] 14/17: remove viernnacl-omp from distro
Posted by ap...@apache.org.
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
commit cb485311b9bb67bce79ae48dc21ba2767ffa320e
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Sat Nov 2 01:17:19 2019 -0700
remove viernnacl-omp from distro
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index e152e65..4a921b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,10 +450,10 @@
<!--<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>-->
+ <!--<module>experimental</module>
+ <!–<module>experimental/viennacl</module>–>
<module>experimental/viennacl-omp</module>
-
+-->
</modules>
</profile>
[mahout] 16/17: remove viernnacl-omp from distro-- in all places
--correctly
Posted by ap...@apache.org.
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
commit 4d88d5e4866bbfcec558c33cb59e538c55acc433
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Sat Nov 2 01:19:20 2019 -0700
remove viernnacl-omp from distro-- in all places --correctly
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index eaf0c31..bf91fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -477,9 +477,9 @@
<module>engine/spark</module>
<module>community</module>
<module>community/spark-cli-drivers</module>
- <module>experimental</module>
-<!-- <module>experimental/viennacl-omp</module>
- <module>distribution</module>-->
+<!-- <module>experimental</module>
+ <module>experimental/viennacl-omp</module>-->
+ <module>distribution</module>
</modules>
[mahout] 02/17: tweaks to 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-14.1
in repository https://gitbox.apache.org/repos/asf/mahout.git
commit 6366f61be8f38560902f97f1c413cdc95f3c4013
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Mon Oct 28 23:11:35 2019 -0700
tweaks to release
---
src/main/resources/assemblies/bin.xml | 1 -
src/main/resources/assemblies/src.xml | 5 ++---
src/pom.xml | 16 ++++++++--------
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/assemblies/bin.xml b/src/main/resources/assemblies/bin.xml
index a44f7e0..9b965e4 100644
--- a/src/main/resources/assemblies/bin.xml
+++ b/src/main/resources/assemblies/bin.xml
@@ -8,7 +8,6 @@
<formats>
<format>tar.gz</format>
<format>tar.bz2</format>
- <format>zip</format>
</formats>
<fileSets>
diff --git a/src/main/resources/assemblies/src.xml b/src/main/resources/assemblies/src.xml
index 909212b..23ddc0c 100644
--- a/src/main/resources/assemblies/src.xml
+++ b/src/main/resources/assemblies/src.xml
@@ -18,7 +18,6 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0">
<id>src</id>
<formats>
- <format>zip</format>
<format>tar.gz</format>
<format>tar.bz2</format>
</formats>
@@ -39,8 +38,8 @@
<include>*Dockerfile*</include>
<include>*entrypoint.sh*</include>
<include>src/pom.xml</include>
- <include>src/main/assembly/bin.xml</include>
- <include>src/main/assembly/src.xml</include>
+ <include>src/main/assemblies/bin.xml</include>
+ <include>src/main/assemblies/src.xml</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
diff --git a/src/pom.xml b/src/pom.xml
index 841d1e1..3eda183 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -32,37 +32,37 @@
<version>3.1.1</version>
<dependencies>
<dependency>
- <groupId>org.apache</groupId>
- <artifactId>mahout</artifactId>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>apache-mahout-distribution</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
- <id>bin</id>
+ <id>bin-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
- <skipAssembly>${mahout.skip.distribution}</skipAssembly>
+ <skipAssembly>false</skipAssembly>
<descriptors>
- <descriptor>${project.basedir}/src/main/resources/assembly/bin.xml</descriptor>
+ <descriptor>${project.basedir}/src/main/resources/assemblies/bin.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
<execution>
- <id>srcy</id>
+ <id>src-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
- <skipAssembly>${mahout.skip.distribution}</skipAssembly>
+ <skipAssembly>false</skipAssembly>
<descriptors>
- <descriptor>${project.basedir}/src/main/resources/assembly/src.xml</descriptor>
+ <descriptor>${project.basedir}/src/main/resources/assemblies/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>true</appendAssemblyId>
[mahout] 05/17: tweaks
Posted by ap...@apache.org.
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
commit 88fbbaa2d19376578bed665748a20161f48e77d7
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Wed Oct 30 02:10:44 2019 -0700
tweaks
---
distribution/pom.xml | 9 +++--
distribution/src/main/resources/assembly/bin.xml | 47 +++++++++++++-----------
pom.xml | 5 ++-
3 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 885f61d..19d218a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -66,10 +66,13 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+<!--
<version>3.1.1</version>
+-->
<executions>
<execution>
- <id>bin-assembly</id>
+ <id>distro-assembly</id>
+ <attach>true</attach>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -78,7 +81,7 @@
<finalName>apache-mahout-${project.version}</finalName>
<skipAssembly>false</skipAssembly>
<descriptors>
- <descriptor>${project.basedir}/distribution/src/main/resources/assembly/bin.xml</descriptor>
+ <descriptor>${project.basedir}/src/main/resources/assembly/bin.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>true</appendAssemblyId>
@@ -94,7 +97,7 @@
<finalName>apache-mahout-${project.version}</finalName>
<skipAssembly>false</skipAssembly>
<descriptors>
- <descriptor>${project.basedir}/distribution/src/main/resources/assembly/src.xml</descriptor>
+ <descriptor>${project.basedir}/src/main/resources/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>true</appendAssemblyId>
diff --git a/distribution/src/main/resources/assembly/bin.xml b/distribution/src/main/resources/assembly/bin.xml
index 9b965e4..651b61b 100644
--- a/distribution/src/main/resources/assembly/bin.xml
+++ b/distribution/src/main/resources/assembly/bin.xml
@@ -10,6 +10,9 @@
<format>tar.bz2</format>
</formats>
+<includeBaseDirectory>false</includeBaseDirectory>
+
+
<fileSets>
<!-- copy files from the base directory, including the base
@@ -17,8 +20,8 @@
the appropriate spark version Spark. No version of Hadoop is currently included.-->
<fileSet>
- <directory>${project.base.directory}</directory>
- <outputDirectory>${project.base.directory}/lib/</outputDirectory>
+ <directory>${basedir}/../../</directory>
+ <outputDirectory></outputDirectory>
<includes>
<include>**README*</include>
<include>**LICENSE*</include>
@@ -29,8 +32,8 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.base.directory}/lib</directory>
- <outputDirectory>${project.base.directory}/lib/</outputDirectory>
+ <directory>${basedir}/../../lib</directory>
+ <outputDirectory>lib/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
@@ -41,13 +44,13 @@
<!-- copy aggregated documentation into docs-->
<fileSet>
- <directory>${project.base.directory}/site</directory>
+ <directory>${basedir}/../../site</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
<!--copy bin/mahout.sh and other scripts -->
<fileSet>
- <directory>${project.base.directory}/bin</directory>
+ <directory>${basedir}/../../bin</directory>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
<outputDirectory>bin</outputDirectory>
@@ -57,11 +60,11 @@
<!-- copy and include the jars from e.g. $MAHOUT_HOME/engine/spark/target/-->
<!-- copy and include the jars from e.g. $MAHOUT_HOME/community/spark-cli-drivers/target/-->
<fileSet>
- <directory>${project.base.directory}/**/**/target/</directory>
- <outputDirectory>${project.base.directory}/lib</outputDirectory>
+ <directory>${basedir}/../../**/**/target/*.jar</directory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
<includes>
<include>*.jar</include>
</includes>
@@ -69,28 +72,28 @@
<!-- copy and include the jars from e.g. $MAHOUT_HOME/core/target/-->
<fileSet>
- <directory>${project.base.directory}/**/target/</directory>
- <outputDirectory>${project.base.directory}/lib</outputDirectory>
+ <directory>${basedir}/../../**/target/*.jar</directory>
+ <outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>${project.base.directory}/examples/bin</directory>
- <outputDirectory>${project.base.directory}/examples/bin/</outputDirectory>
+ <directory>${basedir}/../../examples/bin</directory>
+ <outputDirectory>examples/bin/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
</fileSet>
<fileSet>
- <directory>${project.base.directory}/examples/bin/resources</directory>
- <outputDirectory>${project.base.directory}/examples/bin/resources</outputDirectory>
+ <directory>${basedir}/../../examples/bin/resources</directory>
+ <outputDirectory>examples/bin/resources</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
</fileSet>
</fileSets>
</assembly>
diff --git a/pom.xml b/pom.xml
index 2ae0568..7b26fac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,6 @@
<module>engine/hdfs</module>
<!-- <module>community</module>-->
<module>community/spark-cli-drivers</module>
- <module>distribution</module>
</modules>
@@ -240,7 +239,9 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+<!--
<version>3.1.1</version>
+-->
<type>maven-plugin</type>
</dependency>
@@ -268,7 +269,7 @@
<configuration>
<preparationGoals>clean package install</preparationGoals>
<useReleaseProfile>true</useReleaseProfile>
- <releaseProfiles>apache-release</releaseProfiles>
+ <releaseProfiles>apache-release,mahout-release</releaseProfiles>
<goals>deploy</goals>
<autoVersionSubmodules>true</autoVersionSubmodules>
<arguments>${arguments}</arguments>
[mahout] 08/17: succesful builds
Posted by ap...@apache.org.
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
commit 429d0192dabd55cffeda59c70a7afe111f37a81b
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Wed Oct 30 03:10:46 2019 -0700
succesful builds
---
distribution/src/_pom.xml | 207 -----------------------
distribution/src/main/resources/assembly/bin.xml | 28 +--
distribution/src/main/resources/assembly/src.xml | 61 +++----
3 files changed, 40 insertions(+), 256 deletions(-)
diff --git a/distribution/src/_pom.xml b/distribution/src/_pom.xml
deleted file mode 100644
index 95290ad..0000000
--- a/distribution/src/_pom.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-<?xml version="1.0" encoding="UTF-8"?>
-<!–
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-–>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout</artifactId>
- <version>14.1-SNAPSHOT</version>
- <relativePath>../../_pom.xml</relativePath>
- </parent>
-
- <artifactId>distribution</artifactId>
- <name>Mahout Release Package</name>
- <description>Distribution Package</description>
-
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>apache-mahout-distribution</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>bin-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>false</skipAssembly>
- <descriptors>
- <descriptor>${project.basedir}/distribution/src/main/resources/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- <execution>
- <id>src-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>false</skipAssembly>
- <descriptors>
- <descriptor>${project.basedir}/distribution/src/main/resources/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
-
- <profile>
- <id>mahout-release</id>
- <properties>
- <mahout.skip.distribution>false</mahout.skip.distribution>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-hdfs_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark-cli-drivers_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>viennacl</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-hdfs_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark-cli-drivers_${scala.compat.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-native-viennacl-omp_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-native-viennacl_${scala.compat.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-native-viennacl-omp_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>viennacl-omp</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-hdfs_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark-cli-drivers_${scala.compat.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-native-viennacl-omp_${scala.compat.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-core_2.12</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-hdfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-mr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-examples</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-spark_${scala.compat.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-math-scala_${scala.compat.version}</artifactId>
- </dependency>
- </dependencies>
-</project>-->
diff --git a/distribution/src/main/resources/assembly/bin.xml b/distribution/src/main/resources/assembly/bin.xml
index d74c7b1..b03764a 100644
--- a/distribution/src/main/resources/assembly/bin.xml
+++ b/distribution/src/main/resources/assembly/bin.xml
@@ -20,19 +20,19 @@
the appropriate spark version Spark. No version of Hadoop is currently included.-->
<fileSet>
- <directory>${basedir}/../../</directory>
+ <directory>${basedir}/../</directory>
<outputDirectory></outputDirectory>
<includes>
- <include>**README*</include>
- <include>**LICENSE*</include>
- <include>**NOTICE*</include>
- <include>**pom.xml*</include>
- <include>**Dockerfile*</include>
- <include>**entrypoint.sh*</include>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>pom.xml*</include>
+ <include>Dockerfile*</include>
+ <include>entrypoint.sh*</include>
</includes>
</fileSet>
<fileSet>
- <directory>${basedir}/../../lib</directory>
+ <directory>${basedir}/../lib</directory>
<outputDirectory>lib/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
@@ -44,13 +44,13 @@
<!-- copy aggregated documentation into docs-->
<fileSet>
- <directory>${basedir}/../../site</directory>
+ <directory>${basedir}/../site</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
<!--copy bin/mahout.sh and other scripts -->
<fileSet>
- <directory>${basedir}/../../bin</directory>
+ <directory>${basedir}/../bin</directory>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
<outputDirectory>bin</outputDirectory>
@@ -60,7 +60,7 @@
<!-- copy and include the jars from e.g. $MAHOUT_HOME/engine/spark/target/-->
<!-- copy and include the jars from e.g. $MAHOUT_HOME/community/spark-cli-drivers/target/-->
<fileSet>
- <directory>${basedir}/../../**/**/target/*.jar</directory>
+ <directory>${basedir}/../**/**/target/*.jar</directory>
<outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>755</fileMode>
@@ -72,7 +72,7 @@
<!-- copy and include the jars from e.g. $MAHOUT_HOME/core/target/-->
<fileSet>
- <directory>${basedir}/../../**/target/*.jar</directory>
+ <directory>${basedir}/../**/target/*.jar</directory>
<outputDirectory>lib</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>755</fileMode>
@@ -82,14 +82,14 @@
</includes>
</fileSet>
<fileSet>
- <directory>${basedir}/../../examples/bin</directory>
+ <directory>${basedir}/../examples/bin</directory>
<outputDirectory>examples/bin/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
- <directory>${basedir}/../../examples/bin/resources</directory>
+ <directory>${basedir}/../examples/bin/resources</directory>
<outputDirectory>examples/bin/resources</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>755</fileMode>
diff --git a/distribution/src/main/resources/assembly/src.xml b/distribution/src/main/resources/assembly/src.xml
index 6eaad69..c69d74a 100644
--- a/distribution/src/main/resources/assembly/src.xml
+++ b/distribution/src/main/resources/assembly/src.xml
@@ -16,60 +16,51 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0">
+
<id>src</id>
+
<formats>
<format>tar.gz</format>
<format>tar.bz2</format>
</formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
<fileSets>
<fileSet>
- <directory>${project.base.directory}/../../</directory>
+ <directory>${basedir}/../</directory>
<outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
- <include>**pom.xml</include>
- <include>**src/**</include>
+ <include>pom.xml</include>
+ <include>src/**</include>
<include>src/conf/**</include>
- <include>**/build.xml</include>
- <include>**/*.properties</include>
<include>Dockerfile*</include>
- <include>entrypoint.sh*</include>
+ <include>entrypoint*.sh</include>
+ <include>bin/**</include>
+ <include>engine/***</include>
+ <include>core/**</include>
+ <include>community/**</include>
+ <include>conf/**</include>
+ <include>bin/**</include>
+ <include>website/**</include>
+ <include>docs/**</include>
+ <include>lib/**</include>
+ <include>buildtools/**</include>
+ <include>experimental/**</include>
+ <include>distribution/**</include>
+ <include>examples/**</include>
+ <include>resource-managers/**</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
+ <exclude>**/**/target/**</exclude>
+ <exclude>${basedir}/target<exclude></exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>${project.base.directory}/../../bin</directory>
- <outputDirectory>bin</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.base.directory}/../../examples/bin</directory>
- <outputDirectory>examples/bin</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.base.directory}/../../examples/bin/resources</directory>
- <outputDirectory>examples/bin</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>work</exclude>
- <exclude>work/**</exclude>
- </excludes>
- </fileSet>
+
</fileSets>
</assembly>
[mahout] 12/17: rename Dockerfile to dockerfile.Spark.. this file
is still [WIP]
Posted by ap...@apache.org.
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
commit 941d7b41f13482cf07ce6a908f2dfa6dacaf0ff3
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Sat Nov 2 00:58:16 2019 -0700
rename Dockerfile to dockerfile.Spark.. this file is still [WIP]
---
Dockerfile => Dockerfile.Spark | 0
pom.xml | 7 +++++--
.../kubernetes/docker/src/main/dockerfiles/Dockerfile | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile.Spark
similarity index 100%
rename from Dockerfile
rename to Dockerfile.Spark
diff --git a/pom.xml b/pom.xml
index 584f520..e152e65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,9 +173,12 @@
<module>engine</module>
<module>engine/spark</module>
<module>engine/hdfs</module>
- <module>community</module>
+ <module>community</module>
<module>community/spark-cli-drivers</module>
-
+ <!--<module>experimental</module>
+ <!–<module>experimental/viennacl</module>–>
+ <module>experimental/viennacl-omp</module>
+-->
</modules>
diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/Dockerfile
index 6f588ab..5c7c89a 100644
--- a/resource-managers/kubernetes/docker/src/main/dockerfiles/Dockerfile
+++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/Dockerfile
@@ -22,8 +22,8 @@ ARG spark_uid=185
# Before building the mahout docker image, we must build a spark distrobution following
# the instructions in http://spark.apache.org/docs/latest/building-spark.html.
-# this Dockerfile will build the Spark version 2.4.3 against Scala 2.12.
-# docker build -t mahout:latest -f resource_managers/docker/kubernetes/src/main/dockerfiles/Dockerfile .
+# this Dockerfile.Spark will build the Spark version 2.4.3 against Scala 2.12.
+# docker build -t mahout:latest -f resource_managers/docker/kubernetes/src/main/dockerfiles/Dockerfile.Spark .
RUN set -ex && \
[mahout] 06/17: tweak
Posted by ap...@apache.org.
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
commit 5ccfa8bc1b0dea0064204196e5522c8538d95507
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Wed Oct 30 02:13:38 2019 -0700
tweak
---
distribution/pom.xml | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 19d218a..10f0462 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -72,32 +72,17 @@
<executions>
<execution>
<id>distro-assembly</id>
- <attach>true</attach>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
+ <attach>true</attach>
<finalName>apache-mahout-${project.version}</finalName>
<skipAssembly>false</skipAssembly>
<descriptors>
- <descriptor>${project.basedir}/src/main/resources/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>
- <finalName>apache-mahout-${project.version}</finalName>
- <skipAssembly>false</skipAssembly>
- <descriptors>
- <descriptor>${project.basedir}/src/main/resources/assembly/src.xml</descriptor>
+ <descriptor>${project.basedir}/src/main/resources/assembly/bin.xml</descriptor>
+ <descriptor>${project.basedir}/src/main/resources/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>true</appendAssemblyId>
[mahout] 09/17: succesful builds
Posted by ap...@apache.org.
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
commit a4a8325fc84937612509125704c0e912625d1c75
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Wed Oct 30 03:34:53 2019 -0700
succesful builds
---
distribution/src/main/resources/assembly/src.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/resources/assembly/src.xml b/distribution/src/main/resources/assembly/src.xml
index c69d74a..294658d 100644
--- a/distribution/src/main/resources/assembly/src.xml
+++ b/distribution/src/main/resources/assembly/src.xml
@@ -58,9 +58,9 @@
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/**/target/**</exclude>
- <exclude>${basedir}/target<exclude></exclude>
+ <exclude>${basedir}/target</exclude>
</excludes>
</fileSet>
-
+
</fileSets>
</assembly>
[mahout] 07/17: rollback snapshots
Posted by ap...@apache.org.
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
commit 91a8865b34599d31a71d83e17672aa71ca726486
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Wed Oct 30 02:33:49 2019 -0700
rollback snapshots
---
community/spark-cli-drivers/pom.xml | 2 +-
distribution/pom.xml | 28 ++++++++++++++++++++++++
distribution/src/main/resources/assembly/bin.xml | 2 +-
distribution/src/main/resources/assembly/src.xml | 23 +++++++++----------
engine/hdfs/pom.xml | 2 +-
engine/spark/pom.xml | 4 ++--
6 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index a5bd7a6..5ce062b 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.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 10f0462..fb477e6 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -91,6 +91,34 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</profile>
</profiles>
diff --git a/distribution/src/main/resources/assembly/bin.xml b/distribution/src/main/resources/assembly/bin.xml
index 651b61b..d74c7b1 100644
--- a/distribution/src/main/resources/assembly/bin.xml
+++ b/distribution/src/main/resources/assembly/bin.xml
@@ -10,7 +10,7 @@
<format>tar.bz2</format>
</formats>
-<includeBaseDirectory>false</includeBaseDirectory>
+<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
diff --git a/distribution/src/main/resources/assembly/src.xml b/distribution/src/main/resources/assembly/src.xml
index 23ddc0c..6eaad69 100644
--- a/distribution/src/main/resources/assembly/src.xml
+++ b/distribution/src/main/resources/assembly/src.xml
@@ -23,37 +23,34 @@
</formats>
<fileSets>
<fileSet>
- <directory>${project.base.directory}/</directory>
- <outputDirectory>${project.base.directory}/</outputDirectory>
+ <directory>${project.base.directory}/../../</directory>
+ <outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
- <include>**README*</include>
- <include>**LICENSE*</include>
- <include>**NOTICE*</include>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
<include>**pom.xml</include>
<include>**src/**</include>
<include>src/conf/**</include>
<include>**/build.xml</include>
<include>**/*.properties</include>
- <include>*Dockerfile*</include>
- <include>*entrypoint.sh*</include>
- <include>src/pom.xml</include>
- <include>src/main/assemblies/bin.xml</include>
- <include>src/main/assemblies/src.xml</include>
+ <include>Dockerfile*</include>
+ <include>entrypoint.sh*</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
</excludes>
</fileSet>
<fileSet>
- <directory>${project.base.directory}/bin</directory>
+ <directory>${project.base.directory}/../../bin</directory>
<outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
- <directory>${project.base.directory}/examples/bin</directory>
+ <directory>${project.base.directory}/../../examples/bin</directory>
<outputDirectory>examples/bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
@@ -64,7 +61,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${project.base.directory}/examples/bin/resources</directory>
+ <directory>${project.base.directory}/../../examples/bin/resources</directory>
<outputDirectory>examples/bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index e53ce7d..222ecc9 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.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index 700e24f..d278b3e 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.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -271,7 +271,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.2-SNAPSHOT</version>
+ <version>14.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
[mahout] 10/17: add submodule poms back to distro.
Posted by ap...@apache.org.
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
commit 1a200e6193d0108d5f5fc503581b501897f8aeef
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Wed Oct 30 03:50:17 2019 -0700
add submodule poms back to distro.
---
community/spark-cli-drivers/pom.xml | 4 +-
core/pom.xml | 2 +-
distribution/pom.xml | 5 +--
distribution/src/main/resources/assembly/src.xml | 2 +-
engine/hdfs/pom.xml | 4 +-
engine/spark/pom.xml | 6 +--
pom.xml | 57 +++---------------------
7 files changed, 17 insertions(+), 63 deletions(-)
diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml
index 5ce062b..1759cab 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>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_2.12</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 054dae0..4c2de51 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/distribution/pom.xml b/distribution/pom.xml
index fb477e6..0fba910 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -16,15 +16,14 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>mahout</artifactId>
<groupId>org.apache.mahout</groupId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
</parent>
<artifactId>distribution</artifactId>
diff --git a/distribution/src/main/resources/assembly/src.xml b/distribution/src/main/resources/assembly/src.xml
index 294658d..f4d291a 100644
--- a/distribution/src/main/resources/assembly/src.xml
+++ b/distribution/src/main/resources/assembly/src.xml
@@ -8,7 +8,7 @@
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
+yes distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml
index 222ecc9..7c6e62e 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-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!-- modules inherit parent's group id and version. -->
<artifactId>mahout-hdfs_2.12</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<name>- Mahout HDFS Support</name>
<description>Scalable machine learning libraries</description>
diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml
index d278b3e..55157f8 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-SNAPSHOT</version>
+ <version>14.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mahout-spark_2.12</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<name>- Mahout Spark Engine</name>
<description>
Mahout Bindings for Apache Spark
@@ -271,7 +271,7 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core_${scala.compat.version}</artifactId>
- <version>14.1-SNAPSHOT</version>
+ <version>14.1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 7b26fac..a01fc12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
@@ -27,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>
@@ -170,12 +169,11 @@
<modules>
<module>core</module>
-<!--
+
<module>engine</module>
--->
<module>engine/spark</module>
<module>engine/hdfs</module>
-<!-- <module>community</module>-->
+ <module>community</module>
<module>community/spark-cli-drivers</module>
@@ -472,14 +470,12 @@
<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>distribution</module>
</modules>
@@ -616,47 +612,6 @@
<plugins>
- <!-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
-
- <id>bin-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
-
- <skipAssembly>${mahout.skip.distribution}</skipAssembly>
- <executions>
- <execution>
- <descriptors>
- <descriptor>${project.basedir}/src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- <execution>
- <id>src-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <skipAssembly>${mahout.skip.distribution}</skipAssembly>
- <descriptors>
- <descriptor>${project.basedir}/src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>-->
-
-
-
<!-- surefire runs unit tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>