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 91a8865b34599d31a71d83e17672aa71ca726486 Author: Andrew Palumbo <[email protected]> AuthorDate: Wed Oct 30 02:33:49 2019 -0700 rollback snapshots --- community/spark-cli-drivers/pom.xml | 2 +- distribution/pom.xml | 28 ++++++++++++++++++++++++ distribution/src/main/resources/assembly/bin.xml | 2 +- distribution/src/main/resources/assembly/src.xml | 23 +++++++++---------- engine/hdfs/pom.xml | 2 +- engine/spark/pom.xml | 4 ++-- 6 files changed, 43 insertions(+), 18 deletions(-) diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml index a5bd7a6..5ce062b 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.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/distribution/pom.xml b/distribution/pom.xml index 10f0462..fb477e6 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -91,6 +91,34 @@ </executions> </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>build-classpath</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </profile> </profiles> diff --git a/distribution/src/main/resources/assembly/bin.xml b/distribution/src/main/resources/assembly/bin.xml index 651b61b..d74c7b1 100644 --- a/distribution/src/main/resources/assembly/bin.xml +++ b/distribution/src/main/resources/assembly/bin.xml @@ -10,7 +10,7 @@ <format>tar.bz2</format> </formats> -<includeBaseDirectory>false</includeBaseDirectory> +<includeBaseDirectory>true</includeBaseDirectory> <fileSets> diff --git a/distribution/src/main/resources/assembly/src.xml b/distribution/src/main/resources/assembly/src.xml index 23ddc0c..6eaad69 100644 --- a/distribution/src/main/resources/assembly/src.xml +++ b/distribution/src/main/resources/assembly/src.xml @@ -23,37 +23,34 @@ </formats> <fileSets> <fileSet> - <directory>${project.base.directory}/</directory> - <outputDirectory>${project.base.directory}/</outputDirectory> + <directory>${project.base.directory}/../../</directory> + <outputDirectory></outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> <includes> - <include>**README*</include> - <include>**LICENSE*</include> - <include>**NOTICE*</include> + <include>README*</include> + <include>LICENSE*</include> + <include>NOTICE*</include> <include>**pom.xml</include> <include>**src/**</include> <include>src/conf/**</include> <include>**/build.xml</include> <include>**/*.properties</include> - <include>*Dockerfile*</include> - <include>*entrypoint.sh*</include> - <include>src/pom.xml</include> - <include>src/main/assemblies/bin.xml</include> - <include>src/main/assemblies/src.xml</include> + <include>Dockerfile*</include> + <include>entrypoint.sh*</include> </includes> <excludes> <exclude>**/target/**</exclude> </excludes> </fileSet> <fileSet> - <directory>${project.base.directory}/bin</directory> + <directory>${project.base.directory}/../../bin</directory> <outputDirectory>bin</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> <fileMode>0755</fileMode> <directoryMode>0755</directoryMode> </fileSet> <fileSet> - <directory>${project.base.directory}/examples/bin</directory> + <directory>${project.base.directory}/../../examples/bin</directory> <outputDirectory>examples/bin</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> <fileMode>0755</fileMode> @@ -64,7 +61,7 @@ </excludes> </fileSet> <fileSet> - <directory>${project.base.directory}/examples/bin/resources</directory> + <directory>${project.base.directory}/../../examples/bin/resources</directory> <outputDirectory>examples/bin</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> <fileMode>0755</fileMode> diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml index e53ce7d..222ecc9 100644 --- a/engine/hdfs/pom.xml +++ b/engine/hdfs/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout-engine</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml index 700e24f..d278b3e 100644 --- a/engine/spark/pom.xml +++ b/engine/spark/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout-engine</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -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>
