You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by is...@apache.org on 2009/10/19 21:01:57 UTC

svn commit: r826761 - in /lucene/mahout/trunk: buildtools/ core/pom.xml examples/pom.xml maven/pom.xml pom.xml taste-web/pom.xml utils/pom.xml

Author: isabel
Date: Mon Oct 19 19:01:57 2009
New Revision: 826761

URL: http://svn.apache.org/viewvc?rev=826761&view=rev
Log:
MAHOUT-171 - moved buildtools stuff over to maven directory, converted poms to use Apache parent pom.

Removed:
    lucene/mahout/trunk/buildtools/
Modified:
    lucene/mahout/trunk/core/pom.xml
    lucene/mahout/trunk/examples/pom.xml
    lucene/mahout/trunk/maven/pom.xml
    lucene/mahout/trunk/pom.xml
    lucene/mahout/trunk/taste-web/pom.xml
    lucene/mahout/trunk/utils/pom.xml

Modified: lucene/mahout/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=826761&r1=826760&r2=826761&view=diff
==============================================================================
--- lucene/mahout/trunk/core/pom.xml (original)
+++ lucene/mahout/trunk/core/pom.xml Mon Oct 19 19:01:57 2009
@@ -61,37 +61,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>
-                ${project.build.directory}/classes/META-INF
-              </outputDirectory>
-              <resources>
-                <resource>
-                  <directory>..</directory>
-                  <includes>
-                    <include>README.txt</include>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
 
       <!-- Copy dependencies with no official Maven artifacts from libs to local Maven repository -->
       <plugin>
@@ -447,6 +416,19 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.4</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+         <configuration>
+         <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
+          <resourceBundles>
+            <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+          </resourceBundles>
+         <supplementalModels>
+            <supplementalModel>supplemental-models.xml</supplementalModel>
+          </supplementalModels>
+        </configuration>
+        </plugin>
 
     </plugins>
   </build>

Modified: lucene/mahout/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/pom.xml?rev=826761&r1=826760&r2=826761&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/pom.xml (original)
+++ lucene/mahout/trunk/examples/pom.xml Mon Oct 19 19:01:57 2009
@@ -21,37 +21,6 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>
-                ${project.build.directory}/classes/META-INF
-              </outputDirectory>
-              <resources>
-                <resource>
-                  <directory>..</directory>
-                  <includes>
-                    <include>README.txt</include>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
@@ -170,7 +139,20 @@
           </execution>
         </executions>
       </plugin>
-    </plugins>
+       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+         <configuration>
+          <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
+          <resourceBundles>
+            <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+          </resourceBundles>
+          <supplementalModels>
+            <supplementalModel>supplemental-models.xml</supplementalModel>
+          </supplementalModels>
+        </configuration>
+        </plugin>
+   </plugins>
 
   </build>
 

Modified: lucene/mahout/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/maven/pom.xml?rev=826761&r1=826760&r2=826761&view=diff
==============================================================================
--- lucene/mahout/trunk/maven/pom.xml (original)
+++ lucene/mahout/trunk/maven/pom.xml Mon Oct 19 19:01:57 2009
@@ -8,211 +8,177 @@
   <version>0.2-SNAPSHOT</version>
   <name>Mahout Common Maven Parent</name>
   <parent>
-    <groupId>org.apache.mahout</groupId>
-    <artifactId>mahout</artifactId>
-    <version>0.2-SNAPSHOT</version>
-  </parent>
-  <properties>
-    <junit.version>3.8.2</junit.version>
-    <hadoop.version>0.20.1</hadoop.version>
-    <hbase.version>0.20.0</hbase.version>
-    <kfs.version>0.3</kfs.version>
-    <xmlenc.version>0.52</xmlenc.version>
-    <jets3t.version>0.7.1</jets3t.version>
-    <uncommons.maths.version>1.2</uncommons.maths.version>    
-    <watchmaker.version>0.6.2</watchmaker.version>
-    <tagBase>https://svn.apache.org/repos/asf/lucene/mahout</tagBase>
-    <lucene.version>2.9.0</lucene.version>
-  </properties>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-  <mailingLists>
-    <mailingList>
-      <name>User list</name>
-      <subscribe>mahout-user-subscribe@lucene.apache.org</subscribe>
-      <unsubscribe>mahout-user-unsubscribe@lucene.apache.org</unsubscribe>
-      <post>mahout-user@lucene.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/lucene-mahout-user/</archive>
-      <otherArchives>
-        <otherArchive>http://lucene.apache.org/mail/mahout-user/</otherArchive>
-        <otherArchive>http://mahout.markmail.org/</otherArchive>
-        <otherArchive>http://www.nabble.com/Mahout-User-List-f32042.html</otherArchive>
-      </otherArchives>
-    </mailingList>
-    <mailingList>
-      <name>Developers List</name>
-      <subscribe>mahout-dev-subscribe@lucene.apache.org</subscribe>
-      <unsubscribe>mahout-dev-unsubscribe@lucene.apache.org</unsubscribe>
-      <post>mahout-dev@lucene.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/lucene-mahout-dev/</archive>
-      <otherArchives>
-        <otherArchive>http://lucene.apache.org/mail/mahout-dev/</otherArchive>
-        <otherArchive>http://mahout.markmail.org/</otherArchive>
-        <otherArchive>http://www.nabble.com/Mahout-Developer-List-f32041.html</otherArchive>
-      </otherArchives>
-    </mailingList>
-    <mailingList>
-      <name>Commit notifications</name>
-      <subscribe>mahout-commits-subscribe@lucene.apache.org</subscribe>
-      <unsubscribe>mahout-commits-unsubscribe@lucene.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/lucene-mahout-commits/</archive>
-      <otherArchives>
-        <otherArchive>http://lucene.apache.org/mail/mahout-commits/</otherArchive>
-      </otherArchives>
-    </mailingList>
-  </mailingLists>
-  <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout</developerConnection>
-    <url>https://svn.apache.org/repos/asf/lucene/mahout</url>
-  </scm>
-  <repositories>
-    <repository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2</url>
-      <layout>default</layout>
-    </repository>
-    <repository>
-      <id>Apache snapshots</id>
-      <url>http://people.apache.org/maven-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <issueManagement>
-    <system>Jira</system>
-    <url>https://issues.apache.org/jira/browse/MAHOUT</url>
-  </issueManagement>
-  <distributionManagement>
-    <repository>
-      <uniqueVersion>false</uniqueVersion>
-      <id>mahout.dist</id>
-      <name>dist</name>
-      <url>${deploy.url}</url>
-      <layout>default</layout>
-    </repository>
-    <snapshotRepository>
-      <uniqueVersion>true</uniqueVersion>
-      <id>mahout.dist</id>
-      <name>dist</name>
-      <url>${deploy.url}</url>
-      <layout>default</layout>
-    </snapshotRepository>
-  </distributionManagement>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-analyzers</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-core</artifactId>
-        <version>${lucene.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.2</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.mahout</groupId>
-              <artifactId>mahout-buildtools</artifactId>
-              <version>${project.version}</version>
-            </dependency>
-          </dependencies>
-          <configuration>
-            <encoding>UTF-8</encoding>
-          </configuration>
-          <executions>
-            <execution>
-              <id>validate</id>
-              <phase>validate</phase>
-              <configuration>
-                <configLocation>mahout-checkstyle.xml</configLocation>
-                <consoleOutput>true</consoleOutput>
-                <failsOnError>true</failsOnError>
-                <linkXRef>false</linkXRef>
-                <sourceDirectory>${basedir}/src</sourceDirectory>
-              </configuration>
-              <goals>
-                <goal>checkstyle</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-pmd-plugin</artifactId>
-          <version>2.4</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.mahout</groupId>
-              <artifactId>mahout-buildtools</artifactId>
-              <version>${project.version}</version>
-            </dependency>
-          </dependencies>
-          <configuration>
-            <rulesets>
-              <ruleset>mahout-pmd-ruleset.xml</ruleset>
-            </rulesets>
-            <sourceEncoding>UTF-8</sourceEncoding>
-            <targetJdk>1.5</targetJdk>
-            <linkXRef>false</linkXRef>
-            <includeTests>true</includeTests>
-            <verbose>true</verbose>
-          </configuration>
-          <executions>
-            <execution>
-              <id>validate</id>
-              <phase>validate</phase>
-              <goals>
-                <goal>check</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <index>true</index>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-            <manifestEntries>
-              <Extension-Name>org.apache.mahout</Extension-Name>
-              <Built-By>${username}</Built-By>
-              <url>http://lucene.apache.org/mahout</url>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
+        <groupId>org.apache.mahout</groupId>
+        <artifactId>mahout</artifactId>
+        <version>0.2-SNAPSHOT</version>
+    </parent>
+    <properties>
+        <junit.version>3.8.2</junit.version>
+	 <hadoop.version>0.20.1</hadoop.version>
+	 <hbase.version>0.20.0</hbase.version>
+        <kfs.version>0.3</kfs.version>
+        <xmlenc.version>0.52</xmlenc.version>
+        <jets3t.version>0.7.1</jets3t.version>
+        <uncommons.maths.version>1.2</uncommons.maths.version>
+        <watchmaker.version>0.6.2</watchmaker.version>
+        <tagBase>https://svn.apache.org/repos/asf/lucene/mahout</tagBase>
+        <lucene.version>2.9.0</lucene.version>
+    </properties>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+    <mailingLists>
+        <mailingList>
+            <name>User list</name>
+            <subscribe>mahout-user-subscribe@lucene.apache.org</subscribe>
+            <unsubscribe>mahout-user-unsubscribe@lucene.apache.org</unsubscribe>
+            <post>mahout-user@lucene.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/lucene-mahout-user/</archive>
+            <otherArchives>
+                <otherArchive>http://lucene.apache.org/mail/mahout-user/</otherArchive>
+                <otherArchive>http://mahout.markmail.org/</otherArchive>
+                <otherArchive>http://www.nabble.com/Mahout-User-List-f32042.html</otherArchive>
+            </otherArchives>
+        </mailingList>
+        <mailingList>
+            <name>Developers List</name>
+            <subscribe>mahout-dev-subscribe@lucene.apache.org</subscribe>
+            <unsubscribe>mahout-dev-unsubscribe@lucene.apache.org</unsubscribe>
+            <post>mahout-dev@lucene.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/lucene-mahout-dev/</archive>
+            <otherArchives>
+                <otherArchive>http://lucene.apache.org/mail/mahout-dev/</otherArchive>
+                <otherArchive>http://mahout.markmail.org/</otherArchive>
+                <otherArchive>http://www.nabble.com/Mahout-Developer-List-f32041.html</otherArchive>
+            </otherArchives>
+        </mailingList>
+        <mailingList>
+            <name>Commit notifications</name>
+            <subscribe>mahout-commits-subscribe@lucene.apache.org</subscribe>
+            <unsubscribe>mahout-commits-unsubscribe@lucene.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/lucene-mahout-commits/</archive>
+            <otherArchives>
+                <otherArchive>http://lucene.apache.org/mail/mahout-commits/</otherArchive>
+            </otherArchives>
+        </mailingList>
+    </mailingLists>
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout</developerConnection>
+        <url>https://svn.apache.org/repos/asf/lucene/mahout</url>
+    </scm>
+    <repositories>
+        <repository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Repository for Maven</name>
+            <url>http://download.java.net/maven/2</url>
+            <layout>default</layout>
+        </repository>
+        <repository>
+            <id>Apache snapshots</id>
+            <url>http://people.apache.org/maven-snapshot-repository</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    <issueManagement>
+        <system>Jira</system>
+        <url>https://issues.apache.org/jira/browse/MAHOUT</url>
+    </issueManagement>
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+                  <groupId>org.apache.lucene</groupId>
+                  <artifactId>lucene-analyzers</artifactId>
+                  <version>${lucene.version}</version>
+        </dependency>
+        <dependency>
+                  <groupId>org.apache.lucene</groupId>
+                  <artifactId>lucene-core</artifactId>
+                  <version>${lucene.version}</version>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>2.2</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.mahout</groupId>
+                            <artifactId>mahout</artifactId>
+                            <version>${project.version}</version>
+                        </dependency>
+                    </dependencies>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>validate</id>
+                            <phase>validate</phase>
+                            <configuration>
+                                <configLocation>mahout-checkstyle.xml</configLocation>
+                                <consoleOutput>true</consoleOutput>
+                                <failsOnError>true</failsOnError>
+                                <linkXRef>false</linkXRef>
+                                <sourceDirectory>${basedir}/src</sourceDirectory>
+                            </configuration>
+                            <goals>
+                                <goal>checkstyle</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-pmd-plugin</artifactId>
+                    <version>2.4</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.mahout</groupId>
+                            <artifactId>mahout</artifactId>
+                            <version>${project.version}</version>
+                        </dependency>
+                    </dependencies>
+                    <configuration>
+                        <rulesets>
+                            <ruleset>mahout-pmd-ruleset.xml</ruleset>
+                        </rulesets>
+                        <sourceEncoding>UTF-8</sourceEncoding>
+                        <targetJdk>1.5</targetJdk>
+                        <linkXRef>false</linkXRef>
+                        <includeTests>true</includeTests>
+                        <verbose>true</verbose>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>validate</id>
+                            <phase>validate</phase>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+       </pluginManagement>
+  <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -226,103 +192,45 @@
           <excludes/>
         </configuration>
       </plugin>
-      <plugin>
+       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-8</version>
-        <configuration>
-          <tagBase>https://svn.apache.org/repos/asf/lucene/mahout/tags</tagBase>
-          <useReleaseProfile>false</useReleaseProfile>
-          <goals>deploy</goals>
-          <arguments>-Pmahout_release</arguments>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+         <configuration>
+         <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
+         <resourceBundles>
+            <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+          </resourceBundles>
+          <supplementalModels>
+            <supplementalModel>supplemental-models.xml</supplementalModel>
+          </supplementalModels>
         </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>sourcecheck</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <showDeprecation>true</showDeprecation>
-              <showWarnings>true</showWarnings>
-              <compilerArgument>${compile.flags}</compilerArgument>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-pmd-plugin</artifactId>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- See http://maven.apache.org/developers/release/releasing.html -->
-    <profile>
-      <id>mahout_release</id>
-      <build>
-        <plugins>
-          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <configuration>
-              <passphrase>${gpg.passphrase}</passphrase>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- We want to deploy the artifact to a staging location for perusal -->
-          <plugin>
-            <inherited>true</inherited>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <configuration>
-              <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-              <updateReleaseInfo>true</updateReleaseInfo>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <encoding>${project.build.sourceEncoding}</encoding>
-            </configuration>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+        </plugin>
+   </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>sourcecheck</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-checkstyle-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <showDeprecation>true</showDeprecation>
+                            <showWarnings>true</showWarnings>
+                            <compilerArgument>${compile.flags}</compilerArgument>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-pmd-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: lucene/mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=826761&r1=826760&r2=826761&view=diff
==============================================================================
--- lucene/mahout/trunk/pom.xml (original)
+++ lucene/mahout/trunk/pom.xml Mon Oct 19 19:01:57 2009
@@ -2,6 +2,11 @@
 <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</groupId>
+    <artifactId>apache</artifactId>
+    <version>6</version>
+  </parent>
 
   <groupId>org.apache.mahout</groupId>
   <artifactId>mahout</artifactId>
@@ -12,7 +17,6 @@
   <description>Scalable machine learning libraries</description>
 
   <modules>
-    <module>buildtools</module>
     <module>maven</module>
     <module>core</module>
     <module>taste-web</module>
@@ -22,6 +26,34 @@
 
   <build>
     <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+         <configuration>
+          <resourceBundles>
+            <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+          </resourceBundles>
+          <supplementalModels>
+            <supplementalModel>supplemental-models.xml</supplementalModel>
+          </supplementalModels>
+        </configuration>
+        </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <downloadJavadocs>true</downloadJavadocs>
+          <downloadSources>true</downloadSources>
+          <additionalConfig>
+          <file>
+             <name>.checkstyle</name>
+             <location>maven/src/main/resources/mahout-eclipse-checkstyle</location>
+          </file>
+          </additionalConfig>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
     <profiles>

Modified: lucene/mahout/trunk/taste-web/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/taste-web/pom.xml?rev=826761&r1=826760&r2=826761&view=diff
==============================================================================
--- lucene/mahout/trunk/taste-web/pom.xml (original)
+++ lucene/mahout/trunk/taste-web/pom.xml Mon Oct 19 19:01:57 2009
@@ -20,9 +20,7 @@
   <packaging>war</packaging>
 
   <build>
-
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <resources>
+   <resources>
       <resource>
         <directory>src/main/resources</directory>
       </resource>
@@ -31,9 +29,7 @@
         <targetPath>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib</targetPath>
       </resource>
     </resources>
-    
     <plugins>
-
     <plugin>
       <artifactId>maven-resources-plugin</artifactId>
       <version>2.4</version>
@@ -80,7 +76,20 @@
 	<optimize>true</optimize>
       </configuration>
     </plugin>
-      
+    <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+         <configuration>
+         <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
+         <resourceBundles>
+            <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+          </resourceBundles>
+          <supplementalModels>
+            <supplementalModel>supplemental-models.xml</supplementalModel>
+          </supplementalModels>
+        </configuration>
+        </plugin>
+  
     </plugins>
 
   </build>

Modified: lucene/mahout/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/pom.xml?rev=826761&r1=826760&r2=826761&view=diff
==============================================================================
--- lucene/mahout/trunk/utils/pom.xml (original)
+++ lucene/mahout/trunk/utils/pom.xml Mon Oct 19 19:01:57 2009
@@ -76,7 +76,20 @@
           </execution>
         </executions>
       </plugin>
-    </plugins>
+       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+         <configuration>
+         <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
+         <resourceBundles>
+            <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+          </resourceBundles>
+          <supplementalModels>
+            <supplementalModel>supplemental-models.xml</supplementalModel>
+          </supplementalModels>
+        </configuration>
+        </plugin>
+   </plugins>
 
   </build>