Skip to content

Commit 136fb58

Browse files
mjw99mjw99
committed
Update hamcrest to 2.2
Note the point about dep reordering in: http://hamcrest.org/JavaHamcrest/distributables#upgrading-from-hamcrest-1x
1 parent 140fb33 commit 136fb58

File tree

44 files changed

+70
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+70
-71
lines changed

‎base/test-core/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<version>${project.parent.version}</version>
2121
<scope>test</scope>
2222
</dependency>
23+
<dependency>
24+
<groupId>org.hamcrest</groupId>
25+
<artifactId>hamcrest</artifactId>
26+
<scope>test</scope>
27+
</dependency>
2328
<dependency>
2429
<groupId>junit</groupId>
2530
<artifactId>junit</artifactId>
@@ -30,11 +35,6 @@
3035
<artifactId>mockito-all</artifactId>
3136
<scope>test</scope>
3237
</dependency>
33-
<dependency>
34-
<groupId>org.hamcrest</groupId>
35-
<artifactId>hamcrest-all</artifactId>
36-
<scope>test</scope>
37-
</dependency>
3838
<dependency>
3939
<groupId>com.google.guava</groupId>
4040
<artifactId>guava</artifactId>

‎base/test-standard/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>org.hamcrest</groupId>
30-
<artifactId>hamcrest-all</artifactId>
30+
<artifactId>hamcrest</artifactId>
3131
<scope>test</scope>
3232
</dependency>
3333
<dependency>

‎descriptor/cip/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</dependency>
2626
<dependency>
2727
<groupId>org.hamcrest</groupId>
28-
<artifactId>hamcrest-all</artifactId>
28+
<artifactId>hamcrest</artifactId>
2929
<scope>test</scope>
3030
</dependency>
3131
<dependency>

‎descriptor/fingerprint/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
<dependency>
3535
<groupId>uk.ac.ebi.beam</groupId>
3636
<artifactId>beam-func</artifactId>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.hamcrest</groupId>
40+
<artifactId>hamcrest</artifactId>
41+
<scope>test</scope>
3742
</dependency>
3843
<dependency>
3944
<groupId>junit</groupId>
@@ -45,11 +50,6 @@
4550
<artifactId>mockito-all</artifactId>
4651
<scope>test</scope>
4752
</dependency>
48-
<dependency>
49-
<groupId>org.hamcrest</groupId>
50-
<artifactId>hamcrest-all</artifactId>
51-
<scope>test</scope>
52-
</dependency>
5353
<dependency>
5454
<groupId>log4j</groupId>
5555
<artifactId>log4j</artifactId>

‎descriptor/ionpot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</dependency>
2222
<dependency>
2323
<groupId>org.hamcrest</groupId>
24-
<artifactId>hamcrest-all</artifactId>
24+
<artifactId>hamcrest</artifactId>
2525
<scope>test</scope>
2626
</dependency>
2727
<dependency>

‎descriptor/qsar/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>org.hamcrest</groupId>
37-
<artifactId>hamcrest-all</artifactId>
37+
<artifactId>hamcrest</artifactId>
3838
<scope>test</scope>
3939
</dependency>
4040
<dependency>

‎descriptor/qsaratomic/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</dependency>
4747
<dependency>
4848
<groupId>org.hamcrest</groupId>
49-
<artifactId>hamcrest-all</artifactId>
49+
<artifactId>hamcrest</artifactId>
5050
<scope>test</scope>
5151
</dependency>
5252
<dependency>

‎descriptor/qsarbond/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</dependency>
4747
<dependency>
4848
<groupId>org.hamcrest</groupId>
49-
<artifactId>hamcrest-all</artifactId>
49+
<artifactId>hamcrest</artifactId>
5050
<scope>test</scope>
5151
</dependency>
5252
<dependency>

‎descriptor/qsarcml/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</dependency>
3232
<dependency>
3333
<groupId>org.hamcrest</groupId>
34-
<artifactId>hamcrest-all</artifactId>
34+
<artifactId>hamcrest</artifactId>
3535
<scope>test</scope>
3636
</dependency>
3737
<dependency>

‎descriptor/qsarionpot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</dependency>
2222
<dependency>
2323
<groupId>org.hamcrest</groupId>
24-
<artifactId>hamcrest-all</artifactId>
24+
<artifactId>hamcrest</artifactId>
2525
<scope>test</scope>
2626
</dependency>
2727
<dependency>

0 commit comments

Comments
 (0)