This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch feat/move-log4j-version in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 53c4fe12816231fb19fca2e5b05f6357b46c7758 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sat Aug 30 19:02:35 2025 +0200 feat: centralize default Log4j version in `gradle.properties` The default Log4j version is now defined in `gradle.properties` instead of being hard-coded in build logic. This makes it easier to update or override the version consistently across the build. --- gradle.properties | 2 +- log4j-samples-android/app/build.gradle | 8 +++----- log4j-samples-gradle-metadata/build.gradle | 4 +--- settings.gradle | 6 ++++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index a715335..5aa3343 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ android.useAndroidX = true # Version of Log4j Core # # Default: last stable 2.x release -log4j.version = 2.24.3 +log4jVersion = 2.25.1 ## # Staging Maven Repository diff --git a/log4j-samples-android/app/build.gradle b/log4j-samples-android/app/build.gradle index fe6f450..a5c148e 100644 --- a/log4j-samples-android/app/build.gradle +++ b/log4j-samples-android/app/build.gradle @@ -49,8 +49,6 @@ android { } } -def log4jVersion = providers.environmentVariable("LOG4J_VERSION").getOrElse("2.+") - dependencies { implementation 'androidx.appcompat:appcompat:1.7.1' @@ -63,9 +61,9 @@ dependencies { androidTestImplementation 'org.assertj:assertj-core:3.27.4' // Log4j - implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4jVersion - implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4jVersion - androidTestImplementation(group: 'org.apache.logging.log4j', name: 'log4j-core-test', version: log4jVersion) { + implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: project.ext.log4jVersion + implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: project.ext.log4jVersion + androidTestImplementation(group: 'org.apache.logging.log4j', name: 'log4j-core-test', version: project.ext.log4jVersion) { exclude group: 'com.google.code.java-allocation-instrumenter' exclude group: 'org.apache.logging.log4j', module: 'log4j-api-test' exclude group: 'org.hamcrest' diff --git a/log4j-samples-gradle-metadata/build.gradle b/log4j-samples-gradle-metadata/build.gradle index a8be180..7586728 100644 --- a/log4j-samples-gradle-metadata/build.gradle +++ b/log4j-samples-gradle-metadata/build.gradle @@ -18,15 +18,13 @@ plugins { id("application") } -def log4jVersion = providers.environmentVariable("LOG4J_VERSION").getOrElse("2.25.0") - application { mainModule = "org.example.log4j.metadata" mainClass = "org.example.App" // see: src/main/java/org/example/App.java } dependencies { - implementation("org.apache.logging.log4j:log4j-api:$log4jVersion") + implementation("org.apache.logging.log4j:log4j-api:${project.ext.log4jVersion}") } tasks.withType(JavaCompile).configureEach { diff --git a/settings.gradle b/settings.gradle index a5ccc36..6c32446 100644 --- a/settings.gradle +++ b/settings.gradle @@ -44,6 +44,12 @@ dependencyResolutionManagement { } } rootProject.name = 'logging-log4j-samples' +def log4jVersion = providers.environmentVariable("LOG4J_VERSION") + .orElse(providers.gradleProperty("log4jVersion")) + .get() +gradle.beforeProject { Project it -> + it.ext.log4jVersion = log4jVersion +} // Android example include ':app'
