Skip to content

Commit 87d0dc4

Browse files
ppkarwaszppkarwasz
committed
Bump logging-parent to 11.3.0
Also upgrade from Groovy 3 to 4
1 parent 99e4fe0 commit 87d0dc4

File tree

8 files changed

+21
-30
lines changed

8 files changed

+21
-30
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.2.0
33+
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.3.0
3434
secrets:
3535
DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.GE_ACCESS_TOKEN }}
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.2.0
47+
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/11.3.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.2.0
60+
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/11.3.0
6161
# Secrets for deployments
6262
secrets:
6363
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.2.0
33+
uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/11.3.0
3434
with:
3535
java-version: |
3636
8

‎.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 == '2.x'
36-
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.2.0
36+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.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.2.0
54+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.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.2.0
84+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.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.2.0
33+
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.3.0
3434
secrets:
3535
DV_ACCESS_TOKEN: ${{ secrets.GE_ACCESS_TOKEN }}
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.2.0
45+
uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/11.3.0
4646
with:
4747
java-version: 17
4848
permissions:

‎log4j-core-test/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@
174174
<scope>test</scope>
175175
</dependency>
176176
<dependency>
177-
<groupId>org.codehaus.groovy</groupId>
177+
<groupId>org.apache.groovy</groupId>
178178
<artifactId>groovy-dateutil</artifactId>
179179
<scope>test</scope>
180180
</dependency>
181181
<dependency>
182-
<groupId>org.codehaus.groovy</groupId>
182+
<groupId>org.apache.groovy</groupId>
183183
<artifactId>groovy-jsr223</artifactId>
184184
<scope>test</scope>
185185
</dependency>

‎log4j-parent/pom.xml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
5454
<docker-maven-plugin.version>0.45.0</docker-maven-plugin.version>
5555
<exam-maven-plugin.version>4.13.5</exam-maven-plugin.version>
56-
<gmavenplus-plugin.version>3.0.2</gmavenplus-plugin.version>
5756
<maven-taglib-plugin.version>2.4</maven-taglib-plugin.version>
5857
<!-- `surefire.version` property used in `apache.org:apache`: -->
5958
<surefire.version>3.5.0</surefire.version>
@@ -81,7 +80,7 @@
8180
<disruptor.version>3.4.4</disruptor.version>
8281
<embedded-ldap.version>0.9.0</embedded-ldap.version>
8382
<felix.version>7.0.5</felix.version>
84-
<groovy.version>3.0.22</groovy.version>
83+
<groovy.version>4.0.22</groovy.version>
8584
<guava.version>33.3.0-jre</guava.version>
8685
<h2.version>2.2.224</h2.version>
8786
<hamcrest.version>3.0</hamcrest.version>
@@ -177,7 +176,7 @@
177176
<!-- END: Modules that are consumed only internally -->
178177

179178
<dependency>
180-
<groupId>org.codehaus.groovy</groupId>
179+
<groupId>org.apache.groovy</groupId>
181180
<artifactId>groovy-bom</artifactId>
182181
<version>${groovy.version}</version>
183182
<type>pom</type>
@@ -1042,21 +1041,6 @@
10421041
<plugin>
10431042
<groupId>org.codehaus.gmavenplus</groupId>
10441043
<artifactId>gmavenplus-plugin</artifactId>
1045-
<version>${gmavenplus-plugin.version}</version>
1046-
<dependencies>
1047-
<dependency>
1048-
<groupId>org.codehaus.groovy</groupId>
1049-
<artifactId>groovy-ant</artifactId>
1050-
<version>${groovy.version}</version>
1051-
<scope>runtime</scope>
1052-
</dependency>
1053-
<dependency>
1054-
<groupId>org.codehaus.groovy</groupId>
1055-
<artifactId>groovy</artifactId>
1056-
<version>${groovy.version}</version>
1057-
<scope>runtime</scope>
1058-
</dependency>
1059-
</dependencies>
10601044
<executions>
10611045
<execution>
10621046
<id>ban-static-transitive</id>

‎pom.xml‎

Lines changed: 1 addition & 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.2.0</version>
34+
<version>11.3.0</version>
3535
<relativePath />
3636
</parent>
3737

‎src/changelog/.2.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 `11.3.0`</description>
7+
</entry>

0 commit comments

Comments
 (0)