Merge pull request #317 from asolntsev/upgrade-dependencies

Upgrade dependencies

Author: ericbeland

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

@@ -58,7 +58,7 @@ uploadArchives {
 
 dependencies {
     api "io.netty:netty-codec:${nettyVersion}"
-    api('xyz.rogfam:littleproxy:2.0.1') {
+    api("xyz.rogfam:littleproxy:${littleProxyVersion}") {
         exclude(group: 'io.netty', module: 'netty-all')
     }
 
@@ -70,7 +70,7 @@ dependencies {
     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}"
@@ -99,4 +99,3 @@ dependencies {
     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}"
@@ -66,7 +66,7 @@ dependencies {
     implementation "io.netty:netty-codec:${nettyVersion}"
     implementation "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
     implementation "org.slf4j:slf4j-api:${slf4jVersion}"
-    implementation('xyz.rogfam:littleproxy:2.0.1') {
+    implementation("xyz.rogfam:littleproxy:${littleProxyVersion}") {
         exclude(group: 'io.netty', module: 'netty-all')
     }
 

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,6 +100,7 @@ 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.6.28'
     testImplementation 'org.seleniumhq.selenium:selenium-api:3.4.0'
     testImplementation 'org.awaitility:awaitility:4.0.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}"
     }
 }
 
@@ -40,7 +40,9 @@ subprojects {
         jettyVersion = '9.4.35.v20201120'
         log4jVersion = '2.14.0'
         nettyVersion = '4.1.54.Final'
+        littleProxyVersion = '2.0.1'
         slf4jVersion = '1.7.30'
+        guavaVersion = '30.0-jre'
     }
 
     repositories {

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell