Author: rdonkin
Date: Sat Jan 23 20:08:11 2010
New Revision: 902475
URL: http://svn.apache.org/viewvc?rev=902475&view=rev
Log:
Consolidate modules
Added:
james/nntp/trunk/util/src/main/resources/meta-inf/
- copied from r902470,
james/nntp/trunk/javamail-util/src/main/resources/meta-inf/
Removed:
james/nntp/trunk/javamail-util/
Modified:
james/nntp/trunk/pom.xml
james/nntp/trunk/protocol/pom.xml
james/nntp/trunk/util/pom.xml
Modified: james/nntp/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/nntp/trunk/pom.xml?rev=902475&r1=902474&r2=902475&view=diff
==============================================================================
--- james/nntp/trunk/pom.xml (original)
+++ james/nntp/trunk/pom.xml Sat Jan 23 20:08:11 2010
@@ -33,7 +33,6 @@
<inceptionYear>2002</inceptionYear>
<packaging>pom</packaging>
<modules>
- <module>javamail-util</module>
<module>util</module>
<module>api</module>
<module>user-api</module>
Modified: james/nntp/trunk/protocol/pom.xml
URL:
http://svn.apache.org/viewvc/james/nntp/trunk/protocol/pom.xml?rev=902475&r1=902474&r2=902475&view=diff
==============================================================================
--- james/nntp/trunk/protocol/pom.xml (original)
+++ james/nntp/trunk/protocol/pom.xml Sat Jan 23 20:08:11 2010
@@ -64,10 +64,6 @@
<groupId>org.apache.james</groupId>
<artifactId>james-nntp-avalon-socket-library</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-nntp-javamail-util</artifactId>
- </dependency>
<dependency>
<groupId>oro</groupId>
Modified: james/nntp/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/james/nntp/trunk/util/pom.xml?rev=902475&r1=902474&r2=902475&view=diff
==============================================================================
--- james/nntp/trunk/util/pom.xml (original)
+++ james/nntp/trunk/util/pom.xml Sat Jan 23 20:08:11 2010
@@ -30,6 +30,14 @@
<name>Apache James NNTP Common Utilities</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>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
