Skip to content

Commit 517ce84

Browse files
committed
Upgrade logging-parent to version 11.2.0
1 parent 39dba0a commit 517ce84

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ jobs:
3030

3131
build:
3232
if: github.actor != 'dependabot[bot]'
33-
# Temporary use `develocity` branch
34-
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@develocity
33+
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.2.0
3534
secrets:
3635
DV_ACCESS_TOKEN: ${{ ! startsWith(github.refname, 'release/') && secrets.GE_ACCESS_TOKEN }}
3736
with:
@@ -40,12 +39,12 @@ jobs:
4039
17
4140
site-enabled: true
4241
reproducibility-check-enabled: false
43-
develocity-enabled: true
42+
develocity-enabled: ${{ ! startsWith(github.refname, 'release/') }}
4443

4544
deploy-snapshot:
4645
needs: build
4746
if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x'
48-
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/11.1.0
47+
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/11.2.0
4948
# Secrets for deployments
5049
secrets:
5150
NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
@@ -58,7 +57,7 @@ jobs:
5857
deploy-release:
5958
needs: build
6059
if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/')
61-
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/11.1.0
60+
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/11.2.0
6261
# Secrets for deployments
6362
secrets:
6463
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.1.0
33+
uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/11.2.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@develocity
36+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.2.0
3737
# Secrets for committing the generated site
3838
secrets:
3939
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -53,7 +53,7 @@ jobs:
5353

5454
deploy-site-pro:
5555
if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x-site-pro'
56-
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@develocity
56+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.2.0
5757
# Secrets for committing the generated site
5858
secrets:
5959
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -83,7 +83,7 @@ jobs:
8383
8484
deploy-site-rel:
8585
needs: export-version
86-
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@develocity
86+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.2.0
8787
# Secrets for committing the generated site
8888
secrets:
8989
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
@@ -31,7 +31,7 @@ jobs:
3131
build:
3232
if: github.repository == 'apache/logging-log4j2' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
3333
# Temporary use `develocity` branch
34-
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@develocity
34+
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.2.0
3535
secrets:
3636
DV_ACCESS_TOKEN: ${{ secrets.GE_ACCESS_TOKEN }}
3737
with:
@@ -43,7 +43,7 @@ jobs:
4343

4444
merge-dependabot:
4545
needs: build
46-
uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/11.1.0
46+
uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/11.2.0
4747
with:
4848
java-version: 17
4949
permissions:

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.1.0</version>
34+
<version>11.2.0</version>
3535
<relativePath />
3636
</parent>
3737

0 commit comments

Comments
 (0)