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