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 25ae289e53332681104126128f75701317555c23 Author: Andrew Palumbo <[email protected]> AuthorDate: Sat Nov 2 03:20:06 2019 -0700 ensure distribution builds snd deploys for both apache-release and mahout-release profiles --- distribution/pom.xml | 2 +- distribution/src/main/resources/assembly/bin.xml | 16 ++++++++++++++++ engine/spark/pom.xml | 2 +- pom.xml | 5 ++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 59077ea..e4f02c4 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -65,7 +65,7 @@ <profiles> <profile> - <id>mahout-release</id> + <id>apache-release,mahout-release</id> <build> <plugins> <plugin> diff --git a/distribution/src/main/resources/assembly/bin.xml b/distribution/src/main/resources/assembly/bin.xml index b03764a..87b36bb 100644 --- a/distribution/src/main/resources/assembly/bin.xml +++ b/distribution/src/main/resources/assembly/bin.xml @@ -2,6 +2,22 @@ <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/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd";> + <!-- + 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. + --> <id>bin</id> diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml index f94e121..d278b3e 100644 --- a/engine/spark/pom.xml +++ b/engine/spark/pom.xml @@ -271,7 +271,7 @@ <dependency> <groupId>org.apache.mahout</groupId> <artifactId>mahout-core_${scala.compat.version}</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <classifier>tests</classifier> <scope>test</scope> </dependency> diff --git a/pom.xml b/pom.xml index bf91fe7..006a1b0 100644 --- a/pom.xml +++ b/pom.xml @@ -179,6 +179,8 @@ <!–<module>experimental/viennacl</module>–> <module>experimental/viennacl-omp</module> --> + <module>distribution</module> + </modules> @@ -453,7 +455,8 @@ <!--<module>experimental</module> <!–<module>experimental/viennacl</module>–> <module>experimental/viennacl-omp</module> ---> +--> <module>distribution</module> + </modules> </profile>
