From ab174e2b9a266ed43a9a4df533de94deed834bfa Mon Sep 17 00:00:00 2001 From: ian-lavallee Date: Thu, 7 May 2020 16:37:27 -0400 Subject: [PATCH 1/4] [MRELEASE-1045] Update mockito-core to 2.28.2 --- maven-release-plugin/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml index 3bf479efc..5e16b5b17 100644 --- a/maven-release-plugin/pom.xml +++ b/maven-release-plugin/pom.xml @@ -103,6 +103,7 @@ org.mockito mockito-core + 2.28.2 test From 82300cefc17d1d895657ceacfe1f47a75a4d8ecb Mon Sep 17 00:00:00 2001 From: ian-lavallee Date: Thu, 7 May 2020 17:05:17 -0400 Subject: [PATCH 2/4] [MRELEASE-1045] Update mockito-core to 2.28.2 --- maven-release-plugin/pom.xml | 1 - pom.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml index 5e16b5b17..3bf479efc 100644 --- a/maven-release-plugin/pom.xml +++ b/maven-release-plugin/pom.xml @@ -103,7 +103,6 @@ org.mockito mockito-core - 2.28.2 test diff --git a/pom.xml b/pom.xml index 253e24891..cdd698b08 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ org.mockito mockito-core - 1.9.5 + 2.28.2 org.xmlunit From c469e1262fa054e6d2870fef057e767c896360af Mon Sep 17 00:00:00 2001 From: ian-lavallee Date: Thu, 7 May 2020 17:37:33 -0400 Subject: [PATCH 3/4] [MRELEASE-1045] Update mockito-core to 2.28.2 changed classes to implement interfaces that used to be abstract classes --- .../maven/shared/release/phase/IsScmBranchEquals.java | 4 ++-- .../shared/release/phase/IsScmBranchParametersEquals.java | 5 +++-- .../maven/shared/release/phase/IsScmFileSetEquals.java | 4 ++-- .../apache/maven/shared/release/phase/IsScmTagEquals.java | 6 ++++-- .../shared/release/phase/IsScmTagParametersEquals.java | 4 ++-- 5 files changed, 13 insertions(+), 10 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 6e87a4258..79840d4b5 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 @@ * * @author Brett Porter */ -public class IsScmBranchEquals extends ArgumentMatcher +public class IsScmBranchEquals implements ArgumentMatcher { private final ScmBranch branch; @@ -37,7 +37,7 @@ public IsScmBranchEquals( ScmBranch branch ) } @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 8431b85e1..537a23804 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 @@ * under the License. */ +import org.apache.maven.scm.ScmBranch; import org.apache.maven.scm.ScmBranchParameters; import org.mockito.ArgumentMatcher; @@ -26,7 +27,7 @@ /** * @author olamy */ -public class IsScmBranchParametersEquals extends ArgumentMatcher +public class IsScmBranchParametersEquals implements ArgumentMatcher { private final ScmBranchParameters scmBranchParameters; @@ -36,7 +37,7 @@ public IsScmBranchParametersEquals( ScmBranchParameters scmBranchParameters ) } @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 a552097a2..51f32a02b 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 @@ * @author Brett Porter * @todo add an equals() method */ -public class IsScmFileSetEquals extends ArgumentMatcher +public class IsScmFileSetEquals implements ArgumentMatcher { private final ScmFileSet fileSet; @@ -40,7 +40,7 @@ public IsScmFileSetEquals( ScmFileSet fileSet ) } @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 4907b569b..c55924787 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 @@ * @author Brett Porter * @todo add an equals() method */ -public class IsScmTagEquals extends ArgumentMatcher +public class IsScmTagEquals implements ArgumentMatcher { private final ScmTag tag; @@ -38,10 +38,12 @@ public IsScmTagEquals( ScmTag tag ) } @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 61962561f..f0d012df1 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 @@ /** * @author olamy */ -public class IsScmTagParametersEquals extends ArgumentMatcher +public class IsScmTagParametersEquals implements ArgumentMatcher { private final ScmTagParameters scmTagParameters; @@ -35,7 +35,7 @@ public IsScmTagParametersEquals( ScmTagParameters scmTagParameters ) } @Override - public boolean matches( Object argument ) + public boolean matches( ScmTagParameters argument ) { ScmTagParameters stp = (ScmTagParameters) argument; return stp.getMessage().equals( this.scmTagParameters.getMessage() ) From 38e1086deb504ad20ae3c3b29dafb5a0a39d47d2 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 8 May 2020 14:47:52 -0400 Subject: [PATCH 4/4] ignore Eclipse checkstyle file --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8288b6a8c..ebf702476 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ target .project .settings build +.checkstyle +