You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/03/26 06:21:15 UTC
[shardingsphere] branch master updated: Upgrade hamcrest from 1.3 to 2.2 (#24830)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new fe4df6b07cc Upgrade hamcrest from 1.3 to 2.2 (#24830)
fe4df6b07cc is described below
commit fe4df6b07cce77fdadfc4a3f6ff7b1c339684481
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Mar 26 14:21:05 2023 +0800
Upgrade hamcrest from 1.3 to 2.2 (#24830)
---
agent/plugins/tracing/test/pom.xml | 2 +-
pom.xml | 12 +++---------
test/it/parser/pom.xml | 2 +-
test/util/pom.xml | 2 +-
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/agent/plugins/tracing/test/pom.xml b/agent/plugins/tracing/test/pom.xml
index 728fdbb7474..72df77a56fb 100644
--- a/agent/plugins/tracing/test/pom.xml
+++ b/agent/plugins/tracing/test/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 6e5fabe50ae..480bf871bc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
<junit.version>5.9.2</junit.version>
- <hamcrest.version>1.3</hamcrest.version>
+ <hamcrest.version>2.2</hamcrest.version>
<mockito.version>4.8.0</mockito.version>
<protobuf-java.version>3.21.12</protobuf-java.version>
@@ -535,7 +535,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
@@ -544,12 +544,6 @@
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -643,7 +637,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/test/it/parser/pom.xml b/test/it/parser/pom.xml
index 3e607626569..2281b2bcd60 100644
--- a/test/it/parser/pom.xml
+++ b/test/it/parser/pom.xml
@@ -138,7 +138,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/test/util/pom.xml b/test/util/pom.xml
index 80e29330ecf..74da0a82f95 100644
--- a/test/util/pom.xml
+++ b/test/util/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>compile</scope>
</dependency>
<dependency>