[JENKINS-43536] - Resolve compatibility issue between the latest JTH …

…and Mockito
jenkinsci · May 10, 2017 · b273187 · b273187
1 parent b799e3a
commit b273187
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.26</version>
+        <version>2.28</version>
     </parent>
 
     <artifactId>envinject</artifactId>
@@ -102,7 +102,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
@@ -118,7 +118,6 @@
             <artifactId>script-security</artifactId>
             <version>1.22</version>
         </dependency>
-
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectPasswordsMasker.java b/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectPasswordsMasker.java
@@ -31,7 +31,7 @@
 public class EnvInjectPasswordsMasker implements Serializable {
 
     /**
-     * @deprecated Use {@link #maskPasswordsIfAny(hudson.model.Run, java.util.Map, org.jenkinsci.lib.envinject.EnvInjectLogger)} 
+     * @deprecated Use {@link #maskPasswordParametersIfAny(hudson.model.Run, java.util.Map, org.jenkinsci.lib.envinject.EnvInjectLogger)} 
      */
     @Deprecated
     public void maskPasswordsIfAny(@Nonnull AbstractBuild run, @Nonnull EnvInjectLogger logger, @Nonnull Map<String, String> envVars) {

diff --git a/src/test/java/org/jenkinsci/plugins/envinject/BuildCauseRetrieverTest.java b/src/test/java/org/jenkinsci/plugins/envinject/BuildCauseRetrieverTest.java
@@ -14,10 +14,10 @@
 
 import static com.google.common.base.Joiner.on;
 import static hudson.model.Result.SUCCESS;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.jenkinsci.plugins.envinject.matchers.WithEnvInjectActionMatchers.withCause;
 import static org.jenkinsci.plugins.envinject.matchers.WithEnvInjectActionMatchers.withCausesIsTrue;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author Gregory Boissinot

diff --git a/src/test/java/org/jenkinsci/plugins/envinject/EnvInjectBuildWrapperTest.java b/src/test/java/org/jenkinsci/plugins/envinject/EnvInjectBuildWrapperTest.java
@@ -2,7 +2,6 @@
 
 import static com.google.common.collect.ImmutableMap.of;
 import static hudson.Util.replaceMacro;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.jenkinsci.plugins.envinject.matchers.WithEnvInjectActionMatchers.map;
@@ -28,10 +27,10 @@
 import org.jvnet.hudson.test.CaptureEnvironmentBuilder;
 
 import jenkins.model.Jenkins;
-import static org.hamcrest.Matchers.containsString;
 import org.jenkinsci.plugins.envinject.util.TestUtils;
 import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval;
 import org.jenkinsci.plugins.scriptsecurity.scripts.UnapprovedUsageException;
+import static org.junit.Assert.assertThat;
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
 
 public class EnvInjectBuildWrapperTest {

diff --git a/src/test/java/org/jenkinsci/plugins/envinject/EnvInjectEvaluatedGroovyScriptTest.java b/src/test/java/org/jenkinsci/plugins/envinject/EnvInjectEvaluatedGroovyScriptTest.java
@@ -31,9 +31,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import static org.hamcrest.Matchers.containsString;
 
 import static org.hamcrest.collection.IsMapContaining.hasEntry;
-import static org.hamcrest.core.StringContains.containsString;
 import org.jenkinsci.plugins.envinject.util.TestUtils;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;