Merge pull request #636 from Azquelt/single-hamcrest-version

Depend on a single hamcrest version
eclipse · Jun 17, 2024 · 1242a64 · 1242a64
2 parents ecfa8cc + ca2c3aa
commit 1242a64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
  <osgi-annotation.version>8.1.0</osgi-annotation.version>
  <!-- Versions of TCK dependencies -->
  <rest-assured.version>4.3.0</rest-assured.version>
- <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
+ <hamcrest.version>2.1</hamcrest.version>
  <httpclient.version>4.5.2</httpclient.version>
  <jackson.version>2.10.1</jackson.version>
  <mp.rest-client-api.version>3.0.1</mp.rest-client-api.version>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -94,13 +94,8 @@
 
  <dependency>
  <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${java-hamcrest.version}</version>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest.version}</version>
  </dependency>
 
  <dependency>