diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 83ea055f241a..793aedc92133 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -154,11 +154,6 @@ under the License. mockito-core test - - org.hamcrest - hamcrest-library - test - diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java index 37ea61472ce7..170cebcb25cd 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java @@ -37,7 +37,7 @@ import org.mockito.MockitoAnnotations; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/pom.xml b/pom.xml index a87cf21d3b4e..ce24821055e9 100644 --- a/pom.xml +++ b/pom.xml @@ -124,20 +124,19 @@ under the License. - 3.0.5 8 - 2.6.0 - 1.4 + 2.7.0 + 1.5.0 2.11.0 - 3.8.1 + 3.12.0 4.13.2 - 2.21.0 + 4.11.0 2.1.0 1.26 3.5.1 5.1.0 - 30.1-jre + 31.1-jre 1.0.1 3.5.3 2.0 @@ -145,8 +144,8 @@ under the License. 1.3 1.9.7 1.7.36 - 2.2.1 - 1.7.4 + 2.9.1 + 2.0.9 true apache-maven @@ -364,7 +363,7 @@ under the License. ch.qos.logback logback-classic - 1.2.11 + 1.2.12 true @@ -424,6 +423,17 @@ under the License. maven-resolver-transport-wagon ${resolverVersion} + + + org.apache.httpcomponents + httpcore + 4.4.16 + + + org.apache.httpcomponents + httpclient + 4.5.14 + commons-cli @@ -476,12 +486,32 @@ under the License. xmlunit-core ${xmlunitVersion} test + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + org.xmlunit xmlunit-matchers ${xmlunitVersion} test + + + org.hamcrest + hamcrest-core + + + org.hamcrest + hamcrest-library + + org.powermock @@ -490,15 +520,21 @@ under the License. org.hamcrest - hamcrest-core - 1.3 + hamcrest + 2.2 test - org.hamcrest - hamcrest-library - 1.3 + junit + junit + ${junitVersion} test + + + org.hamcrest + hamcrest-core + + @@ -506,10 +542,14 @@ under the License. + + org.hamcrest + hamcrest + test + junit junit - ${junitVersion} test