From 14d62e2ef1617a52e6fafad39aa0bc5052344780 Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Sun, 5 Nov 2023 21:06:22 +0100 Subject: [PATCH 1/3] upgrade log4j from 2.20.0 to 2.21.1 Signed-off-by: Manfred Hanke --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ed10ceac3..8e0a9c465 100644 --- a/build.gradle +++ b/build.gradle @@ -47,9 +47,9 @@ ext { } }, slf4j : [group: 'org.slf4j', name: 'slf4j-api', version: '2.0.9'], - log4j_api : [group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.20.0'], - log4j_core : [group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.20.0'], - log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.20.0'], + log4j_api : [group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.21.1'], + log4j_core : [group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.21.1'], + log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.21.1'], junit4 : [group: 'junit', name: 'junit', version: '4.13.2'], junit5JupiterApi : [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'], From dd965e29fcae70f061902ea59302a4b1e2a5dcdd Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Sun, 5 Nov 2023 20:52:51 +0100 Subject: [PATCH 2/3] upgrade junit-{platform/jupiter} from {1/5}.10.0 to {1/5}.10.1 Signed-off-by: Manfred Hanke --- build.gradle | 12 ++++++------ .../release_check/archunit-junit5-engine-api.pom | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 8e0a9c465..56183e34b 100644 --- a/build.gradle +++ b/build.gradle @@ -52,12 +52,12 @@ ext { log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.21.1'], junit4 : [group: 'junit', name: 'junit', version: '4.13.2'], - junit5JupiterApi : [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'], - junit5JupiterEngine : [group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'], - junit5VintageEngine : [group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.10.0'], - junitPlatform : [group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.10.0'], - junitPlatformCommons: [group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.0'], - junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.10.0'], + junit5JupiterApi : [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.1'], + junit5JupiterEngine : [group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.1'], + junit5VintageEngine : [group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.10.1'], + junitPlatform : [group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.10.1'], + junitPlatformCommons: [group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.1'], + junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.10.1'], 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.6.1'], 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 2966b6f95..3072d915d 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.0 + 1.10.1 compile From 7db3cc5a9e12973f497b286a44007dba61a04300 Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Sun, 5 Nov 2023 21:35:17 +0100 Subject: [PATCH 3/3] remove unused spotbugs configuration The configuration for the SpotBugs engine currently picked up `com.github.spotbugs:spotbugs:4.7.3`, in spite of our attempt to explicitly configure `com.github.spotbugs:spotbugs:4.5.2`, see `gradlew dependencies --configuration spotbugs`. Signed-off-by: Manfred Hanke --- .../groovy/archunit.java-code-quality-conventions.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/buildSrc/src/main/groovy/archunit.java-code-quality-conventions.gradle b/buildSrc/src/main/groovy/archunit.java-code-quality-conventions.gradle index daf78485e..6fee7b472 100644 --- a/buildSrc/src/main/groovy/archunit.java-code-quality-conventions.gradle +++ b/buildSrc/src/main/groovy/archunit.java-code-quality-conventions.gradle @@ -3,13 +3,7 @@ plugins { id 'com.diffplug.spotless' } -dependencies { - spotbugs "com.github.spotbugs:spotbugs:${spotbugs.toolVersion.get()}" -} - spotbugs { - toolVersion = '4.5.2' - excludeFilter = rootProject.file('buildSrc/src/main/resources/code_quality/spotbugs-excludes.xml') }