Skip to content

Commit 55b799b

Browse files
dependabot[bot]ppkarwasz
dependabot[bot]
and
ppkarwasz
authored
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](apache/logging-parent@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]>
1 parent fef8af8 commit 55b799b

File tree

7 files changed

+39
-13
lines changed

7 files changed

+39
-13
lines changed

‎.github/workflows/build.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
build:
3232
if: github.actor != 'dependabot[bot]'
33-
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.3.0
33+
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.0.0
3434
secrets:
3535
DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.DEVELOCITY_ACCESS_KEY }}
3636
with:
@@ -44,7 +44,7 @@ jobs:
4444
deploy-snapshot:
4545
needs: build
4646
if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x'
47-
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/11.3.0
47+
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.0.0
4848
# Secrets for deployments
4949
secrets:
5050
NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
@@ -57,7 +57,7 @@ jobs:
5757
deploy-release:
5858
needs: build
5959
if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/')
60-
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/11.3.0
60+
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.0.0
6161
# Secrets for deployments
6262
secrets:
6363
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}

‎.github/workflows/codeql-analysis.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ permissions: read-all
3030
jobs:
3131

3232
analyze:
33-
uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/11.3.0
33+
uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.0.0
3434
with:
3535
java-version: |
3636
8

‎.github/workflows/deploy-site.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
deploy-site-stg:
3535
if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x'
36-
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
36+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.0.0
3737
# Secrets for committing the generated site
3838
secrets:
3939
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -51,7 +51,7 @@ jobs:
5151

5252
deploy-site-pro:
5353
if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x-site-pro'
54-
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
54+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.0.0
5555
# Secrets for committing the generated site
5656
secrets:
5757
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -81,7 +81,7 @@ jobs:
8181
8282
deploy-site-rel:
8383
needs: export-version
84-
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
84+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.0.0
8585
# Secrets for committing the generated site
8686
secrets:
8787
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}

‎.github/workflows/merge-dependabot.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
build:
3232
if: github.repository == 'apache/logging-log4j2' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
33-
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.3.0
33+
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.0.0
3434
secrets:
3535
DV_ACCESS_TOKEN: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3636
with:
@@ -42,7 +42,7 @@ jobs:
4242

4343
merge-dependabot:
4444
needs: build
45-
uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/11.3.0
45+
uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/12.0.0
4646
with:
4747
java-version: 17
4848
permissions:

‎log4j-parent/pom.xml

+26-2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<assertj.version>3.27.3</assertj.version>
6767
<awaitility.version>4.2.2</awaitility.version>
6868
<bsh.version>2.0b6</bsh.version>
69+
<bnd.annotation.version>7.1.0</bnd.annotation.version>
6970
<cassandra.version>3.11.18</cassandra.version>
7071
<cassandra-driver.version>3.11.5</cassandra-driver.version>
7172
<commons-codec.version>1.17.1</commons-codec.version>
@@ -125,8 +126,11 @@
125126
<oro.version>2.0.8</oro.version>
126127
<!-- The OSGi API version MUST always be the MINIMUM version Log4j supports: -->
127128
<osgi.api.version>6.0.0</osgi.api.version>
129+
<osgi.annotation.bundle.version>2.0.0</osgi.annotation.bundle.version>
130+
<osgi.annotation.versioning.version>1.1.2</osgi.annotation.versioning.version>
128131
<pax-exam.version>4.14.0</pax-exam.version>
129132
<plexus-utils.version>3.6.0</plexus-utils.version>
133+
<spotbugs-annotations.version>4.9.1</spotbugs-annotations.version>
130134
<spring-boot.version>2.7.18</spring-boot.version>
131135
<spring-framework.version>5.3.39</spring-framework.version>
132136
<system-stubs.version>2.0.3</system-stubs.version>
@@ -574,6 +578,12 @@
574578
<version>${jna.version}</version>
575579
</dependency>
576580

581+
<dependency>
582+
<groupId>org.jspecify</groupId>
583+
<artifactId>jspecify</artifactId>
584+
<version>${jspecify.version}</version>
585+
</dependency>
586+
577587
<dependency>
578588
<groupId>junit</groupId>
579589
<artifactId>junit</artifactId>
@@ -829,6 +839,7 @@
829839
<dependency>
830840
<groupId>biz.aQute.bnd</groupId>
831841
<artifactId>biz.aQute.bnd.annotation</artifactId>
842+
<version>${bnd.annotation.version}</version>
832843
<scope>provided</scope>
833844
</dependency>
834845

@@ -841,19 +852,22 @@
841852

842853
<dependency>
843854
<groupId>org.osgi</groupId>
844-
<artifactId>osgi.annotation</artifactId>
855+
<artifactId>org.osgi.annotation.bundle</artifactId>
856+
<version>${osgi.annotation.bundle.version}</version>
845857
<scope>provided</scope>
846858
</dependency>
847859

848860
<dependency>
849861
<groupId>org.osgi</groupId>
850-
<artifactId>org.osgi.annotation.bundle</artifactId>
862+
<artifactId>org.osgi.annotation.versioning</artifactId>
863+
<version>${osgi.annotation.versioning.version}</version>
851864
<scope>provided</scope>
852865
</dependency>
853866

854867
<dependency>
855868
<groupId>com.github.spotbugs</groupId>
856869
<artifactId>spotbugs-annotations</artifactId>
870+
<version>${spotbugs-annotations.version}</version>
857871
<scope>provided</scope>
858872
</dependency>
859873

@@ -977,6 +991,16 @@
977991
</executions>
978992
</plugin>
979993

994+
<plugin>
995+
<groupId>org.apache.maven.plugins</groupId>
996+
<artifactId>maven-compiler-plugin</artifactId>
997+
<configuration>
998+
<compilerArgs combine.children="append">
999+
<arg>--should-stop=ifError=FLOW</arg>
1000+
</compilerArgs>
1001+
</configuration>
1002+
</plugin>
1003+
9801004
<!--
9811005
~ Some external logging bridges can interfere with our tests, giving false negatives.
9821006
-->

‎pom.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>org.apache.logging</groupId>
3333
<artifactId>logging-parent</artifactId>
34-
<version>11.3.0</version>
34+
<version>12.0.0</version>
3535
<relativePath />
3636
</parent>
3737

@@ -357,6 +357,7 @@
357357
<!-- =====================================================
358358
Direct dependency version properties (in alphabetical order)
359359
===================================================== -->
360+
<jspecify.version>1.0.0</jspecify.version>
360361
<log4j-docgen.version>0.9.0</log4j-docgen.version>
361362
<node.version>21.7.1</node.version>
362363
<npm.version>10.5.0</npm.version>
@@ -993,6 +994,7 @@
993994
<groupId>org.jspecify</groupId>
994995
<artifactId>jspecify</artifactId>
995996
<version>${jspecify.version}</version>
997+
<scope>test</scope>
996998
</dependency>
997999
</dependencies>
9981000

‎src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
xmlns="https://logging.apache.org/xml/ns"
44
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
55
type="updated">
6-
<description format="asciidoc">Update `org.apache.logging:logging-parent` to version `11.3.0`</description>
6+
<description format="asciidoc">Update `org.apache.logging:logging-parent` to version `12.0.0`</description>
77
</entry>

0 commit comments

Comments
 (0)