james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adup...@apache.org
Subject [2/5] james-project git commit: JAMES-1830 Remove duplication of mockito in mailet/standard POM
Date Wed, 05 Oct 2016 06:35:58 GMT
JAMES-1830 Remove duplication of mockito in mailet/standard POM


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/396a950a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/396a950a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/396a950a

Branch: refs/heads/master
Commit: 396a950af6de5204ec81d4a93b996a70b58218bb
Parents: 0501c99
Author: Benoit Tellier <btellier@linagora.com>
Authored: Tue Oct 4 10:18:19 2016 +0200
Committer: Benoit Tellier <btellier@linagora.com>
Committed: Tue Oct 4 15:57:27 2016 +0200

----------------------------------------------------------------------
 mailet/standard/pom.xml                             |  5 -----
 server/mailet/mailets/pom.xml                       | 16 ++++++++--------
 .../transport/mailets/ResourceLocatorImpl.java      |  2 +-
 server/pom.xml                                      |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/396a950a/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 3acf94b..1ca1f89 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -63,11 +63,6 @@
             <artifactId>mail</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/james-project/blob/396a950a/server/mailet/mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index ee2dc9d..192f208 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -36,14 +36,6 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>apache-mime4j-dom</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-mime4j-james-utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
             <artifactId>james-server-util</artifactId>
         </dependency>
         <dependency>
@@ -118,6 +110,14 @@
             <artifactId>apache-jspf-resolver</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.james</groupId>
+            <artifactId>apache-mime4j-dom</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.james</groupId>
+            <artifactId>apache-mime4j-james-utils</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/james-project/blob/396a950a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
index b1041fb..bf8978e 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
@@ -21,9 +21,9 @@ package org.apache.james.transport.mailets;
 
 import org.apache.james.sieverepository.api.SieveRepository;
 import org.apache.james.sieverepository.api.exception.SieveRepositoryException;
+import org.apache.james.transport.mailets.jsieve.ResourceLocator;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.UsersRepositoryException;
-import org.apache.jsieve.mailet.ResourceLocator;
 import org.joda.time.DateTime;
 
 import javax.mail.MessagingException;

http://git-wip-us.apache.org/repos/asf/james-project/blob/396a950a/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 7a8b9fe..35f91bd 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -986,7 +986,7 @@
                         <groupId>xerces</groupId>
                         <artifactId>xerces</artifactId>
                     </exclusion>
-                    <exclusion>Mime4J
+                    <exclusion>
                         <groupId>xml-apis</groupId>
                         <artifactId>xml-apis</artifactId>
                     </exclusion>


---------------------------------------------------------------------
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