Skip to content

Commit 7493cd2

Browse files
author
dupirefr
committed
[JAVA-131] Unifying hamcrest-core and hamcrest-libraries dependencies under hamcrest
1 parent 5477911 commit 7493cd2

17 files changed

Lines changed: 17 additions & 74 deletions

File tree

cdi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</dependency>
2727
<dependency>
2828
<groupId>org.hamcrest</groupId>
29-
<artifactId>hamcrest-core</artifactId>
29+
<artifactId>hamcrest</artifactId>
3030
<version>${hamcrest.version}</version>
3131
<scope>test</scope>
3232
</dependency>

core-java-modules/core-java-string-conversions-2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</dependency>
2929
<dependency>
3030
<groupId>org.hamcrest</groupId>
31-
<artifactId>hamcrest-library</artifactId>
31+
<artifactId>hamcrest</artifactId>
3232
<version>${hamcrest.version}</version>
3333
<scope>test</scope>
3434
</dependency>

core-java-modules/core-java-string-conversions/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dependency>
4545
<dependency>
4646
<groupId>org.hamcrest</groupId>
47-
<artifactId>hamcrest-library</artifactId>
47+
<artifactId>hamcrest</artifactId>
4848
<version>${hamcrest.version}</version>
4949
<scope>test</scope>
5050
</dependency>

core-java-modules/core-java-string-operations-2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</dependency>
4949
<dependency>
5050
<groupId>org.hamcrest</groupId>
51-
<artifactId>hamcrest-library</artifactId>
51+
<artifactId>hamcrest</artifactId>
5252
<version>${hamcrest.version}</version>
5353
<scope>test</scope>
5454
</dependency>

ethereum/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
</dependency>
160160
<dependency>
161161
<groupId>org.hamcrest</groupId>
162-
<artifactId>hamcrest-library</artifactId>
162+
<artifactId>hamcrest</artifactId>
163163
<version>${hamcrest.version}</version>
164164
<scope>test</scope>
165165
</dependency>

pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,7 @@
5959
</dependency>
6060
<dependency>
6161
<groupId>org.hamcrest</groupId>
62-
<artifactId>hamcrest-core</artifactId>
63-
<version>${hamcrest.version}</version>
64-
<scope>test</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.hamcrest</groupId>
68-
<artifactId>hamcrest-library</artifactId>
62+
<artifactId>hamcrest</artifactId>
6963
<version>${hamcrest.version}</version>
7064
<scope>test</scope>
7165
</dependency>

spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</dependency>
6565
<dependency>
6666
<groupId>org.hamcrest</groupId>
67-
<artifactId>hamcrest-core</artifactId>
67+
<artifactId>hamcrest</artifactId>
6868
<version>${hamcrest.version}</version>
6969
<scope>test</scope>
7070
</dependency>

spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@
2424
</dependency>
2525
<dependency>
2626
<groupId>org.hamcrest</groupId>
27-
<artifactId>hamcrest-core</artifactId>
28-
<scope>test</scope>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.hamcrest</groupId>
32-
<artifactId>hamcrest-library</artifactId>
27+
<artifactId>hamcrest</artifactId>
3328
<scope>test</scope>
3429
</dependency>
3530
<dependency>

spring-core-2/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,7 @@
135135
</dependency>
136136
<dependency>
137137
<groupId>org.hamcrest</groupId>
138-
<artifactId>hamcrest-core</artifactId>
139-
<scope>test</scope>
140-
</dependency>
141-
<dependency>
142-
<groupId>org.hamcrest</groupId>
143-
<artifactId>hamcrest-library</artifactId>
138+
<artifactId>hamcrest</artifactId>
144139
<scope>test</scope>
145140
</dependency>
146141
<dependency>

spring-rest-query-language/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,9 @@
206206
<scope>test</scope>
207207
</dependency>
208208

209-
210-
<!-- <dependency> -->
211-
<!-- <groupId>org.hamcrest</groupId> -->
212-
<!-- <artifactId>hamcrest-core</artifactId> -->
213-
<!-- <scope>test</scope> -->
214-
<!-- </dependency> -->
215209
<dependency>
216210
<groupId>org.hamcrest</groupId>
217-
<artifactId>hamcrest-library</artifactId>
211+
<artifactId>hamcrest</artifactId>
218212
<scope>test</scope>
219213
</dependency>
220214

0 commit comments

Comments
 (0)