Skip to content

Commit 8e1101c

Browse files
authored
Update dependencies (#552)
Dependencies - Armeria 1.3.0 -> 1.4.0 - Guava 2.8.6 -> 2.8.8 - Jackson 2.12.0 -> 2.12.1 - Micrometer 1.6.1 -> 1.6.3 - Spring Boot 2.4.0 -> 2.4.2 Server - Caffeine 2.8.6 -> 2.8.8 - jGit 5.9.0.202009080501-r -> 5.10.0.202012080955-r Build - AssertJ 3.18.1 -> 3.19.0 - Checkstyle 8.38 -> 8.40 - Gradle 6.7.1 -> 6.8.1 - gradle-docker-plugin 6.6.1 -> 6.7.0 - Jmh 1.26 -> 1.27 - Json-unit 2.22.0 -> 2.24.0 - Mochito 3.6.28 -> 3.7.7 - Proguard 7.0.0 -> 7.0.1
1 parent 4ac5e3a commit 8e1101c

File tree

5 files changed

+25
-40
lines changed

5 files changed

+25
-40
lines changed

dependencies.yml

+20-20
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# If its classes are exposed in Javadoc, update offline links as well.
44
#
55
boms:
6-
- com.fasterxml.jackson:jackson-bom:2.12.0
7-
- com.linecorp.armeria:armeria-bom:1.3.0
8-
- io.micrometer:micrometer-bom:1.6.1
6+
- com.fasterxml.jackson:jackson-bom:2.12.1
7+
- com.linecorp.armeria:armeria-bom:1.4.0
8+
- io.micrometer:micrometer-bom:1.6.3
99
- org.junit:junit-bom:5.7.0
1010

1111
ch.qos.logback:
@@ -23,7 +23,7 @@ com.boazj.gradle:
2323
gradle-log-plugin: { version: '0.1.0' }
2424

2525
com.bmuschko:
26-
gradle-docker-plugin: { version: '6.6.1' }
26+
gradle-docker-plugin: { version: '6.7.0' }
2727

2828
com.craigburke.gradle:
2929
client-dependencies: { version: '1.4.1' }
@@ -39,19 +39,19 @@ com.cronutils:
3939
com.fasterxml.jackson.core:
4040
jackson-annotations:
4141
javadocs:
42-
- https://fasterxml.github.io/jackson-annotations/javadoc/2.11/
42+
- https://fasterxml.github.io/jackson-annotations/javadoc/2.12/
4343
jackson-core:
4444
javadocs:
45-
- https://fasterxml.github.io/jackson-core/javadoc/2.11/
45+
- https://fasterxml.github.io/jackson-core/javadoc/2.12/
4646
jackson-databind:
4747
javadocs:
48-
- https://fasterxml.github.io/jackson-databind/javadoc/2.11/
48+
- https://fasterxml.github.io/jackson-databind/javadoc/2.12/
4949

5050
com.github.ben-manes.caffeine:
5151
caffeine:
52-
version: '2.8.6'
52+
version: '2.8.8'
5353
javadocs:
54-
- https://www.javadoc.io/doc/com.github.ben-manes.caffeine/caffeine/2.8.5/
54+
- https://www.javadoc.io/doc/com.github.ben-manes.caffeine/caffeine/2.8.8/
5555

5656
com.github.jengelman.gradle.plugins:
5757
shadow: { version: '6.1.0' }
@@ -64,7 +64,7 @@ com.google.code.findbugs:
6464

6565
com.google.guava:
6666
guava:
67-
version: &GUAVA_VERSION '30.0-jre'
67+
version: &GUAVA_VERSION '30.1-jre'
6868
exclusions:
6969
- com.google.errorprone:error_prone_annotations
7070
- com.google.j2objc:j2objc-annotations
@@ -113,7 +113,7 @@ com.linecorp.armeria:
113113
- https://www.javadoc.io/doc/com.linecorp.armeria/armeria-javadoc/1.1.0/
114114

115115
com.puppycrawl.tools:
116-
checkstyle: { version: '8.38' }
116+
checkstyle: { version: '8.40' }
117117

118118
com.spotify:
119119
completable-futures:
@@ -131,10 +131,10 @@ gradle.plugin.net.davidecavestro:
131131
io.micrometer:
132132
micrometer-core:
133133
javadocs:
134-
- https://www.javadoc.io/doc/io.micrometer/micrometer-core/1.5.5/
134+
- https://www.javadoc.io/doc/io.micrometer/micrometer-core/1.6.3/
135135
micrometer-registry-prometheus:
136136
javadocs:
137-
- https://www.javadoc.io/doc/io.micrometer/micrometer-registry-prometheus/1.5.5/
137+
- https://www.javadoc.io/doc/io.micrometer/micrometer-registry-prometheus/1.6.3/
138138

139139
javax.annotation:
140140
javax.annotation-api: { version: '1.3.2' }
@@ -164,11 +164,11 @@ me.champeau.gradle:
164164
jmh-gradle-plugin: { version: '0.5.2' }
165165

166166
net.javacrumbs.json-unit:
167-
json-unit: { version: &JSON_UNIT_VERSION '2.22.0' }
167+
json-unit: { version: &JSON_UNIT_VERSION '2.24.0' }
168168
json-unit-fluent: { version: *JSON_UNIT_VERSION }
169169

170170
com.guardsquare:
171-
proguard-gradle: { version: '7.0.0' }
171+
proguard-gradle: { version: '7.0.1' }
172172

173173
# Ensure that we use the same ZooKeeper version as what Curator depends on.
174174
# See: https://github.com/apache/curator/blob/master/pom.xml
@@ -202,7 +202,7 @@ org.apache.zookeeper:
202202
- org.slf4j:slf4j-log4j12
203203

204204
org.assertj:
205-
assertj-core: { version: '3.18.1' }
205+
assertj-core: { version: '3.19.0' }
206206

207207
org.awaitility:
208208
awaitility: { version: '4.0.3' }
@@ -214,7 +214,7 @@ org.eclipse.jetty.alpn:
214214
alpn-api: { version: '1.1.3.v20160715' }
215215

216216
org.eclipse.jgit:
217-
org.eclipse.jgit: { version: &JGIT_VERSION '5.9.0.202009080501-r' }
217+
org.eclipse.jgit: { version: &JGIT_VERSION '5.10.0.202012080955-r' }
218218
org.eclipse.jgit.ssh.jsch: { version: *JGIT_VERSION }
219219

220220
org.hibernate.validator:
@@ -224,14 +224,14 @@ org.javassist:
224224
javassist: { version: '3.27.0-GA' }
225225

226226
org.mockito:
227-
mockito-core: { version: &MOCKITO_VERSION '3.6.28' }
227+
mockito-core: { version: &MOCKITO_VERSION '3.7.7' }
228228
mockito-junit-jupiter: { version: *MOCKITO_VERSION }
229229

230230
org.mortbay.jetty.alpn:
231231
jetty-alpn-agent: { version: '2.0.10' }
232232

233233
org.openjdk.jmh:
234-
jmh-core: { version: &JMH_VERSION '1.26' }
234+
jmh-core: { version: &JMH_VERSION '1.27' }
235235
jmh-generator-annprocess: { version: *JMH_VERSION }
236236

237237
org.slf4j:
@@ -245,7 +245,7 @@ org.slf4j:
245245

246246
org.springframework.boot:
247247
spring-boot-starter:
248-
version: &SPRING_BOOT_VERSION '2.4.0'
248+
version: &SPRING_BOOT_VERSION '2.4.2'
249249
javadocs:
250250
- https://docs.spring.io/spring/docs/current/javadoc-api/
251251
spring-boot-starter-test: { version: *SPRING_BOOT_VERSION }

gradle/wrapper/gradle-wrapper.jar

293 Bytes
Binary file not shown.
+1-1
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-6.7.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fi
130130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133-
133+
134134
JAVACMD=`cygpath --unix "$JAVACMD"`
135135

136136
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

+3-18
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
4444

4545
echo.
4646
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
5454
set JAVA_HOME=%JAVA_HOME:"=%
5555
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5656

57-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
5858

5959
echo.
6060
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
6464

6565
goto fail
6666

67-
:init
68-
@rem Get command-line arguments, handling Windows variants
69-
70-
if not "%OS%" == "Windows_NT" goto win9xME_args
71-
72-
:win9xME_args
73-
@rem Slurp the command line arguments.
74-
set CMD_LINE_ARGS=
75-
set _SKIP=2
76-
77-
:win9xME_args_slurp
78-
if "x%~1" == "x" goto execute
79-
80-
set CMD_LINE_ARGS=%*
81-
8267
:execute
8368
@rem Setup the command line
8469

8570
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8671

8772

8873
@rem Execute Gradle
89-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
9075

9176
:end
9277
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)