Author: bago
Date: Mon Jun 23 03:52:26 2008
New Revision: 670514
URL: http://svn.apache.org/viewvc?rev=670514&view=rev
Log:
m2: Add derby to runtime requirements (fix failing tests)
m2: Add src/conf to resources (future test compatibility)
m2: exclude xerces from jackrabbit dependencies (ClassNotFoundException)
Modified:
james/server/trunk/jcr-backend-function/pom.xml
james/server/trunk/phoenix-deployment/pom.xml
james/server/trunk/torque-mailboxmanager-function/pom.xml
Modified: james/server/trunk/jcr-backend-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr-backend-function/pom.xml?rev=670514&r1=670513&r2=670514&view=diff
==============================================================================
--- james/server/trunk/jcr-backend-function/pom.xml (original)
+++ james/server/trunk/jcr-backend-function/pom.xml Mon Jun 23 03:52:26 2008
@@ -53,6 +53,12 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
<version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: james/server/trunk/phoenix-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=670514&r1=670513&r2=670514&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Mon Jun 23 03:52:26 2008
@@ -38,6 +38,12 @@
<include>**/*.xml</include>
</includes>
</testResource>
+ <testResource>
+ <directory>src/conf</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
</testResources>
<plugins>
<plugin>
@@ -222,11 +228,25 @@
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-thread-impl</artifactId>
</dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ </dependency>
+ -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
<artifactId>cornerstone-datasources-impl</artifactId>
</dependency>
@@ -243,10 +263,6 @@
<artifactId>dnsjava</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
@@ -259,6 +275,12 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
<version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -290,5 +312,10 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/torque-mailboxmanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/pom.xml?rev=670514&r1=670513&r2=670514&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/pom.xml (original)
+++ james/server/trunk/torque-mailboxmanager-function/pom.xml Mon Jun 23
03:52:26 2008
@@ -36,12 +36,10 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailet-base</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
- -->
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-mailbox-library</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
