Skip to content

Commit 73b3ab6

Browse files
dependabot[bot]ppkarwasz
dependabot[bot]
and
ppkarwasz
committed
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 c103232 commit 73b3ab6

File tree

7 files changed

+44
-12
lines changed

7 files changed

+44
-12
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 3 additions & 3 deletions
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.GE_ACCESS_TOKEN }}
3636
with:
@@ -41,7 +41,7 @@ jobs:
4141
deploy-snapshot:
4242
needs: build
4343
if: github.repository == 'apache/logging-log4j2' && github.ref_name == 'main'
44-
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/11.3.0
44+
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.0.0
4545
# Secrets for deployments
4646
secrets:
4747
NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
@@ -50,7 +50,7 @@ jobs:
5050
deploy-release:
5151
needs: build
5252
if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/')
53-
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/11.3.0
53+
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.0.0
5454
# Secrets for deployments
5555
secrets:
5656
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}

‎.github/workflows/codeql-analysis.yaml‎

Lines changed: 1 addition & 1 deletion
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: 17
3636
# Permissions required to publish Security Alerts

‎.github/workflows/deploy-site.yaml‎

Lines changed: 3 additions & 3 deletions
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 == 'main'
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 == 'main-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‎

Lines changed: 2 additions & 2 deletions
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.GE_ACCESS_TOKEN }}
3636
with:
@@ -39,7 +39,7 @@ jobs:
3939

4040
merge-dependabot:
4141
needs: build
42-
uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/11.3.0
42+
uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/12.0.0
4343
permissions:
4444
contents: write # to push changelog commits
4545
pull-requests: write # to close the PR

‎log4j-parent/pom.xml‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<assertj.version>3.27.3</assertj.version>
9797
<awaitility.version>4.2.2</awaitility.version>
9898
<bsh.version>2.0b6</bsh.version>
99+
<bnd.annotation.version>7.1.0</bnd.annotation.version>
99100
<commons-codec.version>1.18.0</commons-codec.version>
100101
<commons-csv.version>1.12.0</commons-csv.version>
101102
<commons-dbcp2.version>2.13.0</commons-dbcp2.version>
@@ -132,8 +133,11 @@
132133
<!-- The OSGi API version MUST always be the MINIMUM version Log4j supports -->
133134
<osgi.framework.version>1.10.0</osgi.framework.version>
134135
<osgi.resource.version>1.0.1</osgi.resource.version>
136+
<osgi.annotation.bundle.version>2.0.0</osgi.annotation.bundle.version>
137+
<osgi.annotation.versioning.version>1.1.2</osgi.annotation.versioning.version>
135138
<pax-exam.version>4.14.0</pax-exam.version>
136139
<plexus-utils.version>3.6.0</plexus-utils.version>
140+
<spotbugs-annotations.version>4.9.1</spotbugs-annotations.version>
137141
<system-stubs.version>2.1.7</system-stubs.version>
138142
<velocity.version>1.7</velocity.version>
139143
<xmlunit.version>2.10.0</xmlunit.version>
@@ -392,6 +396,12 @@
392396
<version>${json-unit.version}</version>
393397
</dependency>
394398

399+
<dependency>
400+
<groupId>org.jspecify</groupId>
401+
<artifactId>jspecify</artifactId>
402+
<version>${jspecify.version}</version>
403+
</dependency>
404+
395405
<dependency>
396406
<groupId>junit</groupId>
397407
<artifactId>junit</artifactId>
@@ -554,6 +564,7 @@
554564
<dependency>
555565
<groupId>biz.aQute.bnd</groupId>
556566
<artifactId>biz.aQute.bnd.annotation</artifactId>
567+
<version>${bnd.annotation.version}</version>
557568
<scope>provided</scope>
558569
</dependency>
559570

@@ -573,19 +584,22 @@
573584

574585
<dependency>
575586
<groupId>org.osgi</groupId>
576-
<artifactId>osgi.annotation</artifactId>
587+
<artifactId>org.osgi.annotation.bundle</artifactId>
588+
<version>${osgi.annotation.bundle.version}</version>
577589
<scope>provided</scope>
578590
</dependency>
579591

580592
<dependency>
581593
<groupId>org.osgi</groupId>
582-
<artifactId>org.osgi.annotation.bundle</artifactId>
594+
<artifactId>org.osgi.annotation.versioning</artifactId>
595+
<version>${osgi.annotation.versioning.version}</version>
583596
<scope>provided</scope>
584597
</dependency>
585598

586599
<dependency>
587600
<groupId>com.github.spotbugs</groupId>
588601
<artifactId>spotbugs-annotations</artifactId>
602+
<version>${spotbugs-annotations.version}</version>
589603
<scope>provided</scope>
590604
</dependency>
591605

@@ -645,6 +659,16 @@
645659
</executions>
646660
</plugin>
647661

662+
<plugin>
663+
<groupId>org.apache.maven.plugins</groupId>
664+
<artifactId>maven-compiler-plugin</artifactId>
665+
<configuration>
666+
<compilerArgs combine.children="append">
667+
<arg>--should-stop=ifError=FLOW</arg>
668+
</compilerArgs>
669+
</configuration>
670+
</plugin>
671+
648672
<!--
649673
~ Some external logging bridges can interfere with our tests, giving false negatives.
650674
-->

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
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

@@ -348,6 +348,7 @@
348348
<!-- =====================================================
349349
Direct dependency version properties (in alphabetical order)
350350
===================================================== -->
351+
<jspecify.version>1.0.0</jspecify.version>
351352
<log4j-docgen.version>0.9.0</log4j-docgen.version>
352353
<node.version>21.7.1</node.version>
353354
<npm.version>10.5.0</npm.version>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="https://logging.apache.org/xml/ns"
4+
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
5+
type="updated">
6+
<description format="asciidoc">Update `org.apache.logging:logging-parent` to version `12.0.0`</description>
7+
</entry>

0 commit comments

Comments
 (0)