From ee6e470412a2d3cf671195ccc093ae2dff24233a Mon Sep 17 00:00:00 2001
From: "Sean R. Owen" <srowen@apache.org>
Date: Tue, 10 Jul 2012 14:49:26 +0000
Subject: [PATCH] MAHOUT-1043 Tweak Maven setup for better compatibility with
 m2e

git-svn-id: https://svn.apache.org/repos/asf/mahout/trunk@1359707 13f79535-47bb-0310-9956-ffa450edef68
---
 core/pom.xml                                  | 34 ++++-------
 distribution/pom.xml                          |  7 ---
 examples/pom.xml                              |  4 --
 integration/pom.xml                           |  3 -
 math/pom.xml                                  | 38 ++++++++++--
 pom.xml                                       | 58 +++++++++++++++++++
 ...ses.props => driver.classes.default.props} |  0
 7 files changed, 103 insertions(+), 41 deletions(-)
 rename src/conf/{driver.classes.props => driver.classes.default.props} (100%)

diff --git a/core/pom.xml b/core/pom.xml
index e7a99f750..3b4136e9e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,11 +35,21 @@
   <packaging>jar</packaging>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>../src/conf</directory>
+        <includes>
+          <include>driver.classes.default.props</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
         <configuration>
           <encoding>UTF-8</encoding>
           <source>1.6</source>
@@ -47,31 +57,11 @@
           <optimize>true</optimize>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <configuration>
-              <tasks>
-                <copy file="../src/conf/driver.classes.props" tofile="${project.build.directory}/classes/driver.classes.default.props" />
-              </tasks>
-
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
 
       <!-- create test jar so other modules can reuse the core test utility classes. -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
         <executions>
           <execution>
             <goals>
@@ -85,7 +75,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.3</version>
         <executions>
           <execution>
             <id>job</id>
@@ -113,7 +102,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.3</version>
         <configuration>
           <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
           <resourceBundles>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index c7a652ab4..b02207b4d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,9 +23,7 @@
     <version>0.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.mahout</groupId>
   <artifactId>mahout-distribution</artifactId>
-  <version>0.8-SNAPSHOT</version>
   <name>Mahout Release Package</name>
   <description>Distribution Package</description>
   <packaging>pom</packaging>
@@ -38,7 +36,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.3</version>
         <executions>
           <execution>
             <id>bin-assembly</id>
@@ -87,22 +84,18 @@
     <dependency>
       <groupId>org.apache.mahout</groupId>
       <artifactId>mahout-math</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.mahout</groupId>
       <artifactId>mahout-integration</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>
 </project>
diff --git a/examples/pom.xml b/examples/pom.xml
index 0c708b73e..e0ff916a8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -40,7 +40,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
         <configuration>
           <encoding>UTF-8</encoding>
           <source>1.6</source>
@@ -51,7 +50,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.4</version>
         <executions>
           <execution>
             <id>copy-dependencies</id>
@@ -70,7 +68,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.3</version>
         <executions>
           <execution>
             <id>job</id>
@@ -92,7 +89,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.3</version>
         <configuration>
           <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
           <resourceBundles>
diff --git a/integration/pom.xml b/integration/pom.xml
index 72db1ac97..fdae77223 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -40,7 +40,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
         <configuration>
           <encoding>UTF-8</encoding>
           <source>1.6</source>
@@ -51,7 +50,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.4</version>
         <executions>
           <execution>
             <id>copy-dependencies</id>
@@ -68,7 +66,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.3</version>
         <configuration>
           <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
           <resourceBundles>
diff --git a/math/pom.xml b/math/pom.xml
index 8bcb22f91..a3d3b2cb6 100644
--- a/math/pom.xml
+++ b/math/pom.xml
@@ -43,7 +43,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -53,9 +52,9 @@
       <plugin>
         <groupId>org.apache.mahout</groupId>
         <artifactId>mahout-collection-codegen-plugin</artifactId>
-        <version>1.0</version>
         <executions>
           <execution>
+            <phase>generate-sources</phase>
             <goals>
               <goal>generate</goal>
             </goals>
@@ -68,6 +67,39 @@
               <!--<testExcludes>-->
               <!--<testExclude>**/BooleanArrayListTest.java</testExclude>-->
               <!--</testExcludes>-->
+              <outputDirectory>${project.build.directory}/generated-sources/mahout</outputDirectory>
+              <testOutputDirectory>${project.build.directory}/generated-test-sources/mahout</testOutputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources/mahout</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-test-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-test-sources/mahout</source>
+              </sources>
             </configuration>
           </execution>
         </executions>
@@ -77,7 +109,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
         <executions>
           <execution>
             <goals>
@@ -99,7 +130,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.3</version>
         <configuration>
           <appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
           <resourceBundles>
diff --git a/pom.xml b/pom.xml
index 3fc14d5d1..e0d9bcd01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,6 +158,12 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <artifactId>mahout-examples</artifactId>
+        <groupId>${project.groupId}</groupId>
+        <version>${project.version}</version>
+      </dependency>
+
       <!-- 3rd party  -->
       <dependency>
         <groupId>org.apache.lucene</groupId>
@@ -442,6 +448,43 @@
     <defaultGoal>install</defaultGoal>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <versionRange>[2.4,)</versionRange>
+                    <goals>
+                      <goal>copy-dependencies</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.mahout</groupId>
+                    <artifactId>mahout-collection-codegen-plugin</artifactId>
+                    <versionRange>[1.0,)</versionRange>
+                    <goals>
+                      <goal>generate</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute/>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
@@ -476,6 +519,11 @@
           <artifactId>maven-jar-plugin</artifactId>
           <version>2.4</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
@@ -637,6 +685,16 @@
             </supplementalModels>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.mahout</groupId>
+          <artifactId>mahout-collection-codegen-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.7</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
diff --git a/src/conf/driver.classes.props b/src/conf/driver.classes.default.props
similarity index 100%
rename from src/conf/driver.classes.props
rename to src/conf/driver.classes.default.props