Skip to content
This repository was archived by the owner on Jun 11, 2024. It is now read-only.

Commit 5fab82c

Browse files
dpowelldpowell
committed
Update dependencies. Pin netty
1 parent 62b6e3e commit 5fab82c

File tree

9 files changed

+90
-44
lines changed

9 files changed

+90
-44
lines changed

‎browserup-proxy-core/build.gradle‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ uploadArchives {
5757
}
5858

5959
dependencies {
60-
api 'io.netty:netty-codec:4.1.44.Final'
61-
api 'xyz.rogfam:littleproxy:2.0.0-beta-5'
60+
api "io.netty:netty-codec:${nettyVersion}"
61+
api('xyz.rogfam:littleproxy:2.0.0-beta-5') {
62+
exclude(group: 'io.netty', module: 'netty-all')
63+
}
6264

6365
implementation project(':browserup-proxy-mitm')
6466

@@ -68,14 +70,13 @@ dependencies {
6870
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
6971
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
7072
implementation 'com.google.guava:guava:28.2-jre'
71-
implementation('com.jcraft:jzlib:1.1.3') {
72-
exclude(module: 'netty')
73-
}
74-
implementation 'dnsjava:dnsjava:2.1.9'
73+
implementation 'com.jcraft:jzlib:1.1.3'
74+
implementation 'dnsjava:dnsjava:3.1.0'
75+
implementation "io.netty:netty-all:${nettyVersion}"
7576
implementation "org.bouncycastle:bcpkix-jdk15on:${bcpVersion}"
7677
implementation "org.bouncycastle:bcprov-jdk15on:${bcpVersion}"
7778
implementation 'org.brotli:dec:0.1.2'
78-
implementation 'org.javassist:javassist:3.26.0-GA'
79+
implementation "org.javassist:javassist:${javassistVersion}"
7980
implementation 'org.seleniumhq.selenium:selenium-api:3.141.59'
8081
implementation "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
8182
implementation "org.slf4j:slf4j-api:${slf4jVersion}"

‎browserup-proxy-dist/build.gradle‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,28 @@ dependencies {
6464
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
6565
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
6666
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
67-
implementation 'com.google.inject:guice:4.2.2'
68-
implementation 'com.google.inject.extensions:guice-servlet:4.2.2'
69-
implementation 'com.google.inject.extensions:guice-multibindings:4.2.2'
70-
implementation 'com.google.sitebricks:sitebricks:0.8.11'
67+
implementation "com.google.inject:guice:${guiceVersion}"
68+
implementation "com.google.inject.extensions:guice-servlet:${guiceVersion}"
69+
implementation "com.google.inject.extensions:guice-multibindings:${guiceVersion}"
70+
implementation('com.google.sitebricks:sitebricks:0.8.11') {
71+
exclude(group: 'org.jboss.netty', module: 'netty')
72+
exclude(module: 'validation-api')
73+
}
74+
implementation "io.netty:netty-all:${nettyVersion}"
7175
implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
7276
implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
7377
implementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
7478
implementation "org.eclipse.jetty:jetty-server:${jettyVersion}"
7579
implementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
76-
implementation 'org.javassist:javassist:3.26.0-GA'
80+
implementation "org.javassist:javassist:${javassistVersion}"
7781
}
7882

7983
applicationName = 'browserup-proxy'
8084
mainClassName = 'com.browserup.bup.proxy.Main'
8185

8286
distributions {
8387
main {
84-
baseName = 'browserup-proxy'
88+
distributionBaseName = 'browserup-proxy'
8589
contents {
8690
from '../LICENSE'
8791
from '../README.md'

‎browserup-proxy-mitm/build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,13 @@ dependencies {
6262
implementation "org.bouncycastle:bcpkix-jdk15on:${bcpVersion}"
6363
implementation "org.bouncycastle:bcprov-jdk15on:${bcpVersion}"
6464

65-
implementation 'io.netty:netty-codec:4.1.44.Final'
65+
implementation "io.netty:netty-all:${nettyVersion}"
66+
implementation "io.netty:netty-codec:${nettyVersion}"
6667
implementation "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
6768
implementation "org.slf4j:slf4j-api:${slf4jVersion}"
68-
implementation 'xyz.rogfam:littleproxy:2.0.0-beta-5'
69+
implementation('xyz.rogfam:littleproxy:2.0.0-beta-5') {
70+
exclude(group: 'io.netty', module: 'netty-all')
71+
}
6972

7073
testImplementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
7174
testImplementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"

‎browserup-proxy-rest/build.gradle‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ plugins {
1010
archivesBaseName = 'browserup-proxy-rest'
1111

1212
ext {
13-
jerseyVersion = '2.30.1'
14-
swaggerVersion = '2.1.1'
13+
jerseyVersion = '2.31'
14+
swaggerVersion = '2.1.2'
1515
}
1616

1717
uploadArchives {
@@ -65,17 +65,19 @@ dependencies {
6565
implementation project(':browserup-proxy-core')
6666

6767
implementation 'com.google.guava:guava:28.2-jre'
68-
implementation 'com.google.inject:guice:4.2.2'
69-
implementation 'com.google.inject.extensions:guice-servlet:4.2.2'
70-
implementation 'com.google.inject.extensions:guice-multibindings:4.2.2'
68+
implementation "com.google.inject:guice:${guiceVersion}"
69+
implementation "com.google.inject.extensions:guice-servlet:${guiceVersion}"
70+
implementation "com.google.inject.extensions:guice-multibindings:${guiceVersion}"
7171
implementation('com.google.sitebricks:sitebricks:0.8.11') {
72+
exclude(group: 'org.jboss.netty', module: 'netty')
7273
exclude(module: 'validation-api')
7374
}
75+
implementation "io.netty:netty-all:${nettyVersion}"
7476
implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
7577
implementation "org.eclipse.jetty:jetty-server:${jettyVersion}"
7678
implementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
7779
implementation "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
78-
implementation 'org.apache.commons:commons-lang3:3.9'
80+
implementation 'org.apache.commons:commons-lang3:3.10'
7981

8082
implementation "org.glassfish.jersey.containers:jersey-container-servlet-core:${jerseyVersion}"
8183
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:${jerseyVersion}"

‎build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@ subprojects {
3434

3535
ext {
3636
bcpVersion = '1.64'
37+
guiceVersion = '4.2.3'
3738
jacksonVersion = '2.10.3'
38-
jettyVersion = '9.4.26.v20200117'
39+
javassistVersion = '3.27.0-GA'
40+
jettyVersion = '9.4.27.v20200227'
3941
log4jVersion = '2.13.1'
42+
nettyVersion = '4.1.50.Final'
4043
slf4jVersion = '1.7.30'
4144
}
4245

‎gradle/wrapper/gradle-wrapper.jar‎

3.63 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS='"-Xmx64m"'
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

85+
6986
# Determine the Java command to use to start the JVM.
7087
if [ -n "$JAVA_HOME" ] ; then
7188
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
109126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110127
fi
111128

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
116134
JAVACMD=`cygpath --unix "$JAVACMD"`
117135

118136
# We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
138156
else
139157
eval `echo args$i`="\"$arg\""
140158
fi
141-
i=$((i+1))
159+
i=`expr $i + 1`
142160
done
143161
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154172
esac
155173
fi
156174

@@ -159,14 +177,9 @@ save () {
159177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160178
echo " "
161179
}
162-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
163181

164182
# Collect all arguments for the java command, following the shell quoting and substitution rules
165183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166184

167-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169-
cd "$(dirname "$0")"
170-
fi
171-
172185
exec "$JAVACMD" "$@"

‎gradlew.bat‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
1329
set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
1635
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS="-Xmx64m"
36+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1837

1938
@rem Find java.exe
2039
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
6584

6685
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
6786

87+
6888
@rem Execute Gradle
6989
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
7090

0 commit comments

Comments
 (0)