This is an automated email from the ASF dual-hosted git repository. apalumbo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mahout.git
commit 8338ccf1aa91c14d3aa41bb24cc727b824d6ff6e Author: Andrew Palumbo <[email protected]> AuthorDate: Thu May 23 15:47:17 2019 -0700 Squashed commit of the following: commit 8ffc011e839d1f19f7db7f3f42bcf6cded79cdf2 Author: Andrew Palumbo <[email protected]> Date: Thu May 23 15:31:57 2019 -0700 (NoJira) bin/assembly/xml commit 1c876229106cab5efa4ebd39c8eb4a83fcbc8e4f Author: Andrew Palumbo <[email protected]> Date: Tue May 21 17:02:23 2019 -0700 remove sparkclidependancyreduced.2 commit 058251c18aeefc6daa1ccb3f507abe8d8d0cad35 Author: Andrew Palumbo <[email protected]> Date: Tue May 21 16:59:26 2019 -0700 remove sparkclidependancyreduced commit 06685121f9f964c535c9fa3258e0190152b6c328 Author: Andrew Palumbo <[email protected]> Date: Tue May 21 16:46:35 2019 -0700 (nojira) release version --- buildtools/assembly/bin.xml | 28 +++++++++++++++---------- community/community-engines/flink-batch/pom.xml | 2 +- community/community-engines/h2o/pom.xml | 2 +- community/community-engines/pom.xml | 2 +- community/mahout-mr/integration/pom.xml | 2 +- community/mahout-mr/mr-examples/pom.xml | 2 +- community/mahout-mr/mr/pom.xml | 2 +- community/mahout-mr/pom.xml | 2 +- community/pom.xml | 2 +- community/spark-cli-drivers/pom.xml | 12 +++++------ core/pom.xml | 2 +- engine/hdfs/pom.xml | 2 +- engine/pom.xml | 2 +- engine/spark/pom.xml | 2 +- pom.xml | 22 +++++++++---------- 15 files changed, 46 insertions(+), 40 deletions(-) diff --git a/buildtools/assembly/bin.xml b/buildtools/assembly/bin.xml index 0760eba..4c08156 100644 --- a/buildtools/assembly/bin.xml +++ b/buildtools/assembly/bin.xml @@ -13,52 +13,58 @@ See the License for the specific language governing permissions and limitations under the License. --> + <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> + + <!--NOTE, ${project.basedir} has been overwritten due to multi module build + ${project.basedir} == `pwd` (in this case), == $MAHOUT_HOME/buildtools/assembly; + we cant always assume a $MAHOUT_HOME environment variable, so current workaround + will use relative paths in this case we are 2 levels deep from $MAHOUT_HOME--> + <id>bin</id> <formats> <format>dir</format> <format>tar.gz</format> </formats> - <fileSets> <fileSet> - <directory>${project.basedir}/../lib</directory> + <directory>${project.basedir}/../../lib</directory> <includes> <include>*.jar</include> </includes> <outputDirectory>lib</outputDirectory> </fileSet> <!-- hack for modules like hdfs/engine--> - <fileSet> + <!--<fileSet> <directory>${project.basedir}/../../lib</directory> <includes> <include>*.jar</include> </includes> <outputDirectory>lib</outputDirectory> - </fileSet> + </fileSet>--> <fileSet> - <directory>${project.basedir}/docs</directory> + <directory>${project.basedir}/../../docs</directory> <outputDirectory>docs</outputDirectory> </fileSet> <fileSet> - <directory>${project.basedir}</directory> + <directory>${project.basedir}/../../</directory> <outputDirectory/> <useDefaultExcludes>true</useDefaultExcludes> <includes> - <include>**/README*</include> - <include>**/LICENSE*</include> - <include>**/NOTICE*</include> - <include>**/*.properties</include> + <include>README*</include> + <include>LICENSE*</include> + <include>NOTICE*</include> + <include>*.properties</include> </includes> <excludes> <exclude>**/target/**</exclude> </excludes> </fileSet> <fileSet> - <directory>${project.basedir}/../bin</directory> + <directory>${project.basedir}/../../bin</directory> <outputDirectory>bin</outputDirectory> <fileMode>0755</fileMode> <directoryMode>0755</directoryMode> diff --git a/community/community-engines/flink-batch/pom.xml b/community/community-engines/flink-batch/pom.xml index 35ed1b9..1a2b2fd 100644 --- a/community/community-engines/flink-batch/pom.xml +++ b/community/community-engines/flink-batch/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>community-engines</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/community/community-engines/h2o/pom.xml b/community/community-engines/h2o/pom.xml index c2f96b1..75c51a8 100644 --- a/community/community-engines/h2o/pom.xml +++ b/community/community-engines/h2o/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>community-engines</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/community/community-engines/pom.xml b/community/community-engines/pom.xml index 2c676a9..cf0566d 100644 --- a/community/community-engines/pom.xml +++ b/community/community-engines/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>community</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/community/mahout-mr/integration/pom.xml b/community/mahout-mr/integration/pom.xml index 6afeebe..9d9a8c9 100644 --- a/community/mahout-mr/integration/pom.xml +++ b/community/mahout-mr/integration/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout-mr</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/community/mahout-mr/mr-examples/pom.xml b/community/mahout-mr/mr-examples/pom.xml index b5180f2..7f71da3 100644 --- a/community/mahout-mr/mr-examples/pom.xml +++ b/community/mahout-mr/mr-examples/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout-mr</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/community/mahout-mr/mr/pom.xml b/community/mahout-mr/mr/pom.xml index 7588f28..fd114ba 100644 --- a/community/mahout-mr/mr/pom.xml +++ b/community/mahout-mr/mr/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout-mr</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/community/mahout-mr/pom.xml b/community/mahout-mr/pom.xml index 2250a14..1847546 100644 --- a/community/mahout-mr/pom.xml +++ b/community/mahout-mr/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>community</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/community/pom.xml b/community/pom.xml index 98169da..ad2b233 100644 --- a/community/pom.xml +++ b/community/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/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml index b3d1c96..887399f 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>community</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -70,10 +70,10 @@ <build> - <plugins><!-- - <!– create fat jar –> - <plugin> - <groupId>org.apache.maven.plugins</groupId> + <plugins> + <!-- create fat jar --> + <!--<plugin>--> + <!--<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> @@ -89,7 +89,7 @@ </configuration> </execution> </executions> - </plugin>--> + <plugin> --> <!-- ensure licenses --> diff --git a/core/pom.xml b/core/pom.xml index a5ec594..3154a1d 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/engine/hdfs/pom.xml b/engine/hdfs/pom.xml index d574755..653ea81 100644 --- a/engine/hdfs/pom.xml +++ b/engine/hdfs/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>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 d56d737..3752b63 100644 --- a/engine/pom.xml +++ b/engine/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/engine/spark/pom.xml b/engine/spark/pom.xml index c1d206d..2d3c6c6 100644 --- a/engine/spark/pom.xml +++ b/engine/spark/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>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 240410a..d2476b0 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> @@ -481,24 +481,24 @@ </execution> </executions> </plugin> - <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> + <id>bin-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <skipAssembly>${mahout.skip.distribution}</skipAssembly> <descriptors> <descriptor>buildtools/assembly/bin.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> - <appendAssemblyId>false</appendAssemblyId> - </configuration> + <appendAssemblyId>true</appendAssemblyId> + </configuration> </execution> <execution> <id>src-assembly</id>
