Skip to content

Commit 3f31a21

Browse files
authored
Dependency sweep (#9683)
1 parent 1081fd2 commit 3f31a21

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ buildscript {
2121
}
2222

2323
plugins {
24-
id 'com.diffplug.spotless' version '7.0.4'
24+
id 'com.diffplug.spotless' version '7.1.0'
2525
id 'com.github.ben-manes.versions' version '0.52.0'
2626
id 'com.github.jk1.dependency-license-report' version '2.9'
2727
id 'io.spring.dependency-management' version '1.1.7'
28-
id 'net.ltgt.errorprone' version '4.2.0' apply false
28+
id 'net.ltgt.errorprone' version '4.3.0' apply false
2929
id 'de.undercouch.download' version '5.6.0'
30-
id 'org.ajoberstar.grgit' version '5.3.0'
30+
id 'org.ajoberstar.grgit' version '5.3.2'
3131
}
3232

3333
rootProject.version = calculatePublishVersion()
@@ -173,6 +173,7 @@ allprojects {
173173
dependencies {
174174
errorprone("com.google.errorprone:error_prone_core")
175175
errorprone("tech.pegasys.tools.epchecks:errorprone-checks")
176+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
176177
}
177178

178179
apply plugin: 'com.diffplug.spotless'

gradle/versions.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencyManagement {
55
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.19.1'
66
dependency 'com.fasterxml.jackson.module:jackson-module-kotlin:2.19.1'
77

8-
dependencySet(group: 'com.google.errorprone', version: '2.39.0') {
8+
dependencySet(group: 'com.google.errorprone', version: '2.40.0') {
99
entry 'error_prone_annotation'
1010
entry 'error_prone_check_api'
1111
entry 'error_prone_core'
@@ -53,27 +53,27 @@ dependencyManagement {
5353
}
5454

5555
// On update don't forget to change version in tech.pegasys.teku.infrastructure.restapi.SwaggerUIBuilder
56-
dependency 'org.webjars:swagger-ui:5.25.2'
56+
dependency 'org.webjars:swagger-ui:5.26.2'
5757

5858
dependency 'org.thymeleaf:thymeleaf:3.1.3.RELEASE'
59-
dependency 'io.github.classgraph:classgraph:4.8.180'
59+
dependency 'io.github.classgraph:classgraph:4.8.181'
6060
dependencySet(group: 'com.github.oshi', version: '6.8.2') {
6161
entry 'oshi-core'
6262
entry 'oshi-core-java11'
6363
}
6464

65-
dependencySet(group: 'io.netty', version: '4.2.2.Final') {
65+
dependencySet(group: 'io.netty', version: '4.2.3.Final') {
6666
entry 'netty-handler'
6767
entry 'netty-codec-http'
6868
}
6969

70-
dependencySet(group: 'io.vertx', version: '4.5.14') {
70+
dependencySet(group: 'io.vertx', version: '4.5.16') {
7171
entry 'vertx-codegen'
7272
entry 'vertx-core'
7373
entry 'vertx-unit'
7474
entry 'vertx-web'
7575
}
76-
dependency 'io.projectreactor:reactor-core:3.7.7'
76+
dependency 'io.projectreactor:reactor-core:3.7.8'
7777

7878
dependency 'it.unimi.dsi:fastutil:8.5.16'
7979

@@ -87,7 +87,7 @@ dependencyManagement {
8787
}
8888

8989
dependency 'org.apache.commons:commons-text:1.13.1'
90-
dependency 'org.apache.commons:commons-lang3:3.17.0'
90+
dependency 'org.apache.commons:commons-lang3:3.18.0'
9191
dependency 'commons-io:commons-io:2.19.0'
9292
dependency 'org.commonjava.mimeparse:mimeparse:0.1.3.3'
9393

@@ -110,7 +110,7 @@ dependencyManagement {
110110
entry 'bcutil-jdk18on' // already used by dependencies, fixes offline building
111111
}
112112

113-
dependencySet(group: 'org.junit.jupiter', version: '5.11.4') {
113+
dependencySet(group: 'org.junit.jupiter', version: '5.13.3') {
114114
entry 'junit-jupiter-api'
115115
entry 'junit-jupiter-engine'
116116
entry 'junit-jupiter-params'
@@ -142,7 +142,7 @@ dependencyManagement {
142142

143143
dependency 'org.xerial.snappy:snappy-java:1.1.10.7'
144144

145-
dependency 'io.prometheus:prometheus-metrics-bom:1.3.8'
145+
dependency 'io.prometheus:prometheus-metrics-bom:1.3.10'
146146

147147
dependencySet(group: 'org.hyperledger.besu.internal', version: '25.6.0') {
148148
entry('metrics-core')
@@ -155,7 +155,7 @@ dependencyManagement {
155155
entry('plugin-api')
156156
}
157157

158-
dependencySet(group: 'org.testcontainers', version: '1.21.2') {
158+
dependencySet(group: 'org.testcontainers', version: '1.21.3') {
159159
entry "testcontainers"
160160
entry "junit-jupiter"
161161
}

gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

infrastructure/restapi/src/main/java/tech/pegasys/teku/infrastructure/restapi/SwaggerUIBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
public class SwaggerUIBuilder {
3232
// Version here MUST match `swagger-ui` library version
33-
private static final String SWAGGER_UI_VERSION = "5.25.2";
33+
private static final String SWAGGER_UI_VERSION = "5.26.2";
3434

3535
private static final String SWAGGER_UI_PATH = "/swagger-ui";
3636
private static final String SWAGGER_HOSTED_PATH = "/webjars/swagger-ui/" + SWAGGER_UI_VERSION;

services/bootnode/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ dependencies {
1313
implementation project(':storage')
1414
implementation project(':storage:api')
1515

16-
testImplementation platform('org.junit:junit-bom:5.12.2')
16+
testImplementation platform('org.junit:junit-bom:5.13.3')
1717
testImplementation 'org.junit.jupiter:junit-jupiter'
1818
}

0 commit comments

Comments
 (0)