Skip to content

Commit 09b14de

Browse files
authored
Upgrade defaults to 2.25.0 and 2.26.0-SNAPSHOT (#338)
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.
1 parent 1f751fe commit 09b14de

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

.github/dependabot.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ updates:
3939
- maven-central
4040
ignore:
4141
- dependency-name: "org.apache.logging.log4j:*"
42+
versions: ["[3,)"]
4243

4344
- package-ecosystem: gradle
4445
directories:
@@ -53,6 +54,7 @@ updates:
5354
- maven-central
5455
ignore:
5556
- dependency-name: "org.apache.logging.log4j:*"
57+
versions: ["[3,)"]
5658

5759
- package-ecosystem: github-actions
5860
directory: "/"

.github/workflows/integration-test.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
description: Version of Log4j Core
2525
type: string
2626
# Should point to the current 2.x snapshot version
27-
default: 2.25.0-SNAPSHOT
27+
default: 2.26.0-SNAPSHOT
2828
log4j-repository-url:
2929
description: Staging Maven repository. Should be empty for snapshots.
3030
type: string
@@ -47,9 +47,6 @@ on:
4747
type: string
4848
default: 'refs/heads/main'
4949

50-
env:
51-
MAVEN_ARGS: ${{ inputs.log4j-version }}
52-
5350
permissions: read-all
5451

5552
jobs:

log4j-samples-graalvm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
~ Set to latest stable 2.x release for users.
3737
~ Our workflows override this.
3838
-->
39-
<log4j.version>2.24.3</log4j.version>
39+
<log4j.version>2.25.0</log4j.version>
4040

4141
<!-- Some samples require JDK 9+ -->
4242
<minimalJavaBuildVersion>17</minimalJavaBuildVersion>

log4j-samples-gradle-metadata/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id("application")
1919
}
2020

21-
def log4jVersion = providers.environmentVariable("LOG4J_VERSION").getOrElse("2.+")
21+
def log4jVersion = providers.environmentVariable("LOG4J_VERSION").getOrElse("2.25.0")
2222

2323
application {
2424
mainModule = "org.example.log4j.metadata"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
~ Set to latest stable 2.x release for users.
6464
~ Our workflows override this.
6565
-->
66-
<log4j.version>2.24.3</log4j.version>
66+
<log4j.version>2.25.0</log4j.version>
6767

6868
<!-- Some samples require JDK 17+ -->
6969
<minimalJavaBuildVersion>17</minimalJavaBuildVersion>

0 commit comments

Comments
 (0)