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