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 1a200e6193d0108d5f5fc503581b501897f8aeef Author: Andrew Palumbo <[email protected]> AuthorDate: Wed Oct 30 03:50:17 2019 -0700 add submodule poms back to distro. --- community/spark-cli-drivers/pom.xml | 4 +- core/pom.xml | 2 +- distribution/pom.xml | 5 +-- distribution/src/main/resources/assembly/src.xml | 2 +- engine/hdfs/pom.xml | 4 +- engine/spark/pom.xml | 6 +-- pom.xml | 57 +++--------------------- 7 files changed, 17 insertions(+), 63 deletions(-) diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml index 5ce062b..1759cab 100644 --- a/community/spark-cli-drivers/pom.xml +++ b/community/spark-cli-drivers/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout-community</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -78,7 +78,7 @@ <dependency> <groupId>org.apache.mahout</groupId> <artifactId>mahout-core_2.12</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <classifier>tests</classifier> <scope>test</scope> </dependency> diff --git a/core/pom.xml b/core/pom.xml index 054dae0..4c2de51 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/distribution/pom.xml b/distribution/pom.xml index fb477e6..0fba910 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -16,15 +16,14 @@ 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";> +<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> + <version>14.1</version> </parent> <artifactId>distribution</artifactId> diff --git a/distribution/src/main/resources/assembly/src.xml b/distribution/src/main/resources/assembly/src.xml index 294658d..f4d291a 100644 --- a/distribution/src/main/resources/assembly/src.xml +++ b/distribution/src/main/resources/assembly/src.xml @@ -8,7 +8,7 @@ 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, +yes 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. diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml index 222ecc9..7c6e62e 100644 --- a/engine/hdfs/pom.xml +++ b/engine/hdfs/pom.xml @@ -23,13 +23,13 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout-engine</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> <!-- modules inherit parent's group id and version. --> <artifactId>mahout-hdfs_2.12</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <name>- Mahout HDFS Support</name> <description>Scalable machine learning libraries</description> diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml index d278b3e..55157f8 100644 --- a/engine/spark/pom.xml +++ b/engine/spark/pom.xml @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout-engine</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>mahout-spark_2.12</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <name>- Mahout Spark Engine</name> <description> Mahout Bindings for Apache Spark @@ -271,7 +271,7 @@ <dependency> <groupId>org.apache.mahout</groupId> <artifactId>mahout-core_${scala.compat.version}</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <classifier>tests</classifier> <scope>test</scope> </dependency> diff --git a/pom.xml b/pom.xml index 7b26fac..a01fc12 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,7 @@ 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/xsd/maven-4.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> @@ -27,7 +26,7 @@ <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.1-SNAPSHOT</version> + <version>14.1</version> <packaging>pom</packaging> <name>Apache Mahout</name> @@ -170,12 +169,11 @@ <modules> <module>core</module> -<!-- + <module>engine</module> ---> <module>engine/spark</module> <module>engine/hdfs</module> -<!-- <module>community</module>--> + <module>community</module> <module>community/spark-cli-drivers</module> @@ -472,14 +470,12 @@ <id>mahout-release</id> <modules> <module>core</module> -<!-- + <module>engine</module> ---> <module>engine/hdfs</module> <module>engine/spark</module> -<!-- + <module>community</module> ---> <module>community/spark-cli-drivers</module> <module>distribution</module> </modules> @@ -616,47 +612,6 @@ <plugins> - <!-- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - - <id>bin-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - - <skipAssembly>${mahout.skip.distribution}</skipAssembly> - <executions> - <execution> - <descriptors> - <descriptor>${project.basedir}/src/main/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>${mahout.skip.distribution}</skipAssembly> - <descriptors> - <descriptor>${project.basedir}/src/main/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - <appendAssemblyId>true</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin>--> - - - <!-- surefire runs unit tests --> <plugin> <groupId>org.apache.maven.plugins</groupId>
