From 27d7135b89e5d38d19e04d711a5e0284a3460d4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:35:36 +0000 Subject: [PATCH 1/8] Bump org.apache.logging:logging-parent in /log4j-parent Bumps [org.apache.logging:logging-parent](https://github.com/apache/logging-parent) from 11.3.0 to 12.0.0. - [Release notes](https://github.com/apache/logging-parent/releases) - [Commits](https://github.com/apache/logging-parent/compare/rel/11.3.0...rel/12.0.0) --- updated-dependencies: - dependency-name: org.apache.logging:logging-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bcc6f1b9c75..1879f48cd8f 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.logging logging-parent - 11.3.0 + 12.0.0 From 26b90838177ca624589f554cac1441396f28d3fa Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Tue, 18 Feb 2025 20:46:48 +0100 Subject: [PATCH 2/8] Bump workflows to `12.0.0` --- .github/workflows/build.yaml | 6 +++--- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-site.yaml | 6 +++--- .github/workflows/merge-dependabot.yaml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ac7d6128ffc..93ea6c97127 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.GE_ACCESS_TOKEN }} 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 4e35def4b67..c335d21395b 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.GE_ACCESS_TOKEN }} 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: From 3e7afedd6eda81400499738009759842c3eae97b Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Tue, 18 Feb 2025 20:55:45 +0100 Subject: [PATCH 3/8] Add missing annotation versions --- log4j-parent/pom.xml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index c429feaf95a..64c301c72d5 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 @@ -107,6 +108,7 @@ 0.6.0 3.6.0 1.37 + 1.0.0 4.13.2 5.11.4 1.9.1 @@ -125,8 +127,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 +579,12 @@ ${jna.version} + + org.jspecify + jspecify + ${jspecify.version} + + junit junit @@ -829,6 +840,7 @@ biz.aQute.bnd biz.aQute.bnd.annotation + ${bnd.annotation.version} provided @@ -841,19 +853,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 From b499ff133dbb2d7a3517dd677463e6a640bf8d2f Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Tue, 18 Feb 2025 21:33:22 +0100 Subject: [PATCH 4/8] Disable Develocity temporarily --- .mvn/{develocity.xml => develocity-disabled.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .mvn/{develocity.xml => develocity-disabled.xml} (100%) diff --git a/.mvn/develocity.xml b/.mvn/develocity-disabled.xml similarity index 100% rename from .mvn/develocity.xml rename to .mvn/develocity-disabled.xml From 0985858f295717cbdb4b2194b900a430a5841851 Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Tue, 18 Feb 2025 21:42:54 +0100 Subject: [PATCH 5/8] Move `spotless.version` property to BOM It is used in the `java8-tests` profile of the BOM. --- log4j-parent/pom.xml | 1 - pom.xml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index 64c301c72d5..e4c37d243e3 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -108,7 +108,6 @@ 0.6.0 3.6.0 1.37 - 1.0.0 4.13.2 5.11.4 1.9.1 diff --git a/pom.xml b/pom.xml index 8b19cafe1c9..177b0531d2c 100644 --- a/pom.xml +++ b/pom.xml @@ -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 From 0e02a7227b76c47407014ed3cc076db6aa6d5db9 Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Tue, 18 Feb 2025 21:43:44 +0100 Subject: [PATCH 6/8] Revert "Disable Develocity temporarily" This reverts commit b499ff133dbb2d7a3517dd677463e6a640bf8d2f. --- .mvn/{develocity-disabled.xml => develocity.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .mvn/{develocity-disabled.xml => develocity.xml} (100%) diff --git a/.mvn/develocity-disabled.xml b/.mvn/develocity.xml similarity index 100% rename from .mvn/develocity-disabled.xml rename to .mvn/develocity.xml From da462382b185b91db6eac59c1f87be8a68bb61ec Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Tue, 18 Feb 2025 21:53:00 +0100 Subject: [PATCH 7/8] Patch Error Prone configuration --- log4j-parent/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index e4c37d243e3..d72e426442c 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -991,6 +991,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + --should-stop=ifError=FLOW + + + + From c1d5ecab8741f29284b5a7b52388d9d2cce78265 Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Tue, 18 Feb 2025 21:54:24 +0100 Subject: [PATCH 8/8] Add changelog --- .../.2.x.x/update_org_apache_logging_logging_parent.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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`