JAMES-1830 Remove duplication of mockito in mailet/standard POM

apache · Oct 4, 2016 · 396a950 · 396a950
1 parent 0501c99
commit 396a950
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
@@ -62,11 +62,6 @@
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
@@ -34,14 +34,6 @@
     <name>Apache James :: Server :: Mailets</name>
 
     <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>
@@ -117,6 +109,14 @@
             <groupId>org.apache.james.jspf</groupId>
             <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>

diff --git a/.../mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java b/.../mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
@@ -21,9 +21,9 @@
 
 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;

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