Skip to content

Commit 313441b

Browse files
author
gdgate
authored
Merge pull request gooddata#699 from gooddata/dependabot/maven/org.hamcrest-hamcrest-library-2.1
Bump hamcrest-library from 1.3 to 2.1 Reviewed-by: Peter Plocháň https://github.com/peter-plochan
2 parents 0f4cea1 + 6c204f1 commit 313441b

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

pom.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -360,23 +360,17 @@
360360
<artifactId>mockito-core</artifactId>
361361
<version>1.9.5</version>
362362
<scope>test</scope>
363+
<exclusions>
364+
<exclusion>
365+
<groupId>org.hamcrest</groupId>
366+
<artifactId>hamcrest-core</artifactId>
367+
</exclusion>
368+
</exclusions>
363369
</dependency>
364370
<dependency>
365371
<groupId>org.hamcrest</groupId>
366-
<artifactId>hamcrest-core</artifactId>
367-
<version>1.3</version>
368-
<scope>test</scope>
369-
</dependency>
370-
<dependency>
371-
<groupId>org.hamcrest</groupId>
372-
<artifactId>hamcrest-library</artifactId>
373-
<version>1.3</version>
374-
<scope>test</scope>
375-
</dependency>
376-
<dependency>
377-
<groupId>org.hamcrest</groupId>
378-
<artifactId>java-hamcrest</artifactId>
379-
<version>2.0.0.0</version>
372+
<artifactId>hamcrest</artifactId>
373+
<version>2.1</version>
380374
<scope>test</scope>
381375
</dependency>
382376
<dependency>
@@ -408,6 +402,12 @@
408402
<artifactId>jadler-core</artifactId>
409403
<version>${jadler.version}</version>
410404
<scope>test</scope>
405+
<exclusions>
406+
<exclusion>
407+
<groupId>org.hamcrest</groupId>
408+
<artifactId>hamcrest-library</artifactId>
409+
</exclusion>
410+
</exclusions>
411411
</dependency>
412412
<dependency>
413413
<groupId>net.jadler</groupId>

0 commit comments

Comments
 (0)