Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dependencies #8383

Merged
merged 6 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Next release will introduce a breaking change to Teku's metrics. This is due to some metrics changing names after a library upgrade.
We recommend all users of the `Teku - Detailed` dashboard to upgrade to version [Revision 12](https://grafana.com/api/dashboards/16737/revisions/12/download)
as soon as possible. Documentation with all metrics that have been renamed will be provided.
- Next release will require Java 21. The current release is compatible, please consider upgrading before the next release.

## Current Releases

Expand All @@ -24,6 +25,7 @@ the [releases page](https://github.com/Consensys/teku/releases).
- Docker images are now based on ubuntu 24.04 LTS (noble)
- The `teku vc` subcommand fails when no validator key source is provided. In order to run a validator client, one of the following options must be set:
`--validator-keys`, `--validators-external-signer-url` or `--validator-api-enabled`
- Updated dependencies.

### Bug Fixes
- Fixed performance degradation introduced in 24.4.0 regarding archive state retrieval time.
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ buildscript {
plugins {
id 'com.diffplug.spotless' version '6.25.0'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'com.github.jk1.dependency-license-report' version '2.7'
id 'io.spring.dependency-management' version '1.1.4'
id 'net.ltgt.errorprone' version '3.1.0' apply false
id 'com.github.jk1.dependency-license-report' version '2.8'
id 'io.spring.dependency-management' version '1.1.5'
id 'net.ltgt.errorprone' version '4.0.0' apply false
id 'de.undercouch.download' version '5.6.0'
id 'org.ajoberstar.grgit' version '5.2.2'
}
Expand Down
44 changes: 22 additions & 22 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencyManagement {
dependencies {
dependency 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.0'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.17.0'
dependency 'com.fasterxml.jackson.module:jackson-module-kotlin:2.17.0'
dependency 'com.fasterxml.jackson.core:jackson-databind:2.17.1'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.1'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.17.1'
dependency 'com.fasterxml.jackson.module:jackson-module-kotlin:2.17.1'

dependencySet(group: 'com.google.errorprone', version: '2.26.1') {
entry 'error_prone_annotation'
Expand All @@ -25,52 +25,52 @@ dependencyManagement {
entry 'mockwebserver'
}

dependency 'info.picocli:picocli:4.7.5'
dependency 'info.picocli:picocli:4.7.6'

dependencySet(group: 'io.javalin', version: '6.1.3') {
dependencySet(group: 'io.javalin', version: '6.1.6') {
entry 'javalin'
entry 'javalin-rendering'
}

dependency 'io.libp2p:jvm-libp2p:1.1.0-RELEASE'
dependency 'io.libp2p:jvm-libp2p:1.1.1-RELEASE'
dependency 'tech.pegasys:jblst:0.3.11'
dependency 'tech.pegasys:jc-kzg-4844:1.0.0'

dependency 'org.hdrhistogram:HdrHistogram:2.1.12'
dependency 'org.hdrhistogram:HdrHistogram:2.2.2'

dependency 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23'
dependency 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0'

dependency 'org.mock-server:mockserver-junit-jupiter:5.15.0'

dependencySet(group: 'io.swagger.core.v3', version: '2.2.21') {
dependencySet(group: 'io.swagger.core.v3', version: '2.2.22') {
entry 'swagger-parser'
entry 'swagger-core'
entry 'swagger-models'
entry 'swagger-annotations'
}

// On update don't forget to change version in tech.pegasys.teku.infrastructure.restapi.SwaggerUIBuilder
dependency 'org.webjars:swagger-ui:5.17.0'
dependency 'org.webjars:swagger-ui:5.17.14'

dependency 'org.thymeleaf:thymeleaf:3.1.2.RELEASE'
dependency 'io.github.classgraph:classgraph:4.8.172'
dependencySet(group: 'com.github.oshi', version: '6.6.0') {
dependency 'io.github.classgraph:classgraph:4.8.173'
dependencySet(group: 'com.github.oshi', version: '6.6.1') {
entry 'oshi-core'
entry 'oshi-core-java11'
}

dependencySet(group: 'io.netty', version: '4.1.109.Final') {
dependencySet(group: 'io.netty', version: '4.1.111.Final') {
entry 'netty-handler'
entry 'netty-codec-http'
}

dependencySet(group: 'io.vertx', version: '4.5.7') {
dependencySet(group: 'io.vertx', version: '4.5.8') {
entry 'vertx-codegen'
entry 'vertx-core'
entry 'vertx-unit'
entry 'vertx-web'
}
dependency 'io.projectreactor:reactor-core:3.6.5'
dependency 'io.projectreactor:reactor-core:3.6.7'

dependency 'it.unimi.dsi:fastutil:8.5.12'

Expand Down Expand Up @@ -98,7 +98,7 @@ dependencyManagement {

dependency 'org.apiguardian:apiguardian-api:1.1.2'

dependency 'org.assertj:assertj-core:3.25.3'
dependency 'org.assertj:assertj-core:3.26.0'

dependency 'org.awaitility:awaitility:4.2.1'

Expand All @@ -113,7 +113,7 @@ dependencyManagement {
entry 'junit-jupiter-params'
}

dependencySet(group: 'org.mockito', version: '5.11.0') {
dependencySet(group: 'org.mockito', version: '5.12.0') {
entry 'mockito-core'
entry 'mockito-junit-jupiter'
}
Expand All @@ -128,7 +128,7 @@ dependencyManagement {
dependency 'org.fusesource.leveldbjni:leveldbjni-win32:1.8'
dependency 'tech.pegasys:leveldb-native:0.3.1'

dependencySet(group: "org.web3j", version: "4.11.2") {
dependencySet(group: "org.web3j", version: "4.12.0") {
entry 'core'
entry 'abi'
entry 'crypto'
Expand All @@ -150,7 +150,7 @@ dependencyManagement {
entry('plugin-api')
}

dependencySet(group: 'org.testcontainers', version: '1.19.7') {
dependencySet(group: 'org.testcontainers', version: '1.19.8') {
entry "testcontainers"
entry "junit-jupiter"
}
Expand All @@ -163,7 +163,7 @@ dependencyManagement {
exclude 'org.apache.tuweni:units'
}

dependencySet(group: 'org.jupnp', version: '3.0.1') {
dependencySet(group: 'org.jupnp', version: '3.0.2') {
entry "org.jupnp"
entry "org.jupnp.support"
}
Expand All @@ -174,6 +174,6 @@ dependencyManagement {
entry 'jjwt-jackson'
}

dependency 'net.jqwik:jqwik:1.8.4'
dependency 'net.jqwik:jqwik:1.8.5'
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

public class SwaggerUIBuilder {
// Version here MUST match `swagger-ui` library version
private static final String SWAGGER_UI_VERSION = "5.17.0";
private static final String SWAGGER_UI_VERSION = "5.17.14";

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