Repository: mahout Updated Branches: refs/heads/master e2d0e14a3 -> a69fa9d4d
Rolling back Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/a69fa9d4 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/a69fa9d4 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/a69fa9d4 Branch: refs/heads/master Commit: a69fa9d4d7e442975882bec6ead383474c4ef003 Parents: e2d0e14 Author: Andrew Musselman <[email protected]> Authored: Fri Apr 14 11:17:16 2017 -0700 Committer: Andrew Musselman <[email protected]> Committed: Fri Apr 14 11:17:16 2017 -0700 ---------------------------------------------------------------------- buildtools/pom.xml | 2 +- distribution/pom.xml | 2 +- distribution/src/main/assembly/bin.xml | 24 ++++++++++++++++++++++++ examples/pom.xml | 2 +- h2o/pom.xml | 2 +- hdfs/pom.xml | 2 +- integration/pom.xml | 2 +- math-scala/pom.xml | 2 +- math/pom.xml | 2 +- mr/pom.xml | 2 +- pom.xml | 2 +- spark/pom.xml | 2 +- viennacl-omp/pom.xml | 2 +- viennacl/pom.xml | 2 +- 14 files changed, 37 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/buildtools/pom.xml ---------------------------------------------------------------------- diff --git a/buildtools/pom.xml b/buildtools/pom.xml index a28dbf4..c96b3a5 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.mahout</groupId> <artifactId>mahout-buildtools</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <name>Mahout Build Tools</name> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 2297ac3..9aca118 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>apache-mahout-distribution</artifactId> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml index a27577f..522f48a 100644 --- a/distribution/src/main/assembly/bin.xml +++ b/distribution/src/main/assembly/bin.xml @@ -155,6 +155,30 @@ <outputDirectory/> </fileSet> <fileSet> + <directory>${project.basedir}/../viennacl/target</directory> + <includes> + <include>mahout-*.jar</include> + </includes> + <excludes> + <exclude>*sources.jar</exclude> + <exclude>*javadoc.jar</exclude> + <exclude>*tests.jar</exclude> + </excludes> + <outputDirectory/> + </fileSet> + <fileSet> + <directory>${project.basedir}/../viennacl-omp/target</directory> + <includes> + <include>mahout-*.jar</include> + </includes> + <excludes> + <exclude>*sources.jar</exclude> + <exclude>*javadoc.jar</exclude> + <exclude>*tests.jar</exclude> + </excludes> + <outputDirectory/> + </fileSet> + <fileSet> <directory>${project.basedir}/../collections/target/apidocs</directory> <outputDirectory>docs/mahout-collections</outputDirectory> </fileSet> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 3798117..b3bf827 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/h2o/pom.xml ---------------------------------------------------------------------- diff --git a/h2o/pom.xml b/h2o/pom.xml index 5cb25e1..8811f2b 100644 --- a/h2o/pom.xml +++ b/h2o/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/hdfs/pom.xml b/hdfs/pom.xml index 37fcb89..34b104e 100644 --- a/hdfs/pom.xml +++ b/hdfs/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/integration/pom.xml ---------------------------------------------------------------------- diff --git a/integration/pom.xml b/integration/pom.xml index 5a873a6..d9945d9 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/math-scala/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/pom.xml b/math-scala/pom.xml index 02fe265..8951b29 100644 --- a/math-scala/pom.xml +++ b/math-scala/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/math/pom.xml ---------------------------------------------------------------------- diff --git a/math/pom.xml b/math/pom.xml index 2f088a0..ec5e668 100644 --- a/math/pom.xml +++ b/math/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/mr/pom.xml ---------------------------------------------------------------------- diff --git a/mr/pom.xml b/mr/pom.xml index b9cd010..8d50e33 100644 --- a/mr/pom.xml +++ b/mr/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8485c7c..6e249a1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Mahout</name> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index e08cbf3..231d53a 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/viennacl-omp/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl-omp/pom.xml b/viennacl-omp/pom.xml index 296c5c3..764eed7 100644 --- a/viennacl-omp/pom.xml +++ b/viennacl-omp/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/mahout/blob/a69fa9d4/viennacl/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl/pom.xml b/viennacl/pom.xml index f624c83..c85d7de 100644 --- a/viennacl/pom.xml +++ b/viennacl/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.1-SNAPSHOT</version> + <version>0.13.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>
