You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/12/03 19:13:03 UTC
svn commit: r1041942 - in /james/mailbox/trunk: api/pom.xml jcr/pom.xml
jpa/pom.xml maildir/pom.xml parent/pom.xml torque/pom.xml
Author: norman
Date: Fri Dec 3 18:13:02 2010
New Revision: 1041942
URL: http://svn.apache.org/viewvc?rev=1041942&view=rev
Log:
Cleanup dependencies also make sure we depend on 0.2-M1 version of imap for our tests
Modified:
james/mailbox/trunk/api/pom.xml
james/mailbox/trunk/jcr/pom.xml
james/mailbox/trunk/jpa/pom.xml
james/mailbox/trunk/maildir/pom.xml
james/mailbox/trunk/parent/pom.xml
james/mailbox/trunk/torque/pom.xml
Modified: james/mailbox/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/pom.xml?rev=1041942&r1=1041941&r2=1041942&view=diff
==============================================================================
--- james/mailbox/trunk/api/pom.xml (original)
+++ james/mailbox/trunk/api/pom.xml Fri Dec 3 18:13:02 2010
@@ -30,10 +30,6 @@
<name>Apache James Mailbox Manager API</name>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
- </dependency>
- <dependency>
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
@@ -42,10 +38,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<scope>test</scope>
Modified: james/mailbox/trunk/jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/pom.xml?rev=1041942&r1=1041941&r2=1041942&view=diff
==============================================================================
--- james/mailbox/trunk/jcr/pom.xml (original)
+++ james/mailbox/trunk/jcr/pom.xml Fri Dec 3 18:13:02 2010
@@ -42,6 +42,14 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
@@ -52,15 +60,35 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-message</artifactId>
+ <scope>test</scope>
</dependency>
<!-- xercesImpl needed for some java versions -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-protocol-tester</artifactId>
<scope>test</scope>
Modified: james/mailbox/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/pom.xml?rev=1041942&r1=1041941&r2=1041942&view=diff
==============================================================================
--- james/mailbox/trunk/jpa/pom.xml (original)
+++ james/mailbox/trunk/jpa/pom.xml Fri Dec 3 18:13:02 2010
@@ -38,14 +38,24 @@
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-protocol-tester</artifactId>
<scope>test</scope>
@@ -80,16 +90,6 @@
<artifactId>commons-logging</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: james/mailbox/trunk/maildir/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/pom.xml?rev=1041942&r1=1041941&r2=1041942&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/pom.xml (original)
+++ james/mailbox/trunk/maildir/pom.xml Fri Dec 3 18:13:02 2010
@@ -55,14 +55,19 @@
<artifactId>apache-mime4j</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-protocol-tester</artifactId>
<scope>test</scope>
@@ -73,12 +78,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-message</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>junit-dep</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: james/mailbox/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/parent/pom.xml?rev=1041942&r1=1041941&r2=1041942&view=diff
==============================================================================
--- james/mailbox/trunk/parent/pom.xml (original)
+++ james/mailbox/trunk/parent/pom.xml Fri Dec 3 18:13:02 2010
@@ -104,7 +104,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.james.imap.*,org.apache.james.mailbox.*</Export-Package>
+ <Export-Package>org.apache.james.mailbox.*</Export-Package>
<Embed-Dependency>*;scope=runtime</Embed-Dependency>
</instructions>
</configuration>
@@ -212,21 +212,13 @@
<artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-message</artifactId>
- <version>${project.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-torque</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-processor</artifactId>
- <version>${project.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
@@ -244,24 +236,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-protocol-tester</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
<version>${project.version}</version>
</dependency>
@@ -404,7 +378,7 @@
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
+ <artifactId>commons-beanutils-core</artifactId>
<version>1.7.0</version>
</dependency>
<!--
@@ -459,7 +433,38 @@
<artifactId>commons-io</artifactId>
<version>1.4</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-message</artifactId>
+ <version>${version.james-imap}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-processor</artifactId>
+ <version>${version.james-imap}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-api</artifactId>
+ <version>${version.james-imap}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-api</artifactId>
+ <version>${version.james-imap}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-protocol-tester</artifactId>
+ <version>${version.james-imap}</version>
+ <scope>test</scope>
+ </dependency>
<!--
END Testing
@@ -505,6 +510,12 @@
<artifactId>openjpa</artifactId>
<version>${version.openjpa}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+
<!--
END OpenJPA
-->
@@ -541,6 +552,13 @@
<version>2.9.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
+ <scope>test</scope>
+ </dependency>
+
<!--
END JCR
-->
@@ -568,6 +586,7 @@
<javax.mail.artifactId>mail</javax.mail.artifactId>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.james-server>3.0-SNAPSHOT</version.james-server>
+ <version.james-imap>0.2-M1</version.james-imap>
<version.openjpa>2.0.1</version.openjpa>
<version.javax.persistence>1.0.2</version.javax.persistence>
<version.commons-lang>2.4</version.commons-lang>
Modified: james/mailbox/trunk/torque/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/torque/pom.xml?rev=1041942&r1=1041941&r2=1041942&view=diff
==============================================================================
--- james/mailbox/trunk/torque/pom.xml (original)
+++ james/mailbox/trunk/torque/pom.xml Fri Dec 3 18:13:02 2010
@@ -65,13 +65,25 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
+
<dependency>
<groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
+ <artifactId>commons-beanutils-core</artifactId>
</dependency>
+
<dependency>
<groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>junit-dep</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -95,5 +107,15 @@
<artifactId>apache-james-imap-processor</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-message</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org