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 <[email protected]> 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>
