From b11391566600190e47e86319dbf27e1402f93946 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 25 Apr 2019 12:09:50 +0000 Subject: [PATCH 1/2] Bump hamcrest-library from 1.3 to 2.1 Bumps [hamcrest-library](https://github.com/hamcrest/JavaHamcrest) from 1.3 to 2.1. - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases) - [Changelog](https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md) - [Commits](https://github.com/hamcrest/JavaHamcrest/compare/hamcrest-java-1.3...v2.1) Signed-off-by: dependabot[bot] --- browserup-proxy-core/build.gradle | 2 +- browserup-proxy-mitm/build.gradle | 2 +- browserup-proxy-rest/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browserup-proxy-core/build.gradle b/browserup-proxy-core/build.gradle index 7602ab83e..6fc2b6471 100644 --- a/browserup-proxy-core/build.gradle +++ b/browserup-proxy-core/build.gradle @@ -86,7 +86,7 @@ dependencies { testImplementation 'org.eclipse.jetty:jetty-server:7.6.16.v20140903' testImplementation 'org.eclipse.jetty:jetty-servlet:7.6.16.v20140903' testImplementation 'org.eclipse.jetty:jetty-servlets:7.6.16.v20140903' - testImplementation 'org.hamcrest:hamcrest-library:1.3' + testImplementation 'org.hamcrest:hamcrest-library:2.1' testImplementation ('org.mock-server:mockserver-netty:3.10.4') { exclude(module: 'logback-classic') exclude(module: 'netty-codec-socks') diff --git a/browserup-proxy-mitm/build.gradle b/browserup-proxy-mitm/build.gradle index fbd881f02..782655a20 100644 --- a/browserup-proxy-mitm/build.gradle +++ b/browserup-proxy-mitm/build.gradle @@ -78,7 +78,7 @@ dependencies { testImplementation 'org.apache.logging.log4j:log4j-core:2.8' testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.8' testImplementation 'org.codehaus.groovy:groovy-all:2.4.16' - testImplementation 'org.hamcrest:hamcrest-library:1.3' + testImplementation 'org.hamcrest:hamcrest-library:2.1' testImplementation 'org.mockito:mockito-core:2.23.4' testImplementation 'org.slf4j:jcl-over-slf4j:1.7.22' } diff --git a/browserup-proxy-rest/build.gradle b/browserup-proxy-rest/build.gradle index bd991e78d..abe3b54d2 100644 --- a/browserup-proxy-rest/build.gradle +++ b/browserup-proxy-rest/build.gradle @@ -79,7 +79,7 @@ dependencies { testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2' testImplementation 'org.codehaus.groovy:groovy-all:2.4.16' testImplementation 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1' - testImplementation 'org.hamcrest:hamcrest-library:1.3' + testImplementation 'org.hamcrest:hamcrest-library:2.1' testImplementation 'org.mock-server:mockserver-netty:3.10.8' testImplementation 'org.mockito:mockito-core:2.23.4' testImplementation 'org.seleniumhq.selenium:selenium-api:3.4.0' From 71856b0b05937c287e4e7eecaf385aeb036ba2b7 Mon Sep 17 00:00:00 2001 From: Dan Powell Date: Thu, 25 Apr 2019 08:23:39 -0400 Subject: [PATCH 2/2] Declare a dependency on the hamcrest shim jars. http://hamcrest.org/JavaHamcrest/distributables#upgrading-from-hamcrest-1x --- browserup-proxy-core/build.gradle | 1 + browserup-proxy-mitm/build.gradle | 1 + browserup-proxy-rest/build.gradle | 1 + 3 files changed, 3 insertions(+) diff --git a/browserup-proxy-core/build.gradle b/browserup-proxy-core/build.gradle index 6fc2b6471..fa262561b 100644 --- a/browserup-proxy-core/build.gradle +++ b/browserup-proxy-core/build.gradle @@ -86,6 +86,7 @@ dependencies { testImplementation 'org.eclipse.jetty:jetty-server:7.6.16.v20140903' testImplementation 'org.eclipse.jetty:jetty-servlet:7.6.16.v20140903' testImplementation 'org.eclipse.jetty:jetty-servlets:7.6.16.v20140903' + testImplementation 'org.hamcrest:hamcrest:2.1' testImplementation 'org.hamcrest:hamcrest-library:2.1' testImplementation ('org.mock-server:mockserver-netty:3.10.4') { exclude(module: 'logback-classic') diff --git a/browserup-proxy-mitm/build.gradle b/browserup-proxy-mitm/build.gradle index 782655a20..c843a7093 100644 --- a/browserup-proxy-mitm/build.gradle +++ b/browserup-proxy-mitm/build.gradle @@ -78,6 +78,7 @@ dependencies { testImplementation 'org.apache.logging.log4j:log4j-core:2.8' testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.8' testImplementation 'org.codehaus.groovy:groovy-all:2.4.16' + testImplementation 'org.hamcrest:hamcrest:2.1' testImplementation 'org.hamcrest:hamcrest-library:2.1' testImplementation 'org.mockito:mockito-core:2.23.4' testImplementation 'org.slf4j:jcl-over-slf4j:1.7.22' diff --git a/browserup-proxy-rest/build.gradle b/browserup-proxy-rest/build.gradle index abe3b54d2..638f6e1e9 100644 --- a/browserup-proxy-rest/build.gradle +++ b/browserup-proxy-rest/build.gradle @@ -79,6 +79,7 @@ dependencies { testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2' testImplementation 'org.codehaus.groovy:groovy-all:2.4.16' testImplementation 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1' + testImplementation 'org.hamcrest:hamcrest:2.1' testImplementation 'org.hamcrest:hamcrest-library:2.1' testImplementation 'org.mock-server:mockserver-netty:3.10.8' testImplementation 'org.mockito:mockito-core:2.23.4'