Skip to content
This repository was archived by the owner on Jan 23, 2026. It is now read-only.

Commit aa4a160

Browse files
vyvy
authored
Merge branch 'main' into feature/scala-logging-context-cleanup
2 parents 41e9329 + 17927ec commit aa4a160

20 files changed

Lines changed: 73 additions & 124 deletions

‎.github/dependabot.yaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ updates:
2828
- package-ecosystem: maven
2929
directory: "/"
3030
schedule:
31-
interval: daily
32-
open-pull-requests-limit: 10
31+
interval: monthly
32+
groups:
33+
dependencies:
34+
patterns: [ "*" ]
3335
registries:
3436
- maven-central
3537
ignore:
@@ -48,9 +50,15 @@ updates:
4850
- package-ecosystem: github-actions
4951
directory: "/"
5052
schedule:
51-
interval: weekly
53+
interval: monthly
54+
groups:
55+
dependencies:
56+
patterns: [ "*" ]
5257

5358
- package-ecosystem: npm
5459
directory: "/"
5560
schedule:
56-
interval: daily
61+
interval: monthly
62+
groups:
63+
dependencies:
64+
patterns: [ "*" ]

‎.github/generate-email.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ stderr() {
2828

2929
fail_for_invalid_args() {
3030
stderr "Invalid arguments!"
31-
stderr "Expected arguments: <vote|announce> <version> <commitId>"
31+
stderr "Expected arguments: <vote|announce> <version> <commitId> <nexusUrl>"
3232
exit 1
3333
}
3434

3535
# Check arguments
36-
[ $# -ne 3 ] && fail_for_invalid_args
36+
[ $# -ne 4 ] && fail_for_invalid_args
3737

3838
# Constants
3939
PROJECT_NAME="Apache Log4j Scala"
@@ -43,6 +43,7 @@ PROJECT_STAGING_SITE="${PROJECT_SITE/apache.org/staged.apache.org}"
4343
PROJECT_REPO="https://github.com/apache/logging-log4j-scala"
4444
PROJECT_VERSION="$2"
4545
COMMIT_ID="$3"
46+
NEXUS_URL="$4"
4647
PROJECT_DIST_URL="https://dist.apache.org/repos/dist/dev/logging/$PROJECT_ID/$PROJECT_VERSION"
4748

4849
# Check release notes file
@@ -54,8 +55,8 @@ RELEASE_NOTES_FILE="$SCRIPT_DIR/../target/generated-site/antora/modules/ROOT/pag
5455

5556
dump_release_notes() {
5657
awk "f{print} /^Release date::/{f=1}" "$RELEASE_NOTES_FILE" \
57-
| sed -r -e 's|'$PROJECT_REPO'/(issues|pull)/[0-9]+\[([0-9]+)\]|#\2|g
58-
s|https://github.com/([^/]+)/([^/]+)/(pull|issues)/([0-9]+)\[(\1/\2#\4)\]|\5|g'
58+
| sed -r -e 's!'$PROJECT_REPO'/(issues|pull)/[0-9]+\[([0-9]+)\]!#\2!g
59+
s!https://github.com/([^/]+)/([^/]+)/(pull|issues)/([0-9]+)\[(\1/\2#\4)\]!\5!g'
5960
}
6061

6162
case $1 in
@@ -71,7 +72,7 @@ Website: $PROJECT_STAGING_SITE-$PROJECT_VERSION
7172
GitHub: $PROJECT_REPO
7273
Commit: $COMMIT_ID
7374
Distribution: $PROJECT_DIST_URL
74-
Nexus: https://repository.apache.org/content/repositories/orgapachelogging-<FIXME>
75+
Nexus: $NEXUS_URL
7576
Signing key: 0x077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0
7677
Review kit: https://s.apache.org/logging-parent-release-review-kit
7778

‎.github/workflows/build.yaml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,14 @@ on:
2222
branches:
2323
- "main"
2424
- "release/*"
25-
paths-ignore:
26-
- "**.adoc"
27-
- "**.md"
28-
- "**.txt"
2925
pull_request:
30-
paths-ignore:
31-
- "**.adoc"
32-
- "**.md"
33-
- "**.txt"
3426

3527
permissions: read-all
3628

3729
jobs:
3830

3931
build:
40-
if: github.actor != 'dependabot[bot]'
41-
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.3.0
32+
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1
4233
with:
4334
java-version: |
4435
8
@@ -48,7 +39,7 @@ jobs:
4839
deploy-snapshot:
4940
needs: build
5041
if: github.repository == 'apache/logging-log4j-scala' && github.ref_name == 'main'
51-
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.0.0
42+
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.1.1
5243
# Secrets for deployments
5344
secrets:
5445
NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
@@ -61,7 +52,7 @@ jobs:
6152
deploy-release:
6253
needs: build
6354
if: github.repository == 'apache/logging-log4j-scala' && startsWith(github.ref_name, 'release/')
64-
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.0.0
55+
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.1.1
6556
# Secrets for deployments
6657
secrets:
6758
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
@@ -31,7 +31,7 @@ permissions: read-all
3131
jobs:
3232

3333
analyze:
34-
uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/11.3.0
34+
uses: apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.1
3535
with:
3636
java-version: |
3737
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-log4j-scala' && 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.1.1
3737
# Secrets for committing the generated site
3838
secrets:
3939
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -50,7 +50,7 @@ jobs:
5050

5151
deploy-site-pro:
5252
if: github.repository == 'apache/logging-log4j-scala' && github.ref_name == 'main-site-pro'
53-
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
53+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1
5454
# Secrets for committing the generated site
5555
secrets:
5656
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -79,7 +79,7 @@ jobs:
7979
8080
deploy-site-rel:
8181
needs: export-version
82-
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.3.0
82+
uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1
8383
# Secrets for committing the generated site
8484
secrets:
8585
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}

‎.github/workflows/merge-dependabot.yaml‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎.mvn/jvm.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
1212
--add-opens java.base/sun.nio.ch=ALL-UNNAMED
1313
--add-opens java.base/java.io=ALL-UNNAMED
14+
-Dfile.encoding=UTF-8

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionSha512Sum=8beac8d11ef208f1e2a8df0682b9448a9a363d2ad13ca74af43705549e72e74c9378823bf689287801cbbfc2f6ea9596201d19ccacfdfb682ee8a2ff4c4418ba
18-
distributionType=script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
20-
wrapperSha256Sum=3d8f20ce6103913be8b52aef6d994e0c54705fb527324ceb9b835b338739c7a8
21-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
22-
wrapperVersion=3.3.2
17+
distributionSha256Sum=305773a68d6ddfd413df58c82b3f8050e89778e777f3a745c8e5b8cbea4018ef
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
20+
wrapperVersion=3.3.4

‎antora-playbook.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ runtime:
3434
failure_level: warn
3535

3636
asciidoc:
37+
attributes:
38+
tabs-sync-option: true
39+
# Force Kroki to download images at build time
40+
kroki-fetch-diagram: true
3741
extensions:
3842
- "@asciidoctor/tabs"
3943

‎log4j-api-scala_2.12/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<properties>
3232
<scala.version.group>2.12</scala.version.group>
33-
<scala.version>${scala.version.group}.19</scala.version>
33+
<scala.version>${scala.version.group}.21</scala.version>
3434
</properties>
3535

3636
<dependencies>

0 commit comments

Comments
 (0)