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 ba...@apache.org on 2008/08/11 20:42:08 UTC
svn commit: r684867 - in /james/server/trunk: common-util/pom.xml
core-api/pom.xml core-function/pom.xml core-library/pom.xml
domain-api/pom.xml javamail-util/pom.xml management-library/pom.xml
user-library/pom.xml
Author: bago
Date: Mon Aug 11 11:42:08 2008
New Revision: 684867
URL: http://svn.apache.org/viewvc?rev=684867&view=rev
Log:
First round at cleaning/fixing m2 granular dependencies.
Modified:
james/server/trunk/common-util/pom.xml
james/server/trunk/core-api/pom.xml
james/server/trunk/core-function/pom.xml
james/server/trunk/core-library/pom.xml
james/server/trunk/domain-api/pom.xml
james/server/trunk/javamail-util/pom.xml
james/server/trunk/management-library/pom.xml
james/server/trunk/user-library/pom.xml
Modified: james/server/trunk/common-util/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/pom.xml?rev=684867&r1=684866&r2=684867&view=diff
==============================================================================
--- james/server/trunk/common-util/pom.xml (original)
+++ james/server/trunk/common-util/pom.xml Mon Aug 11 11:42:08 2008
@@ -29,11 +29,6 @@
<name>Apache JAMES Server Common Utilities</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
Modified: james/server/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/pom.xml?rev=684867&r1=684866&r2=684867&view=diff
==============================================================================
--- james/server/trunk/core-api/pom.xml (original)
+++ james/server/trunk/core-api/pom.xml Mon Aug 11 11:42:08 2008
@@ -33,5 +33,10 @@
<groupId>org.apache.james</groupId>
<artifactId>mailet</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/core-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/pom.xml?rev=684867&r1=684866&r2=684867&view=diff
==============================================================================
--- james/server/trunk/core-function/pom.xml (original)
+++ james/server/trunk/core-function/pom.xml Mon Aug 11 11:42:08 2008
@@ -31,6 +31,14 @@
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>mailet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=684867&r1=684866&r2=684867&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Mon Aug 11 11:42:08 2008
@@ -72,15 +72,16 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- -->
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -89,7 +90,6 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.avalon.cornerstone.connection</groupId>
<artifactId>cornerstone-connection-api</artifactId>
@@ -103,13 +103,16 @@
<groupId>org.apache.avalon.cornerstone.sockets</groupId>
<artifactId>cornerstone-sockets-api</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
<artifactId>cornerstone-datasources-api</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-datasource</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.avalon.cornerstone.scheduler</groupId>
@@ -119,11 +122,11 @@
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-pool-api</artifactId>
@@ -141,6 +144,7 @@
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-thread-api</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
@@ -162,6 +166,7 @@
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailet-base</artifactId>
Modified: james/server/trunk/domain-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/pom.xml?rev=684867&r1=684866&r2=684867&view=diff
==============================================================================
--- james/server/trunk/domain-api/pom.xml (original)
+++ james/server/trunk/domain-api/pom.xml Mon Aug 11 11:42:08 2008
@@ -28,9 +28,6 @@
<artifactId>james-server-domain-api</artifactId>
<name>Apache JAMES Server Domain API</name>
<dependencies>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
+ <!-- No dependency -->
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/javamail-util/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/javamail-util/pom.xml?rev=684867&r1=684866&r2=684867&view=diff
==============================================================================
--- james/server/trunk/javamail-util/pom.xml (original)
+++ james/server/trunk/javamail-util/pom.xml Mon Aug 11 11:42:08 2008
@@ -33,5 +33,10 @@
<artifactId>mail</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/management-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/pom.xml?rev=684867&r1=684866&r2=684867&view=diff
==============================================================================
--- james/server/trunk/management-library/pom.xml (original)
+++ james/server/trunk/management-library/pom.xml Mon Aug 11 11:42:08 2008
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
<artifactId>james-server-management-library</artifactId>
- <name>Apache JAMES Server Core</name>
+ <name>Apache JAMES Server Management Library</name>
<dependencies>
<dependency>
@@ -35,10 +35,12 @@
</dependency>
<!-- Probably used for RFC2822Headers -->
<!-- Not needed at runtime because of compiler inlining constants -->
+ <!--
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailet-base</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.james</groupId>
@@ -72,15 +74,16 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- -->
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -89,7 +92,6 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.avalon.cornerstone.connection</groupId>
<artifactId>cornerstone-connection-api</artifactId>
@@ -98,11 +100,11 @@
<groupId>org.apache.avalon.cornerstone.connection</groupId>
<artifactId>cornerstone-connection-impl</artifactId>
</dependency>
- -->
<dependency>
<groupId>org.apache.avalon.cornerstone.sockets</groupId>
<artifactId>cornerstone-sockets-api</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
<artifactId>cornerstone-datasources-api</artifactId>
@@ -111,19 +113,21 @@
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-datasource</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.avalon.cornerstone.scheduler</groupId>
<artifactId>cornerstone-scheduler-api</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-pool-api</artifactId>
@@ -132,7 +136,6 @@
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-pool-impl</artifactId>
</dependency>
- -->
<dependency>
<groupId>org.apache.avalon.cornerstone.threads</groupId>
<artifactId>cornerstone-threads-api</artifactId>
@@ -141,6 +144,7 @@
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-thread-api</artifactId>
</dependency>
+ -->
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
@@ -149,11 +153,13 @@
<groupId>mstor</groupId>
<artifactId>mstor</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -162,6 +168,7 @@
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailet-base</artifactId>
@@ -198,5 +205,6 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
+ -->
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/user-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=684867&r1=684866&r2=684867&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Mon Aug 11 11:42:08 2008
@@ -52,6 +52,11 @@
</dependency>
<dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org