Author: mattmann
Date: Sun Feb 3 23:31:44 2013
New Revision: 1441987
URL: http://svn.apache.org/viewvc?rev=1441987&view=rev
Log:
fix for OODT-369: Building with Maven3
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/filemgr/pom.xml
oodt/trunk/profile/pom.xml
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1441987&r1=1441986&r2=1441987&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Sun Feb 3 23:31:44 2013
@@ -3,6 +3,8 @@ Apache OODT Change Log
Release 0.6 - Current Development
--------------------------------------------
+* OODT-369 Building with Maven3 (mattmann, Adam Estrada)
+
* OODT-555, OODT-557 - Changed behavior of Lucene Catalog update methods to
retrieve a product from the index to the cache,
instead of failing if it is not found in the cache. At the same time,
simplify the Curator updateMetadata() method to just update
the metadata, without removing and re-inserting the product before that.
Modified: oodt/trunk/filemgr/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/pom.xml?rev=1441987&r1=1441986&r2=1441987&view=diff
==============================================================================
--- oodt/trunk/filemgr/pom.xml (original)
+++ oodt/trunk/filemgr/pom.xml Sun Feb 3 23:31:44 2013
@@ -39,6 +39,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<version>2.4.3</version>
<configuration>
<forkMode>pertest</forkMode>
@@ -220,6 +221,10 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-lucene-core</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>wstx-asl</artifactId>
+ <groupId>woodstox</groupId>
+ </exclusion>
</exclusions>
<scope>compile</scope>
</dependency>
Modified: oodt/trunk/profile/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/pom.xml?rev=1441987&r1=1441986&r2=1441987&view=diff
==============================================================================
--- oodt/trunk/profile/pom.xml (original)
+++ oodt/trunk/profile/pom.xml Sun Feb 3 23:31:44 2013
@@ -123,11 +123,6 @@
<version>2.6.3</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>1.4.4</version>
- </dependency>
- <dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>3.4.4</version>