You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by bf...@apache.org on 2010/12/16 22:50:05 UTC

svn commit: r1050179 - in /oodt/trunk: CHANGES.txt core/pom.xml

Author: bfoster
Date: Thu Dec 16 21:50:05 2010
New Revision: 1050179

URL: http://svn.apache.org/viewvc?rev=1050179&view=rev
Log:

- fixed the mvn eclipse:eclipse fails to merge resources error

-------------------

OODT-88

Modified:
    oodt/trunk/CHANGES.txt
    oodt/trunk/core/pom.xml

Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1050179&r1=1050178&r2=1050179&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Thu Dec 16 21:50:05 2010
@@ -4,6 +4,8 @@ Apache OODT Change Log
 Release 0.2 (Current Development)
 --------------------------------------------
 
+* OODT-88 mvn eclipse:eclipse fails to merge resources (bfoster)
+
 * OODT-89 (cas-metadata patch) Synchonize OODT-CAS components, which depend on one another, on a particular Apache-Tika version (bfoster)
 
 * OODT-87 Add date roll dynamic replacement fuction to PathUtils (bfoster)

Modified: oodt/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/core/pom.xml?rev=1050179&r1=1050178&r2=1050179&view=diff
==============================================================================
--- oodt/trunk/core/pom.xml (original)
+++ oodt/trunk/core/pom.xml Thu Dec 16 21:50:05 2010
@@ -270,6 +270,10 @@ the License.
                 </configuration>
             </plugin>
             <plugin>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <includes>