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 0d570328c4cfe05c8544648b08c4c824ac6aafd1 Author: Andrew Palumbo <[email protected]> AuthorDate: Fri Oct 18 02:40:01 2019 -0700 release recycling --- community/pom.xml | 4 ++-- community/spark-cli-drivers/pom.xml | 4 ++-- core/pom.xml | 2 +- engine/hdfs/pom.xml | 4 ++-- engine/pom.xml | 4 ++-- engine/spark/pom.xml | 4 ++-- pom.xml | 21 ++++++++++++++++++--- src/main/assembly/bin.xml | 2 +- src/main/assembly/src.xml | 4 ++-- src/pom.xml | 7 ++----- 10 files changed, 34 insertions(+), 22 deletions(-) diff --git a/community/pom.xml b/community/pom.xml index fac0bc4..892335c 100644 --- a/community/pom.xml +++ b/community/pom.xml @@ -23,12 +23,12 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>mahout-community</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <name>Mahout Community</name> <description>Not officially maintained, but still very useful scripts to use Mahout with. </description> diff --git a/community/spark-cli-drivers/pom.xml b/community/spark-cli-drivers/pom.xml index ddae73a..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> @@ -78,7 +78,7 @@ <dependency> <groupId>org.apache.mahout</groupId> <artifactId>mahout-core_2.12</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <classifier>tests</classifier> <scope>test</scope> </dependency> diff --git a/core/pom.xml b/core/pom.xml index cc5ffa0..054dae0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/engine/hdfs/pom.xml b/engine/hdfs/pom.xml index 57abcc2..cd1b6d6 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.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <!-- modules inherit parent's group id and version. --> <artifactId>mahout-hdfs_2.12</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <name>- Mahout HDFS Support</name> <description>Scalable machine learning libraries</description> diff --git a/engine/pom.xml b/engine/pom.xml index 4207043..d6ab468 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>mahout-engine</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <name>Mahout Engine</name> <description>Parent of Various Engines on which you can run Mahout. </description> diff --git a/engine/spark/pom.xml b/engine/spark/pom.xml index 0fbfb29..4aef009 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.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>mahout-spark_2.12</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <name>- Mahout Spark Engine</name> <description> Mahout Bindings for Apache Spark diff --git a/pom.xml b/pom.xml index aa2e449..775ceed 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>14.2-SNAPSHOT</version> + <version>14.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Mahout</name> @@ -119,7 +119,7 @@ <mahout.skip.distribution>true</mahout.skip.distribution> <!-- `mvn site` throws a hissy fit searching no longer existing repos if this is not set false --> <dependency.locations.enabled>false</dependency.locations.enabled> - + <mahout.skip.distribution>true</mahout.skip.distribution> <!--hack to turn off linting og generated Javadocs. this is an error in Oracle Java8 and should be fixed in > java8 http://openjdk.java.net/jeps/212 --> @@ -169,10 +169,12 @@ <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> @@ -233,6 +235,13 @@ <version>1.2.17</version> </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>3.1.1</version> + <type>maven-plugin</type> + </dependency> + </dependencies> </dependencyManagement> @@ -458,16 +467,22 @@ <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> </modules> <properties> <skipTests>true</skipTests> <pmd.skip>true</pmd.skip> <checkstyle.skip>true</checkstyle.skip> + <mahout.skip.distribution>false</mahout.skip.distribution> + </properties> </profile> <profile> diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml index 924f946..9c4431d 100644 --- a/src/main/assembly/bin.xml +++ b/src/main/assembly/bin.xml @@ -1,7 +1,7 @@ <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";> + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0";> <id>bin</id> <formats> diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml index 02c5dbc..909212b 100644 --- a/src/main/assembly/src.xml +++ b/src/main/assembly/src.xml @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; +<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/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0";> <id>src</id> <formats> <format>zip</format> diff --git a/src/pom.xml b/src/pom.xml index 81f82d7..4ca913a 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -25,9 +25,6 @@ <name>Mahout Release Package</name> <description>Distribution Package</description> <packaging>pom</packaging> - <properties> - <mahout.skip.distribution>true</mahout.skip.distribution> - </properties> <build> <defaultGoal>install</defaultGoal> <plugins> @@ -44,7 +41,7 @@ <configuration> <skipAssembly>${mahout.skip.distribution}</skipAssembly> <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>${project.basedir}/src/main/assembly/bin.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <appendAssemblyId>false</appendAssemblyId> @@ -59,7 +56,7 @@ <configuration> <skipAssembly>${mahout.skip.distribution}</skipAssembly> <descriptors> - <descriptor>src/main/assembly/src.xml</descriptor> + <descriptor>${project.basedir}/src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <appendAssemblyId>true</appendAssemblyId>
