james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r993430 - in /james/server/trunk: common-util/pom.xml common-util/src/main/java/org/apache/james/util/codec/ common-util/src/main/java/org/apache/james/util/scanner/ mailets/pom.xml pom.xml smtpserver/pom.xml spring-deployment/pom.xml
Date Tue, 07 Sep 2010 17:08:30 GMT
Author: norman
Date: Tue Sep  7 17:08:29 2010
New Revision: 993430

URL: http://svn.apache.org/viewvc?rev=993430&view=rev
Log:
merge javamail-util into common-util (JAMES-1039)

Added:
    james/server/trunk/common-util/src/main/java/org/apache/james/util/codec/
      - copied from r980898, james/server/trunk/javamail-util/src/main/java/org/apache/james/util/codec/
    james/server/trunk/common-util/src/main/java/org/apache/james/util/scanner/
      - copied from r980898, james/server/trunk/javamail-util/src/main/java/org/apache/james/util/scanner/
Modified:
    james/server/trunk/common-util/pom.xml
    james/server/trunk/mailets/pom.xml
    james/server/trunk/pom.xml
    james/server/trunk/smtpserver/pom.xml
    james/server/trunk/spring-deployment/pom.xml

Modified: james/server/trunk/common-util/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/pom.xml?rev=993430&r1=993429&r2=993430&view=diff
==============================================================================
--- james/server/trunk/common-util/pom.xml (original)
+++ james/server/trunk/common-util/pom.xml Tue Sep  7 17:08:29 2010
@@ -94,6 +94,10 @@
       <artifactId>oro</artifactId>
     </dependency>
     <dependency>
+      <groupId>${javax.mail.groupId}</groupId>
+      <artifactId>${javax.mail.artifactId}</artifactId>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=993430&r1=993429&r2=993430&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Tue Sep  7 17:08:29 2010
@@ -78,10 +78,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-javamail-util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>james-server-common-util</artifactId>
     </dependency>
     <dependency>

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=993430&r1=993429&r2=993430&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Sep  7 17:08:29 2010
@@ -33,7 +33,6 @@
   <inceptionYear>2002</inceptionYear>
   <packaging>pom</packaging>
   <modules>
-    <module>javamail-util</module>
     <module>common-util</module>
     <module>core-api</module>
     <module>user-api</module>
@@ -293,11 +292,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-javamail-util</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>james-server-common-util</artifactId>
       <version>${pom.version}</version>
     </dependency>

Modified: james/server/trunk/smtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=993430&r1=993429&r2=993430&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Tue Sep  7 17:08:29 2010
@@ -30,10 +30,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-javamail-util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>james-server-common-util</artifactId>
     </dependency>
     <dependency>

Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=993430&r1=993429&r2=993430&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Tue Sep  7 17:08:29 2010
@@ -415,11 +415,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-javamail-util</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>james-server-common-util</artifactId>
       <scope>runtime</scope>
     </dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message