You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/05/08 17:56:53 UTC
[maven-release] branch master updated: [MRELEASE-1045] Update
mockito-core to 2.28.2 (#53)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new 01676ee [MRELEASE-1045] Update mockito-core to 2.28.2 (#53)
01676ee is described below
commit 01676ee765cacaca15dba66e7948a3fb0699c700
Author: ian-lavallee <34...@users.noreply.github.com>
AuthorDate: Fri May 8 17:56:47 2020 +0000
[MRELEASE-1045] Update mockito-core to 2.28.2 (#53)
* [MRELEASE-1045] Update mockito-core to 2.28.2
changed classes to implement interfaces that used to be abstract classes
---
.../org/apache/maven/shared/release/phase/IsScmBranchEquals.java | 4 ++--
.../maven/shared/release/phase/IsScmBranchParametersEquals.java | 5 +++--
.../org/apache/maven/shared/release/phase/IsScmFileSetEquals.java | 4 ++--
.../java/org/apache/maven/shared/release/phase/IsScmTagEquals.java | 6 ++++--
.../apache/maven/shared/release/phase/IsScmTagParametersEquals.java | 4 ++--
pom.xml | 2 +-
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java
index 6e87a42..79840d4 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java
@@ -27,7 +27,7 @@ import org.mockito.ArgumentMatcher;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class IsScmBranchEquals extends ArgumentMatcher<ScmBranch>
+public class IsScmBranchEquals implements ArgumentMatcher<ScmBranch>
{
private final ScmBranch branch;
@@ -37,7 +37,7 @@ public class IsScmBranchEquals extends ArgumentMatcher<ScmBranch>
}
@Override
- public boolean matches( Object argument )
+ public boolean matches( ScmBranch argument )
{
ScmBranch sb = (ScmBranch) argument;
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
index 8431b85..537a238 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
@@ -19,6 +19,7 @@ package org.apache.maven.shared.release.phase;
* under the License.
*/
+import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmBranchParameters;
import org.mockito.ArgumentMatcher;
@@ -26,7 +27,7 @@ import org.mockito.ArgumentMatcher;
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
*/
-public class IsScmBranchParametersEquals extends ArgumentMatcher<ScmBranchParameters>
+public class IsScmBranchParametersEquals implements ArgumentMatcher<ScmBranchParameters>
{
private final ScmBranchParameters scmBranchParameters;
@@ -36,7 +37,7 @@ public class IsScmBranchParametersEquals extends ArgumentMatcher<ScmBranchParame
}
@Override
- public boolean matches( Object argument )
+ public boolean matches( ScmBranchParameters argument )
{
ScmBranchParameters sbp = (ScmBranchParameters) argument;
return sbp.getMessage().equals( this.scmBranchParameters.getMessage() )
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
index a552097..51f32a0 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
@@ -30,7 +30,7 @@ import org.mockito.ArgumentMatcher;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @todo add an equals() method
*/
-public class IsScmFileSetEquals extends ArgumentMatcher<ScmFileSet>
+public class IsScmFileSetEquals implements ArgumentMatcher<ScmFileSet>
{
private final ScmFileSet fileSet;
@@ -40,7 +40,7 @@ public class IsScmFileSetEquals extends ArgumentMatcher<ScmFileSet>
}
@Override
- public boolean matches( Object argument )
+ public boolean matches( ScmFileSet argument )
{
ScmFileSet fs = (ScmFileSet) argument;
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
index 4907b56..c559247 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
@@ -28,7 +28,7 @@ import org.mockito.ArgumentMatcher;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @todo add an equals() method
*/
-public class IsScmTagEquals extends ArgumentMatcher<ScmTag>
+public class IsScmTagEquals implements ArgumentMatcher<ScmTag>
{
private final ScmTag tag;
@@ -38,10 +38,12 @@ public class IsScmTagEquals extends ArgumentMatcher<ScmTag>
}
@Override
- public boolean matches( Object argument )
+ public boolean matches( ScmTag argument )
{
ScmTag tag = (ScmTag) argument;
return tag.getName().equals( this.tag.getName() );
}
+
+
}
\ No newline at end of file
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
index 6196256..f0d012d 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
@@ -25,7 +25,7 @@ import org.mockito.ArgumentMatcher;
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
*/
-public class IsScmTagParametersEquals extends ArgumentMatcher<ScmTagParameters>
+public class IsScmTagParametersEquals implements ArgumentMatcher<ScmTagParameters>
{
private final ScmTagParameters scmTagParameters;
@@ -35,7 +35,7 @@ public class IsScmTagParametersEquals extends ArgumentMatcher<ScmTagParameters>
}
@Override
- public boolean matches( Object argument )
+ public boolean matches( ScmTagParameters argument )
{
ScmTagParameters stp = (ScmTagParameters) argument;
return stp.getMessage().equals( this.scmTagParameters.getMessage() )
diff --git a/pom.xml b/pom.xml
index 253e248..cdd698b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
+ <version>2.28.2</version>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>