You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/10/03 17:39:11 UTC
svn commit: r1003977 - in /shindig/trunk: java/common/pom.xml pom.xml
Author: lindner
Date: Sun Oct 3 15:39:10 2010
New Revision: 1003977
URL: http://svn.apache.org/viewvc?rev=1003977&view=rev
Log:
fix xmlParserApis class loader problem
Modified:
shindig/trunk/java/common/pom.xml
shindig/trunk/pom.xml
Modified: shindig/trunk/java/common/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/pom.xml?rev=1003977&r1=1003976&r2=1003977&view=diff
==============================================================================
--- shindig/trunk/java/common/pom.xml (original)
+++ shindig/trunk/java/common/pom.xml Sun Oct 3 15:39:10 2010
@@ -166,12 +166,6 @@
<artifactId>xml-apis</artifactId>
</dependency>
- <!-- test -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <scope>test</scope>
- </dependency>
<!-- needed for ehcache's use of slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1003977&r1=1003976&r2=1003977&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Sun Oct 3 15:39:10 2010
@@ -1479,12 +1479,26 @@
<artifactId>htmlparser</artifactId>
<version>r4209</version>
<scope>compile</scope>
+ <exclusions>
+ <!-- force use of xml-apis until caja fixes their pom -->
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
- <groupId>caja</groupId>
- <artifactId>caja</artifactId>
- <version>r4280</version>
- <scope>compile</scope>
+ <dependency>
+ <groupId>caja</groupId>
+ <artifactId>caja</artifactId>
+ <version>r4280</version>
+ <scope>compile</scope>
+ <exclusions>
+ <!-- force use of xml-apis until caja fixes their pom -->
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
@@ -1603,11 +1617,6 @@
<version>2.9.1</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.sanselan</groupId>
<artifactId>sanselan</artifactId>
<version>0.97-incubator</version>