From d62be9275bcc7e471768f4f8371fe026058e0cf3 Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Tue, 8 Oct 2024 14:55:15 +0200 Subject: [PATCH 1/2] upgrade ASM to 9.7.1 to support Java 24 / class file major version 68 resolves #1362 Signed-off-by: Manfred Hanke --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 76cbdd507..cfc6a2411 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ ext { googleRelocationPackage = "${thirdPartyRelocationPackage}.com.google" dependency = [ - asm : [group: 'org.ow2.asm', name: 'asm', version: '9.7'], + asm : [group: 'org.ow2.asm', name: 'asm', version: '9.7.1'], guava : [group: 'com.google.guava', name: 'guava', version: '33.1.0-jre'], addGuava : { dependencyHandler -> dependencyHandler(dependency.guava) { From 36f857efdf24eb4887176ae6390a175755ab65cd Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Sun, 13 Oct 2024 10:56:52 +0200 Subject: [PATCH 2/2] upgrade further dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * com.google.guava:guava   33.1.0-jre -> 33.3.1-jre * org.slf4j:slf4j-api   2.0.12 -> 2.0.16 * org.apache.logging.log4j:log4j-{api,core,slf4j2-impl}   2.23.1 -> 2.24.1 * org.junit.jupiter:junit-{jupiter-api,jupiter-engine,vintage-engine}   5.10.2 -> 5.11.2 * org.junit.platform:junit-platform-{runner,commons,engine}   1.10.2 -> 1.11.2 for tests: * org.assertj:assertj-{core,guava}   3.25.3 -> 3.26.3 Signed-off-by: Manfred Hanke --- build.gradle | 26 +++++++++---------- .../archunit-junit5-engine-api.pom | 2 +- .../main/resources/release_check/archunit.pom | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index cfc6a2411..e11945dc3 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ ext { dependency = [ asm : [group: 'org.ow2.asm', name: 'asm', version: '9.7.1'], - guava : [group: 'com.google.guava', name: 'guava', version: '33.1.0-jre'], + guava : [group: 'com.google.guava', name: 'guava', version: '33.3.1-jre'], addGuava : { dependencyHandler -> dependencyHandler(dependency.guava) { exclude module: 'listenablefuture' @@ -46,24 +46,24 @@ ext { exclude module: 'j2objc-annotations' } }, - slf4j : [group: 'org.slf4j', name: 'slf4j-api', version: '2.0.12'], - log4j_api : [group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.23.1'], - log4j_core : [group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.23.1'], - log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.23.1'], + slf4j : [group: 'org.slf4j', name: 'slf4j-api', version: '2.0.16'], + log4j_api : [group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.24.1'], + log4j_core : [group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.24.1'], + log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.24.1'], junit4 : [group: 'junit', name: 'junit', version: '4.13.2'], - junit5JupiterApi : [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.2'], - junit5JupiterEngine : [group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.2'], - junit5VintageEngine : [group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.10.2'], - junitPlatform : [group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.10.2'], - junitPlatformCommons: [group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.2'], - junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.10.2'], + junit5JupiterApi : [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.11.2'], + junit5JupiterEngine : [group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.11.2'], + junit5VintageEngine : [group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.11.2'], + junitPlatform : [group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.11.2'], + junitPlatformCommons: [group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.11.2'], + junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.11.2'], hamcrest : [group: 'org.hamcrest', name: 'hamcrest-core', version: '1.3'], junit_dataprovider : [group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.11.0'], mockito : [group: 'org.mockito', name: 'mockito-core', version: '4.11.0'], // mockito 5 requires Java 11 mockito_junit5 : [group: 'org.mockito', name: 'mockito-junit-jupiter', version: '4.6.1'], - assertj : [group: 'org.assertj', name: 'assertj-core', version: '3.25.3'], - assertj_guava : [group: 'org.assertj', name: 'assertj-guava', version: '3.25.3'], + assertj : [group: 'org.assertj', name: 'assertj-core', version: '3.26.3'], + assertj_guava : [group: 'org.assertj', name: 'assertj-guava', version: '3.26.3'], // Dependencies for example projects / tests javaxAnnotationApi : [group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'], diff --git a/buildSrc/src/main/resources/release_check/archunit-junit5-engine-api.pom b/buildSrc/src/main/resources/release_check/archunit-junit5-engine-api.pom index 7fb1f21a5..30f57e3b9 100644 --- a/buildSrc/src/main/resources/release_check/archunit-junit5-engine-api.pom +++ b/buildSrc/src/main/resources/release_check/archunit-junit5-engine-api.pom @@ -46,7 +46,7 @@ org.junit.platform junit-platform-engine - 1.10.2 + 1.11.2 compile diff --git a/buildSrc/src/main/resources/release_check/archunit.pom b/buildSrc/src/main/resources/release_check/archunit.pom index bd3e56ad3..b1d97bce2 100644 --- a/buildSrc/src/main/resources/release_check/archunit.pom +++ b/buildSrc/src/main/resources/release_check/archunit.pom @@ -50,7 +50,7 @@ org.slf4j slf4j-api - 2.0.12 + 2.0.16 compile