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 2026/09/19 21:56:03 UTC
(maven-release) 01/01: Drop Hamcrest from tests
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch agent/drop-hamcrest
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit fbaac613d21e0ae985ff1c2b6e351cbd5d1cdc03
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Sep 19 23:55:47 2026 +0200
Drop Hamcrest from tests
---
maven-release-manager/pom.xml | 6 ------
.../shared/release/phase/MapVersionsPhaseTest.java | 5 ++---
.../release/phase/RemoveScmTagPhaseTest.java | 8 +++----
maven-release-plugin/pom.xml | 6 ------
.../plugins/release/PrepareReleaseMojoTest.java | 25 +++++++++++-----------
pom.xml | 5 -----
6 files changed, 17 insertions(+), 38 deletions(-)
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 132351c5..97a0ef1f 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -169,12 +169,6 @@ under the License.
<version>2.2.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-test</artifactId>
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
index a086fd7e..f0a41ce6 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
@@ -40,15 +40,14 @@ import org.apache.maven.shared.release.versions.VersionParseException;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.testing.PlexusTest;
-import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;
@@ -2361,7 +2360,7 @@ class MapVersionsPhaseTest {
ReleaseUtils.buildReleaseDescriptor(builder),
new DefaultReleaseEnvironment(),
reactorProjects));
- assertThat(e.getCause(), CoreMatchers.instanceOf(PolicyException.class));
+ assertInstanceOf(PolicyException.class, e.getCause());
}
@Test
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveScmTagPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveScmTagPhaseTest.java
index 47a454a9..f85b247a 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveScmTagPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveScmTagPhaseTest.java
@@ -40,8 +40,6 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.argThat;
@@ -150,9 +148,9 @@ class RemoveScmTagPhaseTest extends AbstractReleaseTestCase {
new DefaultReleaseEnvironment(),
reactorProjects));
- assertThat(
- e.getMessage(),
- equalTo("Unable to remove tag \nProvider message:\nprovider-message\nCommand output:\ncommand-output"));
+ assertEquals(
+ "Unable to remove tag \nProvider message:\nprovider-message\nCommand output:\ncommand-output",
+ e.getMessage());
}
@Test
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index 5bfd51ee..d013cbfc 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -118,12 +118,6 @@ under the License.
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java b/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
index f7c98220..65ab6a67 100644
--- a/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
+++ b/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
@@ -48,11 +48,11 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;
import static org.apache.maven.api.plugin.testing.MojoExtension.setVariableValueToObject;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.doThrow;
@@ -109,18 +109,17 @@ class PrepareReleaseMojoTest {
// verify
verify(releaseManagerMock).prepare(prepareRequest.capture());
- assertThat(
- prepareRequest.getValue().getReleaseDescriptorBuilder(),
- is(instanceOf(ReleaseDescriptorBuilder.class)));
- assertThat(prepareRequest.getValue().getReleaseEnvironment(), is(instanceOf(ReleaseEnvironment.class)));
- assertThat(prepareRequest.getValue().getReactorProjects(), is(notNullValue()));
- assertThat(prepareRequest.getValue().getResume(), is(true));
- assertThat(prepareRequest.getValue().getDryRun(), is(false));
+ assertInstanceOf(
+ ReleaseDescriptorBuilder.class, prepareRequest.getValue().getReleaseDescriptorBuilder());
+ assertInstanceOf(ReleaseEnvironment.class, prepareRequest.getValue().getReleaseEnvironment());
+ assertNotNull(prepareRequest.getValue().getReactorProjects());
+ assertTrue(prepareRequest.getValue().getResume());
+ assertFalse(prepareRequest.getValue().getDryRun());
ReleaseDescriptorBuilder.BuilderReleaseDescriptor releaseDescriptor =
prepareRequest.getValue().getReleaseDescriptorBuilder().build();
- assertThat(releaseDescriptor.isScmSignTags(), is(false));
- assertThat(releaseDescriptor.isUpdateDependencies(), is(false));
+ assertFalse(releaseDescriptor.isScmSignTags());
+ assertFalse(releaseDescriptor.isUpdateDependencies());
}
@Test
diff --git a/pom.xml b/pom.xml
index 2cc92eb3..7c3a1ff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,11 +276,6 @@ under the License.
<artifactId>xmlunit-core</artifactId>
<version>2.13.0</version>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>3.0</version>
- </dependency>
</dependencies>
</dependencyManagement>