You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/12/06 15:24:55 UTC
[maven-filtering] 04/04: [MSHARED-1003] Deps cleanup
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-1003
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit 71bff1776126f7ed973099c9cc0286af700e0d9d
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Dec 6 16:24:14 2021 +0100
[MSHARED-1003] Deps cleanup
---
pom.xml | 6 +++---
.../filtering/AbstractInterpolatorFilterReaderLineEndingTest.java | 4 ++--
.../MultiDelimiterInterpolatorFilterReaderLineEndingTest.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6113e6d..1243429 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.3.0</version>
+ <version>3.3.0</version><!-- Java 7 -->
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -108,7 +108,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.6</version><!-- Java 7 -->
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.28.2</version>
+ <version>2.28.2</version><!-- Java 7 -->
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java b/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
index 1e25c78..863ed7a 100644
--- a/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.shared.filtering;
*/
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.when;
import java.io.IOException;
diff --git a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
index 42062a8..e1b8a4e 100644
--- a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.shared.filtering;
*/
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.when;
import java.io.Reader;