Author: norman
Date: Thu Jun 10 16:42:23 2010
New Revision: 953383
URL: http://svn.apache.org/viewvc?rev=953383&view=rev
Log:
Hopefully fixed the problems with java5 and james (JAMES-1017)
Modified:
james/server/trunk/jcr-store/pom.xml
james/server/trunk/pom.xml
james/server/trunk/spring-deployment/pom.xml
Modified: james/server/trunk/jcr-store/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr-store/pom.xml?rev=953383&r1=953382&r2=953383&view=diff
==============================================================================
--- james/server/trunk/jcr-store/pom.xml (original)
+++ james/server/trunk/jcr-store/pom.xml Thu Jun 10 16:42:23 2010
@@ -68,10 +68,6 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=953383&r1=953382&r2=953383&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Jun 10 16:42:23 2010
@@ -808,12 +808,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
- <scope>provided</scope>
- </dependency>
+
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
@@ -1082,6 +1077,11 @@
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.2.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: james/server/trunk/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=953383&r1=953382&r2=953383&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Thu Jun 10 16:42:23 2010
@@ -535,6 +535,11 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
