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/06/08 12:37:55 UTC
svn commit: r952600 - in /james/imap/trunk: api/pom.xml decode/pom.xml
deployment/pom.xml jcr/pom.xml mailbox/pom.xml memory/pom.xml
message/pom.xml parent/pom.xml processor/pom.xml protocol-tester/pom.xml
seda/pom.xml store/pom.xml torque/pom.xml
Author: norman
Date: Tue Jun 8 10:37:36 2010
New Revision: 952600
URL: http://svn.apache.org/viewvc?rev=952600&view=rev
Log:
Cleanup dependencies
Modified:
james/imap/trunk/api/pom.xml
james/imap/trunk/decode/pom.xml
james/imap/trunk/deployment/pom.xml
james/imap/trunk/jcr/pom.xml
james/imap/trunk/mailbox/pom.xml
james/imap/trunk/memory/pom.xml
james/imap/trunk/message/pom.xml
james/imap/trunk/parent/pom.xml
james/imap/trunk/processor/pom.xml
james/imap/trunk/protocol-tester/pom.xml
james/imap/trunk/seda/pom.xml
james/imap/trunk/store/pom.xml
james/imap/trunk/torque/pom.xml
Modified: james/imap/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/api/pom.xml (original)
+++ james/imap/trunk/api/pom.xml Tue Jun 8 10:37:36 2010
@@ -40,18 +40,9 @@
</dependency>
<dependency>
<groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <scope>test</scope>
+ <artifactId>junit-dep</artifactId>
+ <version>4.4</version>
</dependency>
+
</dependencies>
</project>
Modified: james/imap/trunk/decode/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/decode/pom.xml (original)
+++ james/imap/trunk/decode/pom.xml Tue Jun 8 10:37:36 2010
@@ -64,9 +64,8 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-api</artifactId>
- <type>test-jar</type>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: james/imap/trunk/deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/deployment/pom.xml (original)
+++ james/imap/trunk/deployment/pom.xml Tue Jun 8 10:37:36 2010
@@ -96,21 +96,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<scope>test</scope>
@@ -136,16 +126,16 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
<scope>test</scope>
@@ -153,7 +143,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -164,7 +154,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: james/imap/trunk/jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/jcr/pom.xml (original)
+++ james/imap/trunk/jcr/pom.xml Tue Jun 8 10:37:36 2010
@@ -29,14 +29,7 @@
<artifactId>apache-james-imap-jcr</artifactId>
<name>Apache James IMAP JCR Mailbox Manager</name>
<dependencies>
- <dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- </dependency>
- <dependency>
- <groupId>${javax.activation.groupId}</groupId>
- <artifactId>${javax.activation.artifactId}</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-api</artifactId>
@@ -50,27 +43,13 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-store</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <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-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
@@ -78,12 +57,6 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: james/imap/trunk/mailbox/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/mailbox/pom.xml (original)
+++ james/imap/trunk/mailbox/pom.xml Tue Jun 8 10:37:36 2010
@@ -38,7 +38,11 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: james/imap/trunk/memory/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/memory/pom.xml (original)
+++ james/imap/trunk/memory/pom.xml Tue Jun 8 10:37:36 2010
@@ -35,10 +35,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-mailbox</artifactId>
</dependency>
@@ -46,11 +42,6 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-store</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
</project>
Modified: james/imap/trunk/message/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/message/pom.xml (original)
+++ james/imap/trunk/message/pom.xml Tue Jun 8 10:37:36 2010
@@ -81,5 +81,11 @@
<artifactId>jmock-junit4</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <version>4.4</version>
+ </dependency>
+
</dependencies>
</project>
Modified: james/imap/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Tue Jun 8 10:37:36 2010
@@ -40,20 +40,6 @@
</scm>
<repositories>
- <!-- local repos -->
- <repository>
- <id>module-local</id>
- <name>Local Repository</name>
- <url>file://stage</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
<!-- needed for javamail -->
<repository>
<id>maven2-repository.dev.java.net</id>
@@ -389,8 +375,14 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
Modified: james/imap/trunk/processor/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/processor/pom.xml (original)
+++ james/imap/trunk/processor/pom.xml Tue Jun 8 10:37:36 2010
@@ -69,6 +69,11 @@
</dependency>
<dependency>
<groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
Modified: james/imap/trunk/protocol-tester/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/pom.xml (original)
+++ james/imap/trunk/protocol-tester/pom.xml Tue Jun 8 10:37:36 2010
@@ -30,12 +30,9 @@
<name>Apache JAMES Protocol Tester</name>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>compile</scope>
</dependency>
</dependencies>
</project>
Modified: james/imap/trunk/seda/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/seda/pom.xml (original)
+++ james/imap/trunk/seda/pom.xml Tue Jun 8 10:37:36 2010
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>junit-dep</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: james/imap/trunk/store/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/store/pom.xml (original)
+++ james/imap/trunk/store/pom.xml Tue Jun 8 10:37:36 2010
@@ -55,10 +55,6 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
Modified: james/imap/trunk/torque/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/pom.xml?rev=952600&r1=952599&r2=952600&view=diff
==============================================================================
--- james/imap/trunk/torque/pom.xml (original)
+++ james/imap/trunk/torque/pom.xml Tue Jun 8 10:37:36 2010
@@ -73,6 +73,11 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org