diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bf3be134349..e4046edb7c3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
build:
if: github.actor != 'dependabot[bot]'
- uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.0.0
secrets:
DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.DEVELOCITY_ACCESS_KEY }}
with:
@@ -44,7 +44,7 @@ jobs:
deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x'
- uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.0.0
# Secrets for deployments
secrets:
NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
@@ -57,7 +57,7 @@ jobs:
deploy-release:
needs: build
if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/')
- uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.0.0
# Secrets for deployments
secrets:
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
index cc2dbcaaf85..05a37e02f99 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -30,7 +30,7 @@ permissions: read-all
jobs:
analyze:
- uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.0.0
with:
java-version: |
8
diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml
index 365b8fc2901..604ac5f63aa 100644
--- a/.github/workflows/deploy-site.yaml
+++ b/.github/workflows/deploy-site.yaml
@@ -33,7 +33,7 @@ jobs:
deploy-site-stg:
if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x'
- uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.0.0
# Secrets for committing the generated site
secrets:
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -51,7 +51,7 @@ jobs:
deploy-site-pro:
if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x-site-pro'
- uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.0.0
# Secrets for committing the generated site
secrets:
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -81,7 +81,7 @@ jobs:
deploy-site-rel:
needs: export-version
- uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.0.0
# Secrets for committing the generated site
secrets:
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
diff --git a/.github/workflows/merge-dependabot.yaml b/.github/workflows/merge-dependabot.yaml
index c81076e1860..cfb0b1d63dd 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,7 +30,7 @@ jobs:
build:
if: github.repository == 'apache/logging-log4j2' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
- uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.0.0
secrets:
DV_ACCESS_TOKEN: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
with:
@@ -42,7 +42,7 @@ jobs:
merge-dependabot:
needs: build
- uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/11.3.0
+ uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/12.0.0
with:
java-version: 17
permissions:
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index c429feaf95a..d72e426442c 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -66,6 +66,7 @@
3.27.3
4.2.2
2.0b6
+ 7.1.0
3.11.18
3.11.5
1.17.1
@@ -125,8 +126,11 @@
2.0.8
6.0.0
+ 2.0.0
+ 1.1.2
4.14.0
3.6.0
+ 4.9.1
2.7.18
5.3.39
2.0.3
@@ -574,6 +578,12 @@
${jna.version}
+
+ org.jspecify
+ jspecify
+ ${jspecify.version}
+
+
junit
junit
@@ -829,6 +839,7 @@
biz.aQute.bnd
biz.aQute.bnd.annotation
+ ${bnd.annotation.version}
provided
@@ -841,19 +852,22 @@
org.osgi
- osgi.annotation
+ org.osgi.annotation.bundle
+ ${osgi.annotation.bundle.version}
provided
org.osgi
- org.osgi.annotation.bundle
+ org.osgi.annotation.versioning
+ ${osgi.annotation.versioning.version}
provided
com.github.spotbugs
spotbugs-annotations
+ ${spotbugs-annotations.version}
provided
@@ -977,6 +991,16 @@
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ --should-stop=ifError=FLOW
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 41283036545..177b0531d2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
org.apache.logging
logging-parent
- 11.3.0
+ 12.0.0
@@ -357,6 +357,7 @@
+ 1.0.0
0.9.0
21.7.1
10.5.0
@@ -993,6 +994,7 @@
org.jspecify
jspecify
${jspecify.version}
+ test
diff --git a/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml
index 5b17082960b..0ea7b563939 100644
--- a/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml
+++ b/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml
@@ -3,5 +3,5 @@
xmlns="https://logging.apache.org/xml/ns"
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
type="updated">
- Update `org.apache.logging:logging-parent` to version `11.3.0`
+ Update `org.apache.logging:logging-parent` to version `12.0.0`