upgrade to Guava:30.0-jre, Netty:4.1.54.Final and other dependencies

Author: asolntsev

README.md

@@ -26,7 +26,7 @@ To use BrowserUp Proxy in your tests or application, add the `browserup-proxy-co
     <dependency>
         <groupId>com.browserup</groupId>
         <artifactId>browserup-proxy-core</artifactId>
-        <version>1.0.0</version>
+        <version>3.0.0</version>
         <scope>test</scope>
     </dependency>
 ```
@@ -343,11 +343,11 @@ When you build the latest code from source, you'll have access to the latest sna
     <dependency>
         <groupId>com.browserup</groupId>
         <artifactId>browserup-proxy-core</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <scope>test</scope>
     </dependency>
 ```
 Or for gradle:
 ```yml
-testImplementation 'com.browserup:browserup-proxy-core:1.0.0-SNAPSHOT'
+testImplementation 'com.browserup:browserup-proxy-core:3.0.0-SNAPSHOT'
 ```

browserup-proxy-core/build.gradle

@@ -66,11 +66,11 @@ dependencies {
 
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
 
-    implementation 'org.awaitility:awaitility:4.0.2'
+    implementation 'org.awaitility:awaitility:4.0.3'
     implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
-    implementation 'com.google.guava:guava:30.0-jre'
+    implementation "com.google.guava:guava:${guavaVersion}"
     implementation 'com.jcraft:jzlib:1.1.3'
     implementation 'dnsjava:dnsjava:3.3.1'
     implementation "io.netty:netty-all:${nettyVersion}"
@@ -94,8 +94,8 @@ dependencies {
     testImplementation "org.eclipse.jetty:jetty-servlets:${jettyVersion}"
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.26.3'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.27.2'
+    testImplementation 'org.mockito:mockito-core:3.6.0'
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }

browserup-proxy-mitm/build.gradle

@@ -57,7 +57,7 @@ uploadArchives {
 }
 
 dependencies {
-    implementation 'com.google.guava:guava:30.0-jre'
+    implementation "com.google.guava:guava:${guavaVersion}"
 
     implementation "org.bouncycastle:bcpkix-jdk15on:${bcpVersion}"
     implementation "org.bouncycastle:bcprov-jdk15on:${bcpVersion}"
@@ -83,5 +83,5 @@ dependencies {
     testImplementation 'org.codehaus.groovy:groovy-all:3.0.6'
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation 'org.mockito:mockito-core:3.6.0'
 }

browserup-proxy-rest/build.gradle

@@ -64,7 +64,7 @@ uploadArchives {
 dependencies {
     implementation project(':browserup-proxy-core')
 
-    implementation 'com.google.guava:guava:30.0-jre'
+    implementation "com.google.guava:guava:${guavaVersion}"
     implementation "com.google.inject:guice:${guiceVersion}"
     implementation "com.google.inject.extensions:guice-servlet:${guiceVersion}"
     implementation "com.google.inject.extensions:guice-multibindings:${guiceVersion}"
@@ -100,8 +100,8 @@ dependencies {
     testImplementation 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.2'
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
-    testImplementation 'org.seleniumhq.selenium:selenium-api:3.4.0'
-    testImplementation 'org.awaitility:awaitility:4.0.2'
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.24.1'
+    testImplementation 'org.mockito:mockito-core:3.6.0'
+    testImplementation 'org.seleniumhq.selenium:selenium-api:3.141.59'
+    testImplementation 'org.awaitility:awaitility:4.0.3'
+    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.27.2'
 }

build.gradle

@@ -17,7 +17,7 @@ configurations.all {
         // conflicts later. BrowserUpDriver _should_ be allowed to use whatever libs it wants.
         //resolutionStrategy.force 'com.google.guava:guava:*', 'com.google.guava:guava:22.0'
         // UPDATE Jan 27, 2019: I forked org.littleshoot.proxy to Browserup and upgraded it to Guava 27.0.1-jre
-        resolutionStrategy.force 'com.google.guava:guava:*', 'com.google.guava:guava:30.0-jre'
+        resolutionStrategy.force 'com.google.guava:guava:*', "com.google.guava:guava:${guavaVersion}"
     }
 }
 
@@ -41,6 +41,7 @@ subprojects {
         log4jVersion = '2.14.0'
         nettyVersion = '4.1.54.Final'
         slf4jVersion = '1.7.30'
+        guavaVersion = '30.0-jre'
     }
 
     repositories {