Author: mattmann
Date: Sun Jun 5 05:40:19 2011
New Revision: 1131846
URL: http://svn.apache.org/viewvc?rev=1131846&view=rev
Log:
- fix for OODT-60 Annoying build warnings about dependencies that have "been
relocated"
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/curator/pom.xml
oodt/trunk/grid/pom.xml
oodt/trunk/product/pom.xml
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1131846&r1=1131845&r2=1131846&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Sun Jun 5 05:40:19 2011
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.3-SNAPSHOT (in progress)
--------------------------------------------
+* OODT-60 Annoying build warnings about dependencies that
+ have "been relocated" (mattmann, davidkale)
+
* OODT-198 Add test harness for XmlRpcResourceManager (mattmann)
* OODT-182 Add ability to change node capacity during execution (Gabe Resneck
via mattmann)
Modified: oodt/trunk/curator/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/pom.xml?rev=1131846&r1=1131845&r2=1131846&view=diff
==============================================================================
--- oodt/trunk/curator/pom.xml (original)
+++ oodt/trunk/curator/pom.xml Sun Jun 5 05:40:19 2011
@@ -116,8 +116,8 @@ the License.
<version>3.2.1</version>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
Modified: oodt/trunk/grid/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/grid/pom.xml?rev=1131846&r1=1131845&r2=1131846&view=diff
==============================================================================
--- oodt/trunk/grid/pom.xml (original)
+++ oodt/trunk/grid/pom.xml Sun Jun 5 05:40:19 2011
@@ -97,8 +97,8 @@ the License.
<version>2.6.3</version>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
@@ -110,7 +110,7 @@ the License.
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
+ <artifactId>xercesImpl</artifactId>
<version>2.4.0</version>
</dependency>
<dependency>
Modified: oodt/trunk/product/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/product/pom.xml?rev=1131846&r1=1131845&r2=1131846&view=diff
==============================================================================
--- oodt/trunk/product/pom.xml (original)
+++ oodt/trunk/product/pom.xml Sun Jun 5 05:40:19 2011
@@ -105,11 +105,12 @@
<artifactId>oodt-xmlquery</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.3</version>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
