[maven-help-plugin] branch MPH-159 updated (e10140c -> f0a50cf)

[kh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a change to branch MPH-159
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git.


 discard e10140c  [MPH-159] - Upgrade JUnit 4.12
     add d3a92ca  [MPH-158] - Upgrade xstream 1.4.11.1
     new f0a50cf  [MPH-159] - Upgrade JUnit 4.12

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e10140c)
            \
             N -- N -- N   refs/heads/MPH-159 (f0a50cf)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[maven-help-plugin] 01/01: [MPH-159] - Upgrade JUnit 4.12

[kh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch MPH-159
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git

commit f0a50cf00953e04a701bcdd30505be7680e986f1
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Dec 1 11:32:19 2018 +0100

    [MPH-159] - Upgrade JUnit 4.12
---
 pom.xml                                                           | 2 +-
 src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73d5bb6..9b85abe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java b/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
index af88caa..a7a0dff 100644
--- a/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
@@ -19,8 +19,8 @@ package org.apache.maven.plugins.help;
  * under the License.
  */
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -40,9 +40,9 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.exec.MavenPluginManagerHelper;
 import org.mockito.ArgumentCaptor;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 import junitx.util.PrivateAccessor;
+
 /**
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  */
@@ -66,7 +66,7 @@ public class DescribeMojoTest
         }
         catch ( Throwable e )
         {
-            Assert.fail( "The API changes" );
+            fail( "The API changes" );
         }
     }