You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by bi...@apache.org on 2010/03/19 02:30:35 UTC
svn commit: r925070 - in /lucene/mahout/trunk: ./ distribution/
distribution/src/ distribution/src/main/ distribution/src/main/assembly/
Author: bimargulies
Date: Fri Mar 19 01:30:34 2010
New Revision: 925070
URL: http://svn.apache.org/viewvc?rev=925070&view=rev
Log:
Start of Mahout-338. Move the creation of the release bundles to a 'distribution' directory.
Added:
lucene/mahout/trunk/distribution/
lucene/mahout/trunk/distribution/pom.xml (with props)
lucene/mahout/trunk/distribution/src/
lucene/mahout/trunk/distribution/src/main/
lucene/mahout/trunk/distribution/src/main/assembly/
lucene/mahout/trunk/distribution/src/main/assembly/bin.xml
- copied, changed from r925055, lucene/mahout/trunk/src/main/assembly/bin.xml
lucene/mahout/trunk/distribution/src/main/assembly/src.xml
- copied, changed from r925055, lucene/mahout/trunk/src/main/assembly/src.xml
lucene/mahout/trunk/distribution/src/main/assembly/xpp3-LICENSE.txt
- copied unchanged from r925055, lucene/mahout/trunk/src/main/assembly/xpp3-LICENSE.txt
lucene/mahout/trunk/distribution/src/main/assembly/xstream-LICENSE.txt
- copied unchanged from r925055, lucene/mahout/trunk/src/main/assembly/xstream-LICENSE.txt
Modified:
lucene/mahout/trunk/pom.xml
Added: lucene/mahout/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/distribution/pom.xml?rev=925070&view=auto
==============================================================================
--- lucene/mahout/trunk/distribution/pom.xml (added)
+++ lucene/mahout/trunk/distribution/pom.xml Fri Mar 19 01:30:34 2010
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<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>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-parent</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <relativePath>../maven</relativePath>
+ </parent>
+
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-distribution</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <name>Mahout Release Package</name>
+ <description>Distribution Package</description>
+
+ <packaging>pom</packaging>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+ <execution>
+ <id>bin-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>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>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-collections</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-math</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-examples</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/trunk/distribution</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/trunk/distribution</developerConnection>
+ <url>https://svn.apache.org/repos/asf/lucene/mahout/mahout-distribution</url>
+ </scm>
+</project>
Propchange: lucene/mahout/trunk/distribution/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/distribution/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: lucene/mahout/trunk/distribution/src/main/assembly/bin.xml (from r925055, lucene/mahout/trunk/src/main/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/distribution/src/main/assembly/bin.xml?p2=lucene/mahout/trunk/distribution/src/main/assembly/bin.xml&p1=lucene/mahout/trunk/src/main/assembly/bin.xml&r1=925055&r2=925070&rev=925070&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/assembly/bin.xml (original)
+++ lucene/mahout/trunk/distribution/src/main/assembly/bin.xml Fri Mar 19 01:30:34 2010
@@ -3,6 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<formats>
+ <format>dir</format>
<format>tar.gz</format>
<format>tar.bz2</format>
<format>zip</format>
@@ -10,7 +11,7 @@
<fileSets>
<fileSet>
- <directory>examples/target/dependency</directory>
+ <directory>../examples/target/dependency</directory>
<includes>
<include>*.jar</include>
</includes>
@@ -20,7 +21,7 @@
<outputDirectory>lib</outputDirectory>
</fileSet>
<fileSet>
- <directory>collections/target</directory>
+ <directory>../collections/target</directory>
<includes>
<include>mahout-*.jar</include>
</includes>
@@ -32,7 +33,7 @@
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>math/target</directory>
+ <directory>../math/target</directory>
<includes>
<include>mahout-*.jar</include>
</includes>
@@ -44,7 +45,7 @@
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>core/target</directory>
+ <directory>../core/target</directory>
<includes>
<include>mahout-*.job</include>
<include>mahout-*.jar</include>
@@ -57,7 +58,7 @@
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>utils/target</directory>
+ <directory>../utils/target</directory>
<includes>
<include>mahout-*.job</include>
<include>mahout-*.jar</include>
@@ -70,7 +71,7 @@
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>examples/target</directory>
+ <directory>../examples/target</directory>
<includes>
<include>mahout-*.jar</include>
<include>mahout-*.job</include>
@@ -83,44 +84,40 @@
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>taste-web/target</directory>
+ <directory>../taste-web/target</directory>
<includes>
<include>mahout-*.war</include>
</includes>
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>collections/target/apidocs</directory>
+ <directory>../collections/target/apidocs</directory>
<outputDirectory>docs/mahout-collections</outputDirectory>
</fileSet>
<fileSet>
- <directory>conf</directory>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>math/target/apidocs</directory>
+ <directory>../math/target/apidocs</directory>
<outputDirectory>docs/mahout-math</outputDirectory>
</fileSet>
<fileSet>
- <directory>core/target/apidocs</directory>
+ <directory>../core/target/apidocs</directory>
<outputDirectory>docs/mahout-core</outputDirectory>
</fileSet>
<fileSet>
- <directory>utils/target/apidocs</directory>
+ <directory>../utils/target/apidocs</directory>
<outputDirectory>docs/mahout-utils</outputDirectory>
</fileSet>
<fileSet>
- <directory>examples/target/apidocs</directory>
+ <directory>../examples/target/apidocs</directory>
<outputDirectory>docs/mahout-examples</outputDirectory>
</fileSet>
<fileSet>
<directory></directory>
<outputDirectory/>
<includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>KEYS</include>
+ <include>../README*</include>
+ <include>../LICENSE*</include>
+ <include>../NOTICE*</include>
+ <include>../KEYS</include>
</includes>
<fileMode>0644</fileMode>
</fileSet>
@@ -133,7 +130,7 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>bin</directory>
+ <directory>../bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>mahout</include>
@@ -141,7 +138,7 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>conf</directory>
+ <directory>../conf</directory>
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
</fileSet>
Copied: lucene/mahout/trunk/distribution/src/main/assembly/src.xml (from r925055, lucene/mahout/trunk/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/distribution/src/main/assembly/src.xml?p2=lucene/mahout/trunk/distribution/src/main/assembly/src.xml&p1=lucene/mahout/trunk/src/main/assembly/src.xml&r1=925055&r2=925070&rev=925070&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/assembly/src.xml (original)
+++ lucene/mahout/trunk/distribution/src/main/assembly/src.xml Fri Mar 19 01:30:34 2010
@@ -3,28 +3,28 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>src</id>
<formats>
+ <format>dir</format>
<format>tar.gz</format>
<format>tar.bz2</format>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
- <directory/>
+ <directory>${project.basedir}/..</directory>
<outputDirectory/>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
- <include>${project.basedir}/**/README*</include>
- <include>${project.basedir}/**/LICENSE*</include>
- <include>${project.basedir}/**/NOTICE*</include>
- <include>${project.basedir}/**/pom.xml</include>
- <include>${project.basedir}/**/src/**</include>
- <include>${project.basedir}/conf/**</include>
- <include>${project.basedir}/**/build.xml</include>
- <include>${project.basedir}/**/*.properties</include>
+ <include>**/README*</include>
+ <include>**/LICENSE*</include>
+ <include>**/NOTICE*</include>
+ <include>**/pom.xml</include>
+ <include>**/src/**</include>
+ <include>conf/**</include>
+ <include>**/build.xml</include>
+ <include>**/*.properties</include>
</includes>
<excludes>
<exclude>target/**</exclude>
- <exclude>**/target/**</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -32,7 +32,7 @@
<outputDirectory/>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
- <include>${project.basedir}/bin/mahout</include>
+ <include>${project.basedir}/../bin/mahout</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
Modified: lucene/mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=925070&r1=925069&r2=925070&view=diff
==============================================================================
--- lucene/mahout/trunk/pom.xml (original)
+++ lucene/mahout/trunk/pom.xml Fri Mar 19 01:30:34 2010
@@ -87,46 +87,16 @@
<profiles>
<profile>
+ <id>release</id>
+ <modules>
+ <module>distribution</module>
+ </modules>
+ </profile>
+ <profile>
<!-- Since this executes the release packaging, we won't want it in release:prepare! -->
<id>release_perform</id>
<build>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <executions>
- <execution>
- <id>bin-assembly</id>
- <phase>verify</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- <execution>
- <id>src-assembly</id>
- <phase>verify</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>