Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump hamcrest.version from 1.3 to 2.2 #3057

Merged
merged 2 commits into from
Nov 15, 2019
Merged

Bump hamcrest.version from 1.3 to 2.2 #3057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a8026c
Bump hamcrest.version from 1.3 to 2.2
dependabot-preview[bot] Nov 15, 2019
86bc53d
[refactor] hamcrest-core and hamcrest-library have been rolled into h…
adamretter Nov 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion exist-ant/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<!-- we ourselves have a test scoped dependency on a newer hamcrest... see below! -->
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -59,7 +66,7 @@

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>

Expand Down
7 changes: 1 addition & 6 deletions exist-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<artifactId>hamcrest</artifactId>
<!-- scope>test</scope --> <!-- not just test scope, as needed for org.exist.test -->
</dependency>

Expand All @@ -430,11 +430,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
Expand Down
11 changes: 2 additions & 9 deletions exist-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
<apache.xmlrpc.version>3.1.3</apache.xmlrpc.version>
<aspectj.version>1.9.4</aspectj.version>
<exquery.distribution.version>0.1.34</exquery.distribution.version>
<hamcrest.version>1.3</hamcrest.version>
<icu.version>59.1</icu.version>
<izpack.version>5.1.3</izpack.version>
<jaxb.version>2.3.1</jaxb.version>
Expand Down Expand Up @@ -414,8 +413,8 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest.version}</version>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<!-- scope>test</scope --> <!-- not just test scope, as needed for org.exist.test -->
</dependency>

Expand All @@ -426,12 +425,6 @@
<version>3.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.googlecode.junit-toolbox</groupId>
<artifactId>junit-toolbox</artifactId>
Expand Down