Author: bimargulies
Date: Mon Nov 8 12:49:57 2010
New Revision: 1032560
URL: http://svn.apache.org/viewvc?rev=1032560&view=rev
Log:
MAHOUT-538
Modified:
mahout/trunk/distribution/pom.xml
mahout/trunk/examples/pom.xml
mahout/trunk/pom.xml
Modified: mahout/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/distribution/pom.xml?rev=1032560&r1=1032559&r2=1032560&view=diff
==============================================================================
--- mahout/trunk/distribution/pom.xml (original)
+++ mahout/trunk/distribution/pom.xml Mon Nov 8 12:49:57 2010
@@ -1,5 +1,4 @@
<?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
@@ -16,102 +15,108 @@
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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout</artifactId>
+ <artifactId>mahout-distribution</artifactId>
<version>0.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-distribution</artifactId>
- <version>0.5-SNAPSHOT</version>
- <name>Mahout Release Package</name>
- <description>Distribution Package</description>
-
- <packaging>pom</packaging>
-
- <build>
- <defaultGoal>install</defaultGoal>
-
- <plugins>
+ <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>
<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>
- </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>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-taste-webapp</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- </dependencies>
-
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/distribution</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/distribution</developerConnection>
- <url>https://svn.apache.org/repos/asf/mahout/trunk/distribution</url>
- </scm>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+
<skipAssembly>${mahout.skip.distribution}</skipAssembly>
+ <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>
+
<skipAssembly>${mahout.skip.distribution}</skipAssembly>
+ <descriptors>
+
<descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <properties>
+ <mahout.skip.distribution>false</mahout.skip.distribution>
+ </properties>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-collections</artifactId>
+ </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>
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-taste-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+ <scm>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/distribution</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/distribution</developerConnection>
+ <url>https://svn.apache.org/repos/asf/mahout/trunk/distribution</url>
+ </scm>
</project>
Modified: mahout/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/pom.xml?rev=1032560&r1=1032559&r2=1032560&view=diff
==============================================================================
--- mahout/trunk/examples/pom.xml (original)
+++ mahout/trunk/examples/pom.xml Mon Nov 8 12:49:57 2010
@@ -34,7 +34,9 @@
<description>Scalable machine learning library examples</description>
<packaging>jar</packaging>
-
+ <properties>
+ <mahout.skip.example>false</mahout.skip.example>
+ </properties>
<build>
<plugins>
<plugin>
@@ -98,6 +100,7 @@
<goal>single</goal>
</goals>
<configuration>
+ <skipAssembly>${mahout.skip.example}</skipAssembly>
<descriptors>
<descriptor>src/main/assembly/job.xml</descriptor>
</descriptors>
@@ -219,6 +222,14 @@
</dependencies>
+ <profiles>
+ <profile>
+ <id>release.prepare</id>
+ <properties>
+ <mahout.skip.example>true</mahout.skip.example>
+ </properties>
+ </profile>
+ </profiles>
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/mahout/trunk/examples</connection>
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1032560&r1=1032559&r2=1032560&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Mon Nov 8 12:49:57 2010
@@ -456,6 +456,7 @@
<module>taste-web</module>
<module>examples</module>
<module>utils</module>
+ <module>distribution</module>
</modules>
<profiles>
<profile>
@@ -473,6 +474,15 @@
<checkstyle.skip>true</checkstyle.skip>
</properties>
</profile>
+ <profile>
+ <!-- most of this profile lives in other places, like distribution -->
+ <id>release.prepare</id>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <pmd.skip>true</pmd.skip>
+ <checkstyle.skip>true</checkstyle.skip>
+ </properties>
+ </profile>
<profile>
<id>release</id>
<properties>
@@ -480,9 +490,6 @@
<pmd.skip>true</pmd.skip>
<checkstyle.skip>true</checkstyle.skip>
</properties>
- <modules>
- <module>distribution</module>
- </modules>
<build>
<plugins>
<plugin>
@@ -557,12 +564,6 @@
<eclipse.outputDirectory>${basedir}/eclipse-classes</eclipse.outputDirectory>
</properties>
</profile>
- <profile>
- <id>everything</id>
- <modules>
- <module>distribution</module>
- </modules>
- </profile>
<profile>
<id>setup.eclipse</id>
<build>
