JAMES-2506 Remove jmock from root pom & mailetdoc-maven-plugin

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

Branch: refs/heads/master
Commit: de033f3ee6b733919ed5c1d2f4d2a2e65187d89d
Parents: 6373f39
Author: duc <[email protected]>
Authored: Tue Jul 31 10:23:42 2018 +0700
Committer: Benoit Tellier <[email protected]>
Committed: Fri Aug 3 15:51:21 2018 +0700

----------------------------------------------------------------------
 .../appended-resources/supplemental-models.xml     | 17 -----------------
 pom.xml                                            | 16 ----------------
 2 files changed, 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/de033f3e/mailet/mailetdocs-maven-plugin/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git 
a/mailet/mailetdocs-maven-plugin/src/main/appended-resources/supplemental-models.xml
 
b/mailet/mailetdocs-maven-plugin/src/main/appended-resources/supplemental-models.xml
index 4cf9a46..f39d6dc 100644
--- 
a/mailet/mailetdocs-maven-plugin/src/main/appended-resources/supplemental-models.xml
+++ 
b/mailet/mailetdocs-maven-plugin/src/main/appended-resources/supplemental-models.xml
@@ -86,21 +86,4 @@
       </licenses>
     </project>
   </supplement>
-  <supplement>
-    <project>
-      <groupId>jmock</groupId>
-      <artifactId>jmock</artifactId>
-      <name>JMock</name>
-      <organization>
-        <name>jMock.org</name>
-        <url>http://jmock.org</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>jMock Project License</name>
-          <url>http://www.jmock.org/license.html</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
 </supplementalDataModels>

http://git-wip-us.apache.org/repos/asf/james-project/blob/de033f3e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f87747..9486a92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -613,7 +613,6 @@
         <junit.jupiter.version>5.0.2</junit.jupiter.version>
         <junit.plateform.version>1.0.2</junit.plateform.version>
         <junit.vintage.version>4.12.2</junit.vintage.version>
-        <jmock.version>2.6.0</jmock.version>
         <concurrent.version>1.3.4</concurrent.version>
         <jcr.version>2.0</jcr.version>
         <xbean-spring.version>4.9</xbean-spring.version>
@@ -1941,11 +1940,6 @@
                 <version>${servlet-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>jmock</groupId>
-                <artifactId>jmock</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-            <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>${junit.version}</version>
@@ -2357,16 +2351,6 @@
                 <version>${jasypt.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.jmock</groupId>
-                <artifactId>jmock</artifactId>
-                <version>${jmock.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jmock</groupId>
-                <artifactId>jmock-junit4</artifactId>
-                <version>${jmock.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
                 <version>${junit.jupiter.version}</version>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to