[maven-compiler-plugin] branch MCOMPILER-399 updated (456440c -> a201832)

[kh...@apache.org]

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

khmarbaise pushed a change to branch MCOMPILER-399
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git.


 discard 456440c  [MCOMPILER-399] Upgrade mockito from 1.9.5 to 2.28.2
 discard 4b38f50  Disable error-prone-compiler IT for Java 14
     add c266728  Disable error-prone-compiler IT for Java 14
     new a201832  [MCOMPILER-399] Upgrade mockito from 1.9.5 to 2.28.2

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   (456440c)
            \
             N -- N -- N   refs/heads/MCOMPILER-399 (a201832)

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:

[maven-compiler-plugin] 01/01: [MCOMPILER-399] Upgrade mockito from 1.9.5 to 2.28.2

[kh...@apache.org]

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

khmarbaise pushed a commit to branch MCOMPILER-399
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git

commit a201832fdd8b5b9e1ed67ac43b36701edc712e71
Author: Russell Howe <rh...@siksai.co.uk>
AuthorDate: Wed Sep 25 07:55:59 2019 +0100

    [MCOMPILER-399] Upgrade mockito from 1.9.5 to 2.28.2
---
 pom.xml                                                                 | 2 +-
 .../java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 863192b..00e694e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@ under the License.
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
+      <version>2.28.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
index 348cfb0..b1282d5 100644
--- a/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
+++ b/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
@@ -19,7 +19,7 @@ package org.apache.maven.plugin.compiler;
  * under the License.
  */
 
-import static org.mockito.Matchers.startsWith;
+import static org.mockito.ArgumentMatchers.startsWith;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;