This is an automated email from the ASF dual-hosted git repository. apalumbo pushed a commit to branch MAHOUT-2084 in repository https://gitbox.apache.org/repos/asf/mahout.git
commit 776cbac6aef3d940f78caf2b650f0967e77337e0 Author: Andrew Palumbo <[email protected]> AuthorDate: Thu Jan 23 01:01:45 2020 -0800 [MAHOUT-2084] uppress default source release, refactor releases for compliance with: https://www.apache.org/dev/release-publishing#distribution --- core/pom.xml | 9 ------ {distribution => dist}/KEYS | 0 {distribution => dist}/pom.xml | 35 ++++++++++++++++++---- .../src/main/resources/assembly/bin.xml | 0 .../src/main/resources/assembly/src.xml | 9 ++++-- engine/pom.xml | 15 ---------- pom.xml | 25 +++++++++++++++- 7 files changed, 60 insertions(+), 33 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index e220d84..0c2875c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -35,15 +35,6 @@ <packaging>jar</packaging> - <!-- <!– per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.–> - <scm> - <connection>scm:git:[email protected]:apache/mahout.git</connection> - <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection> - <url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url> - <tag>mahout-14.1 - </tag> - </scm>--> - <dependencies> diff --git a/distribution/KEYS b/dist/KEYS similarity index 100% rename from distribution/KEYS rename to dist/KEYS diff --git a/distribution/pom.xml b/dist/pom.xml similarity index 83% rename from distribution/pom.xml rename to dist/pom.xml index 91332b9..8869808 100644 --- a/distribution/pom.xml +++ b/dist/pom.xml @@ -26,7 +26,7 @@ <version>14.1-SNAPSHOT</version> </parent> - <artifactId>distribution_2.11</artifactId> + <artifactId>dist_2.11</artifactId> <name>Mahout Release Package</name> <description>Distribution Package</description> @@ -69,13 +69,13 @@ <executions> <execution> <id>distro-assembly-bin</id> - <phase>deploy</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> <attach>true</attach> - <finalName>apache-mahout-${project.version}_${scala.compat.version}-bin</finalName> + <finalName>apache-mahout-${project.version}_${scala.compat.version}</finalName> <skipAssembly>false</skipAssembly> <descriptors> <descriptor>${project.basedir}/src/main/resources/assembly/bin.xml</descriptor> @@ -86,13 +86,13 @@ </execution> <execution> <id>distro-assembly-src</id> - <phase>deploy</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> <attach>true</attach> - <finalName>apache-mahout-${project.version}_${scala.compat.version}-src</finalName> + <finalName>apache-mahout-${project.version}_${scala.compat.version}</finalName> <skipAssembly>false</skipAssembly> <descriptors> <descriptor>${project.basedir}/src/main/resources/assembly/src.xml</descriptor> @@ -103,6 +103,28 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.4</version> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + <configuration> + <tasks> + <copy todir="release"> + <fileset dir="target"> + <modified/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> <plugins> @@ -123,13 +145,14 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> </plugin> + </plugins> </pluginManagement> </build> diff --git a/distribution/src/main/resources/assembly/bin.xml b/dist/src/main/resources/assembly/bin.xml similarity index 100% rename from distribution/src/main/resources/assembly/bin.xml rename to dist/src/main/resources/assembly/bin.xml diff --git a/distribution/src/main/resources/assembly/src.xml b/dist/src/main/resources/assembly/src.xml similarity index 88% rename from distribution/src/main/resources/assembly/src.xml rename to dist/src/main/resources/assembly/src.xml index f4d291a..eb42029 100644 --- a/distribution/src/main/resources/assembly/src.xml +++ b/dist/src/main/resources/assembly/src.xml @@ -24,7 +24,7 @@ yes distributed under the License is distributed on an "AS IS" BASIS, <format>tar.bz2</format> </formats> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <fileSets> <fileSet> @@ -42,8 +42,11 @@ yes distributed under the License is distributed on an "AS IS" BASIS, <include>entrypoint*.sh</include> <include>bin/**</include> <include>engine/***</include> + <include>engine/**/**</include> <include>core/**</include> + <include>core/**/**</include> <include>community/**</include> + <include>community/**/**</include> <include>conf/**</include> <include>bin/**</include> <include>website/**</include> @@ -51,7 +54,9 @@ yes distributed under the License is distributed on an "AS IS" BASIS, <include>lib/**</include> <include>buildtools/**</include> <include>experimental/**</include> - <include>distribution/**</include> + <include>experimental/**/**</include> + <include>dist/**</include> + <include>examples/**</include> <include>examples/**</include> <include>resource-managers/**</include> </includes> diff --git a/engine/pom.xml b/engine/pom.xml index 1912d7e..9046657 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -32,21 +32,6 @@ <packaging>pom</packaging> - <!-- per http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms ensure that all poms have SCM managment.--> - <!--<scm> - <connection>scm:git:[email protected]:apache/mahout.git</connection> - <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mahout.git</developerConnection> - <url>https://gitbox.apache.org/repos/asf?p=mahout.git;a=tree;h=refs/heads/${project.scm.tag};hb=${project.scm.tag}</url> - <tag>mahout-14.1 - </tag> - </scm> ---> - -<!-- <modules>--> -<!-- <module>hdfs</module>--> -<!-- <module>spark</module>--> -<!-- </modules>--> - <dependencies> </dependencies> diff --git a/pom.xml b/pom.xml index 352d345..e221795 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ <module>engine/hdfs</module> <module>community</module> <module>community/spark-cli-drivers</module> - <module>distribution</module> + <module>dist</module> </modules> <dependencyManagement> @@ -614,6 +614,29 @@ </plugin> + <!-- Override pare t pom's assembly plugin for -Papache-release we have our assembly code and descriptors + in the /dist directory adhering to https://www.apache.org/dev/release-publishing#distribution --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apache.resources</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <version>1.0.6</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>source-release-assembly</id> + <phase>dont-exeute</phase> + <goals> + <goal>dont-execute</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <inherited>true</inherited> <groupId>org.apache.maven.plugins</groupId>
