This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch feat/update-default-to-2.25.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit afa140aeb5f843c0e9d01be224942d822bc7ccec Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sat Jun 21 16:44:52 2025 +0200 Upgrade defaults to `2.25.0` and `2.26.0-SNAPSHOT` This PR updates the default Log4j versions used in the project: * **Examples now default to `2.25.0`**, the latest stable release. This ensures that users trying out the samples work with a well-tested, production-ready version. * **CI workflows now use `2.26.0-SNAPSHOT`**, allowing us to verify fixes that have already been applied in snapshot builds. This helps catch regressions and confirm that known issues in `2.25.0` have been addressed. --- .github/dependabot.yaml | 2 ++ .github/workflows/integration-test.yaml | 5 +---- log4j-samples-graalvm/pom.xml | 2 +- log4j-samples-gradle-metadata/build.gradle | 2 +- pom.xml | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 237678b..4686f18 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -39,6 +39,7 @@ updates: - maven-central ignore: - dependency-name: "org.apache.logging.log4j:*" + versions: ["[3,)"] - package-ecosystem: gradle directories: @@ -53,6 +54,7 @@ updates: - maven-central ignore: - dependency-name: "org.apache.logging.log4j:*" + versions: ["[3,)"] - package-ecosystem: github-actions directory: "/" diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index b06b88d..1b9a900 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -24,7 +24,7 @@ on: description: Version of Log4j Core type: string # Should point to the current 2.x snapshot version - default: 2.25.0-SNAPSHOT + default: 2.26.0-SNAPSHOT log4j-repository-url: description: Staging Maven repository. Should be empty for snapshots. type: string @@ -47,9 +47,6 @@ on: type: string default: 'refs/heads/main' -env: - MAVEN_ARGS: ${{ inputs.log4j-version }} - permissions: read-all jobs: diff --git a/log4j-samples-graalvm/pom.xml b/log4j-samples-graalvm/pom.xml index d879559..0d841d0 100644 --- a/log4j-samples-graalvm/pom.xml +++ b/log4j-samples-graalvm/pom.xml @@ -36,7 +36,7 @@ ~ Set to latest stable 2.x release for users. ~ Our workflows override this. --> - <log4j.version>2.24.3</log4j.version> + <log4j.version>2.25.0</log4j.version> <!-- Some samples require JDK 9+ --> <minimalJavaBuildVersion>17</minimalJavaBuildVersion> diff --git a/log4j-samples-gradle-metadata/build.gradle b/log4j-samples-gradle-metadata/build.gradle index 0e3401c..b4b40eb 100644 --- a/log4j-samples-gradle-metadata/build.gradle +++ b/log4j-samples-gradle-metadata/build.gradle @@ -18,7 +18,7 @@ plugins { id("application") } -def log4jVersion = providers.environmentVariable("LOG4J_VERSION").getOrElse("2.+") +def log4jVersion = providers.environmentVariable("LOG4J_VERSION").getOrElse("2.25.0") application { mainModule = "org.example.log4j.metadata" diff --git a/pom.xml b/pom.xml index e5a5ad4..261d0a4 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ ~ Set to latest stable 2.x release for users. ~ Our workflows override this. --> - <log4j.version>2.24.3</log4j.version> + <log4j.version>2.25.0</log4j.version> <!-- Some samples require JDK 17+ --> <minimalJavaBuildVersion>17</minimalJavaBuildVersion>
