You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2019/12/01 11:31:44 UTC
[maven-compiler-plugin] branch rhowe-upgrade-mockito created (now
456440c)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch rhowe-upgrade-mockito
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git.
at 456440c [MCOMPILER-399] Upgrade mockito from 1.9.5 to 2.28.2
This branch includes the following new commits:
new 4b38f50 Disable error-prone-compiler IT for Java 14
new 456440c [MCOMPILER-399] Upgrade mockito from 1.9.5 to 2.28.2
The 2 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.
[maven-compiler-plugin] 01/02: Disable error-prone-compiler IT for
Java 14
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch rhowe-upgrade-mockito
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 4b38f50bc56ec0ba9ae4def0eb8282168c372441
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Oct 6 10:31:06 2019 +0200
Disable error-prone-compiler IT for Java 14
---
src/it/error-prone-compiler/invoker.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/it/error-prone-compiler/invoker.properties b/src/it/error-prone-compiler/invoker.properties
index e511168..d131cf9 100644
--- a/src/it/error-prone-compiler/invoker.properties
+++ b/src/it/error-prone-compiler/invoker.properties
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 1.8+,!11,!12,!13
+invoker.java.version = 1.8+,!11,!12,!13,!14
invoker.goals = clean compile
invoker.buildResult = failure
[maven-compiler-plugin] 02/02: [MCOMPILER-399] Upgrade mockito from
1.9.5 to 2.28.2
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch rhowe-upgrade-mockito
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 456440c74c9f92f92924b620199043dd3d41beed
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;