This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x-site-pro
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 4f5fef0fa981dd7b6035d91170c44d03313f8ff6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Feb 18 22:36:24 2025 +0100
Bump org.apache.logging:logging-parent from 11.3.0 to 12.0.0 in
/log4j-parent (#3452)
* 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] <[email protected]>
* Necessary fixes for `12.0.0` upgrade.
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Piotr P. Karwasz <[email protected]>
---
.github/workflows/build.yaml | 6 +++---
.github/workflows/codeql-analysis.yaml | 2 +-
.github/workflows/deploy-site.yaml | 6 +++---
.github/workflows/merge-dependabot.yaml | 4 ++--
log4j-parent/pom.xml | 34 ++++++++++++++++++++++++++++-----
pom.xml | 4 +++-
6 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ac7d6128ff..93ea6c9712 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 cc2dbcaaf8..05a37e02f9 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 365b8fc290..604ac5f63a 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 4e35def4b6..c335d21395 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:
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index d76674d568..8e4494b475 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -66,7 +66,8 @@
<assertj.version>3.26.3</assertj.version>
<awaitility.version>4.2.2</awaitility.version>
<bsh.version>2.0b6</bsh.version>
- <cassandra.version>3.11.17</cassandra.version>
+ <bnd.annotation.version>7.1.0</bnd.annotation.version>
+ <cassandra.version>3.11.18</cassandra.version>
<cassandra-driver.version>3.11.5</cassandra-driver.version>
<commons-codec.version>1.17.1</commons-codec.version>
<commons-compress.version>1.27.1</commons-compress.version>
@@ -127,8 +128,11 @@
<oro.version>2.0.8</oro.version>
<!-- The OSGi API version MUST always be the MINIMUM version Log4j
supports: -->
<osgi.api.version>6.0.0</osgi.api.version>
- <pax-exam.version>4.13.5</pax-exam.version>
- <plexus-utils.version>3.5.1</plexus-utils.version>
+ <osgi.annotation.bundle.version>2.0.0</osgi.annotation.bundle.version>
+
<osgi.annotation.versioning.version>1.1.2</osgi.annotation.versioning.version>
+ <pax-exam.version>4.14.0</pax-exam.version>
+ <plexus-utils.version>3.6.0</plexus-utils.version>
+ <spotbugs-annotations.version>4.9.1</spotbugs-annotations.version>
<spring-boot.version>2.7.18</spring-boot.version>
<spring-framework.version>5.3.39</spring-framework.version>
<system-stubs.version>2.0.3</system-stubs.version>
@@ -582,6 +586,12 @@
<version>${json-unit.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jspecify</groupId>
+ <artifactId>jspecify</artifactId>
+ <version>${jspecify.version}</version>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -837,6 +847,7 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.annotation</artifactId>
+ <version>${bnd.annotation.version}</version>
<scope>provided</scope>
</dependency>
@@ -849,19 +860,22 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ <version>${osgi.annotation.bundle.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.bundle</artifactId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <version>${osgi.annotation.versioning.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
+ <version>${spotbugs-annotations.version}</version>
<scope>provided</scope>
</dependency>
@@ -985,6 +999,16 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgs combine.children="append">
+ <arg>--should-stop=ifError=FLOW</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+
<!--
~ Some external logging bridges can interfere with our tests, giving
false negatives.
-->
diff --git a/pom.xml b/pom.xml
index 0a26409954..4e36a6dbc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>11.3.0</version>
+ <version>12.0.0</version>
<relativePath />
</parent>
@@ -357,6 +357,7 @@
<!-- =====================================================
Direct dependency version properties (in alphabetical order)
===================================================== -->
+ <jspecify.version>1.0.0</jspecify.version>
<log4j-docgen.version>0.9.0</log4j-docgen.version>
<node.version>21.7.1</node.version>
<npm.version>10.5.0</npm.version>
@@ -993,6 +994,7 @@
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
<version>${jspecify.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
