This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git
The following commit(s) were added to refs/heads/main by this push:
new 2942f3c Upgrade `logging-parent` and migrate to Antora
(apache/logging-log4j2#2443)
2942f3c is described below
commit 2942f3c2b96dd1a95e5ad7c7c42ae28690090ace
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Fri Apr 19 10:51:20 2024 +0200
Upgrade `logging-parent` and migrate to Antora (apache/logging-log4j2#2443)
---
.asf.yaml | 2 +-
.github/dependabot.yaml | 10 +-
.github/generate-email.sh | 28 ++--
.github/workflows/build.yaml | 15 +-
.github/workflows/deploy-site.yaml | 95 ++++++++++++
.github/workflows/merge-dependabot.yaml | 4 +-
.gitignore | 5 +
antora-playbook.yaml | 117 +++++++++++++++
log4j-api-scala_2.12/pom.xml | 2 +-
log4j-api-scala_2.13/pom.xml | 2 +-
log4j-api-scala_3/pom.xml | 2 +-
package.json | 7 +
pom.xml | 2 +-
src/changelog/.13.x.x/.release-notes.adoc.ftl | 2 +-
src/changelog/.13.x.x/antora.xml | 8 +
.../update_org_apache_logging_logging_parent.xml | 7 +
src/changelog/.changelog.adoc.ftl | 3 +-
src/changelog/.index.adoc.ftl | 9 +-
src/changelog/12.0/.release-notes.adoc.ftl | 2 +-
src/changelog/12.0/.release.xml | 22 +--
src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml | 4 +-
src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml | 4 +-
.../12.0/LOG4J2-2293_add-license-files.xml | 4 +-
src/changelog/12.0/LOG4J2-2294_rat-plugin.xml | 4 +-
.../12.0/LOG4J2-2295_add-osgi-descriptor.xml | 4 +-
src/changelog/12.0/LOG4J2-2296_add-site.xml | 4 +-
src/changelog/12.0/LOG4J2-2298_add-changelog.xml | 4 +-
.../LOG4J2-2303_release-distribution-script.xml | 4 +-
src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml | 4 +-
src/changelog/13.0.0/.release-notes.adoc.ftl | 2 +-
src/changelog/13.0.0/.release.xml | 22 +--
src/changelog/13.0.0/LOG4J2-3184_add-scala-3.xml | 4 +-
src/changelog/13.0.0/add-module-support.xml | 20 +--
src/changelog/13.0.0/java-17.xml | 4 +-
src/changelog/13.0.0/switch-to-github-actions.xml | 4 +-
src/changelog/13.0.0/switch-to-maven.xml | 4 +-
src/changelog/13.0.0/switch-to-semver.xml | 4 +-
.../update_org_apache_logging_log4j_log4j_api.xml | 4 +-
.../update_org_apache_logging_logging_parent.xml | 20 +--
src/changelog/13.0.0/use-changelog.xml | 20 +--
src/changelog/13.1.0/.release-notes.adoc.ftl | 2 +-
src/changelog/13.1.0/.release.xml | 22 +--
src/changelog/13.1.0/add-sbom.xml | 20 +--
.../13.1.0/fix-scala-3-macro-inlining.xml | 20 +--
.../update_org_apache_logging_log4j_log4j_bom.xml | 4 +-
.../update_org_apache_logging_logging_parent.xml | 4 +-
src/site/_constants.adoc | 41 ------
src/site/_constants.tmpl.adoc | 41 ------
src/site/_release-notes.adoc | 42 ------
src/site/_release-notes/_12.0.adoc | 57 -------
src/site/_release-notes/_13.0.0.adoc | 60 --------
src/site/_release-notes/_13.1.0.adoc | 55 -------
src/site/_release-notes/_13.x.x.adoc | 47 ------
src/site/antora/antora.tmpl.yml | 49 ++++++
src/site/antora/antora.yml | 49 ++++++
src/site/antora/modules/ROOT/nav.adoc | 22 +++
.../antora/modules/ROOT/pages/development.adoc | 47 ++++++
src/site/antora/modules/ROOT/pages/index.adoc | 90 +++++++++++
.../antora/modules/ROOT/pages/release-notes.adoc | 21 +++
src/site/index.adoc | 164 ---------------------
60 files changed, 614 insertions(+), 731 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 2183dca..d4978f3 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -20,7 +20,7 @@
github:
description: A Scala-friendly interface to log against the Log4j API
- homepage: https://logging.apache.org/log4j/kotlin
+ homepage: https://logging.apache.org/log4j/scala
labels:
- apache
- api
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index d706bf6..41d4b74 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -17,8 +17,7 @@
version: 2
-# Add Maven Central explicitly to work around:
-# https://github.com/dependabot/dependabot-core/issues/8329
+# Fix the Maven Central to the ASF repository to work around:
https://github.com/dependabot/dependabot-core/issues/8329
registries:
maven-central:
type: maven-repository
@@ -36,7 +35,7 @@ updates:
ignore:
# Keep `scala-library` baseline
- dependency-name: "org.scala-lang:scala-library"
- update-types: ["version-update:semver-major"]
+ update-types: ["version-update:semver-major",
"version-update:semver-minor"]
# Keep `scala-reflect` baseline
- dependency-name: "org.scala-lang:scala-reflect"
update-types: ["version-update:semver-major"]
@@ -50,3 +49,8 @@ updates:
directory: "/"
schedule:
interval: weekly
+
+ - package-ecosystem: npm
+ directory: "/"
+ schedule:
+ interval: daily
diff --git a/.github/generate-email.sh b/.github/generate-email.sh
index 311e43f..2024033 100755
--- a/.github/generate-email.sh
+++ b/.github/generate-email.sh
@@ -16,10 +16,6 @@
# limitations under the License.
#
-# Enable strict mode
-set -euo pipefail
-IFS=$'\n\t'
-
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
stderr() {
@@ -45,7 +41,7 @@ PROJECT_VERSION="$2"
COMMIT_ID="$3"
# Check release notes file
-RELEASE_NOTES_FILE="$SCRIPT_DIR/../src/site/_release-notes/_$PROJECT_VERSION.adoc"
+RELEASE_NOTES_FILE="$SCRIPT_DIR/../target/generated-site/antora/modules/ROOT/pages/_release-notes/$PROJECT_VERSION.adoc"
[ -f "$RELEASE_NOTES_FILE" ] || {
stderr "Couldn't find release notes file: $RELEASE_NOTES_FILE"
exit 1
@@ -69,11 +65,11 @@ case $1 in
vote)
cat <<EOF
To: [email protected]
-Title: [VOTE] Release $PROJECT_NAME $PROJECT_VERSION
+Title: [VOTE] Release $PROJECT_NAME \`$PROJECT_VERSION\`
-This is a vote to release the $PROJECT_NAME $PROJECT_VERSION.
+This is a vote to release the $PROJECT_NAME \`$PROJECT_VERSION\`.
-Website: $PROJECT_STAGING_SITE
+Website: $PROJECT_STAGING_SITE-$PROJECT_VERSION
GitHub: $PROJECT_REPO
Commit: $COMMIT_ID
Distribution: $PROJECT_DIST_DIR
@@ -91,35 +87,33 @@ everyone to test the release, but only the Logging Services
PMC
votes are officially counted. At least 3 +1 votes and more
positive than negative votes are required.
-=== Review kit
+== Review kit
The minimum set of steps needed to review the uploaded distribution
files in the Subversion repository can be summarized as follows:
$(dump_review_kit)
-=== Release notes
-
-$(dump_release_notes)
+== Release Notes
EOF
+ dump_release_notes
;;
announce)
cat <<EOF
To: [email protected], [email protected]
-Title: [ANNOUNCE] $PROJECT_NAME $PROJECT_VERSION released
+Title: [ANNOUNCE] $PROJECT_NAME \`$PROJECT_VERSION\` released
-${PROJECT_NAME} team is pleased to announce the $PROJECT_VERSION
+${PROJECT_NAME} team is pleased to announce the \`$PROJECT_VERSION\`
release. This project provides a Scala-friendly interface to log
against the Log4j API. For further information (support, download,
etc.) see the project website[1].
[1] $PROJECT_SITE
-=== Release Notes
-
-$(dump_release_notes)
+== Release Notes
EOF
+ dump_release_notes
;;
*) fail_for_invalid_args
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3968793..7087dd0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,7 +38,7 @@ jobs:
build:
if: github.actor != 'dependabot[bot]'
- uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@rel/10.6.0
+ uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.0.0
with:
java-version: |
8
@@ -48,11 +48,11 @@ jobs:
deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-log4j-scala' && github.ref_name
== 'main'
- uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/10.6.0
+ uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/11.0.0
# Secrets for deployments
secrets:
- NEXUS_USER: ${{ secrets.NEXUS_USER }}
- NEXUS_PW: ${{ secrets.NEXUS_PW }}
+ NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
+ NEXUS_PASSWORD: ${{ secrets.NEXUS_PW }}
with:
java-version: |
8
@@ -61,12 +61,12 @@ jobs:
deploy-release:
needs: build
if: github.repository == 'apache/logging-log4j-scala' &&
startsWith(github.ref_name, 'release/')
- uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/10.6.0
+ uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/11.0.0
# Secrets for deployments
secrets:
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
- LOGGING_STAGE_DEPLOYER_USER: ${{ secrets.LOGGING_STAGE_DEPLOYER_USER }}
- LOGGING_STAGE_DEPLOYER_PW: ${{ secrets.LOGGING_STAGE_DEPLOYER_PW }}
+ NEXUS_USERNAME: ${{ secrets.LOGGING_STAGE_DEPLOYER_USER }}
+ NEXUS_PASSWORD: ${{ secrets.LOGGING_STAGE_DEPLOYER_PW }}
SVN_USERNAME: ${{ secrets.LOGGING_SVN_DEV_USERNAME }}
SVN_PASSWORD: ${{ secrets.LOGGING_SVN_DEV_PASSWORD }}
# Write permissions to allow the Maven `revision` property update,
changelog release, etc.
@@ -74,7 +74,6 @@ jobs:
contents: write
with:
project-id: log4j-scala
- site-enabled: true
java-version: |
8
17
diff --git a/.github/workflows/deploy-site.yaml
b/.github/workflows/deploy-site.yaml
new file mode 100644
index 0000000..6557070
--- /dev/null
+++ b/.github/workflows/deploy-site.yaml
@@ -0,0 +1,95 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: deploy-site
+
+on:
+ push:
+ branches:
+ - "main"
+ - "main-site-pro"
+ - "release/*"
+ paths-ignore:
+ - "**.md"
+ - "**.txt"
+
+permissions: read-all
+
+jobs:
+
+ deploy-site-stg:
+ if: github.repository == 'apache/logging-log4j-scala' && github.ref_name
== 'main'
+ uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.0.0
+ # Secrets for committing the generated site
+ secrets:
+ GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
+ # Write permissions for committing the generated site
+ permissions:
+ contents: write
+ with:
+ asf-yaml-content: |
+ staging:
+ profile: ~
+ whoami: ${{ github.ref_name }}-site-stg-out
+ subdir: content/log4j/scala
+ target-branch: ${{ github.ref_name }}-site-stg-out
+
+ deploy-site-pro:
+ if: github.repository == 'apache/logging-log4j-scala' && github.ref_name
== 'main-site-pro'
+ uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.0.0
+ # Secrets for committing the generated site
+ secrets:
+ GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
+ # Write permissions for committing the generated site
+ permissions:
+ contents: write
+ with:
+ asf-yaml-content: |
+ publish:
+ profile: ~
+ whoami: ${{ github.ref_name }}-out
+ subdir: content/log4j/scala
+ target-branch: ${{ github.ref_name }}-out
+
+ export-version:
+ if: github.repository == 'apache/logging-log4j-scala' &&
startsWith(github.ref_name, 'release/')
+ runs-on: ubuntu-latest
+ outputs:
+ version: ${{ steps.export-version.outputs.version }}
+ steps:
+ - name: Export version
+ id: export-version
+ run: |
+ version=$(echo "${{ github.ref_name }}" | sed 's/^release\///')
+ echo "version=$version" >> "$GITHUB_OUTPUT"
+
+ deploy-site-rel:
+ needs: export-version
+ uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.0.0
+ # Secrets for committing the generated site
+ secrets:
+ GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
+ # Write permissions for committing the generated site
+ permissions:
+ contents: write
+ with:
+ asf-yaml-content: |
+ staging:
+ profile: ~
+ whoami: ${{ github.ref_name }}-site-stg-out
+ subdir: content/log4j/scala-${{ needs.export-version.outputs.version
}}
+ target-branch: ${{ github.ref_name }}-site-stg-out
diff --git a/.github/workflows/merge-dependabot.yaml
b/.github/workflows/merge-dependabot.yaml
index f47d85a..7a324cb 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -30,7 +30,7 @@ jobs:
build:
if: github.repository == 'apache/logging-log4j-scala' && github.event_name
== 'pull_request_target' && github.actor == 'dependabot[bot]'
- uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@rel/10.6.0
+ uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@rel/11.0.0
with:
java-version: |
8
@@ -38,7 +38,7 @@ jobs:
merge-dependabot:
needs: build
- uses:
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/10.6.0
+ uses:
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/11.0.0
permissions:
contents: write # to push
changelog commits
pull-requests: write # to close
the PR
diff --git a/.gitignore b/.gitignore
index feef825..f82af48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,8 @@ velocity.log
felix-cache/
bin/
.bsp/sbt.json
+# Node
+node
+node_modules
+package-lock.json
+
diff --git a/antora-playbook.yaml b/antora-playbook.yaml
new file mode 100644
index 0000000..0522d0c
--- /dev/null
+++ b/antora-playbook.yaml
@@ -0,0 +1,117 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+site:
+ title: Apache Log4j Scala
+ url: "https://logging.apache.org/log4j/scala";
+ start_page: "ROOT::index.adoc"
+
+content:
+ sources:
+ - url: .
+ branches: HEAD
+ start_paths:
+ - target/generated-site/antora
+ edit_url:
+
+asciidoc:
+ extensions:
+ - "@asciidoctor/tabs"
+
+ui:
+
+ bundle:
+ url:
"https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable";
+ snapshot: true
+
+ # Template files:
https://github.com/asciidoctor/asciidoctor-docs-ui/blob/main/src
+ # Template variables: https://docs.antora.org/antora-ui-default/templates
+ supplemental_files:
+
+ # Add `@asciidoctor/tabs` extension styles
+ - path: css/vendor/tabs.css
+ contents: ./node_modules/@asciidoctor/tabs/dist/css/tabs.css
+
+ # Add `@asciidoctor/tabs` extension scripts
+ - path: js/vendor/tabs.js
+ contents: ./node_modules/@asciidoctor/tabs/dist/js/tabs.js
+
+ - path: partials/footer-scripts.hbs
+ contents: |
+ <script id="site-script" src="{{{uiRootPath}}}/js/site.js"
data-ui-root-path="{{{uiRootPath}}}"></script>
+ <script async src="{{{uiRootPath}}}/js/vendor/highlight.js"></script>
+ <!-- `@asciidoctor/tabs` extension scripts -->
+ <script async src="{{{uiRootPath}}}/js/vendor/tabs.js"></script>
+ {{#if env.SITE_SEARCH_PROVIDER}}
+ {{> search-scripts}}
+ {{/if}}
+
+ - path: partials/head-styles.hbs
+ contents: |
+ <link rel="stylesheet" href="{{{uiRootPath}}}/css/site.css">
+ <link rel="icon" href="{{{uiRootPath}}}/../_images/favicon.ico"
type="image/x-icon">
+ <!-- `@asciidoctor/tabs` extension styles -->
+ <link rel="stylesheet" href="{{{uiRootPath}}}/css/vendor/tabs.css">
+ <style>
+ /* `page-toclevels` greater than 4 are not supported by Antora UI,
patching it: */
+ .toc .toc-menu li[data-level="4"] a {
+ padding-left: 2.75rem
+ }
+ /* Replace the default highlight.js color for strings from red to
green: */
+ .hljs-string {
+ color: #0f8532;
+ }
+ </style>
+
+ - path: partials/header-content.hbs
+ contents: |
+ <header class="header">
+ <nav class="navbar">
+ <div class="navbar-brand">
+ <span class="navbar-item title">{{site.title}}</span>
+ </div>
+ <div id="topbar-nav" class="navbar-menu">
+ <div class="navbar-end">
+ <a class="navbar-item" href="https://logging.apache.org";>a
subproject of <strong>Apache Logging Services</strong></a>
+ </div>
+ </div>
+ </nav>
+ </header>
+
+ - path: partials/footer-content.hbs
+ contents: |
+ <footer class="footer">
+ <p>
+ Copyright © 1999-{{{year}}} <a href="https://www.apache.org/";>The
Apache Software Foundation</a>.
+ Licensed under the <a
href="https://www.apache.org/licenses/LICENSE-2.0";>Apache Software License,
Version 2.0</a>.
+ Please read our <a
href="https://privacy.apache.org/policies/privacy-policy-public.html";>privacy
policy</a>.
+ </p>
+ <p>
+ Apache, Log4j, and the Apache feather logo are trademarks or
registered trademarks of The Apache Software Foundation.
+ Oracle and Java are registered trademarks of Oracle and/or its
affiliates.
+ Other names may be trademarks of their respective owners.
+ </p>
+ </footer>
+
+ # Disable component version selector
+ - path: partials/nav-explore.hbs
+ contents: ""
+
+ # Fix the `Edit this page` link
+ - path: partials/edit-this-page.hbs
+ contents: |
+ <div class="edit-this-page"><a
href="https://github.com/apache/logging-log4j-kotlin/edit/main/src/site/antora/modules/{{page.module}}/pages/{{page.relativeSrcPath}}";>Edit
this Page</a></div>
diff --git a/log4j-api-scala_2.12/pom.xml b/log4j-api-scala_2.12/pom.xml
index 8b177ab..2abe786 100644
--- a/log4j-api-scala_2.12/pom.xml
+++ b/log4j-api-scala_2.12/pom.xml
@@ -30,7 +30,7 @@
<properties>
<scala.version.group>2.12</scala.version.group>
- <scala.version>${scala.version.group}.18</scala.version>
+ <scala.version>${scala.version.group}.19</scala.version>
</properties>
<dependencies>
diff --git a/log4j-api-scala_2.13/pom.xml b/log4j-api-scala_2.13/pom.xml
index 3715114..8c67977 100644
--- a/log4j-api-scala_2.13/pom.xml
+++ b/log4j-api-scala_2.13/pom.xml
@@ -30,7 +30,7 @@
<properties>
<scala.version.group>2.13</scala.version.group>
- <scala.version>${scala.version.group}.12</scala.version>
+ <scala.version>${scala.version.group}.13</scala.version>
</properties>
<dependencies>
diff --git a/log4j-api-scala_3/pom.xml b/log4j-api-scala_3/pom.xml
index 1cc031e..7ac18ba 100644
--- a/log4j-api-scala_3/pom.xml
+++ b/log4j-api-scala_3/pom.xml
@@ -30,7 +30,7 @@
<properties>
<scala.version.group>3</scala.version.group>
- <scala.version>3.4.1</scala.version>
+ <scala.version>${scala.version.group}.4.1</scala.version>
</properties>
<dependencies>
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..686f9f3
--- /dev/null
+++ b/package.json
@@ -0,0 +1,7 @@
+{
+ "dependencies": {
+ "@antora/cli": "^3.2.0-alpha.4",
+ "@antora/site-generator-default": "^3.2.0-alpha.4",
+ "@asciidoctor/tabs": "^1.0.0-beta.6"
+ }
+}
diff --git a/pom.xml b/pom.xml
index 952f506..e80eeb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>10.6.0</version>
+ <version>11.0.0</version>
<relativePath />
</parent>
diff --git a/src/changelog/.13.x.x/.release-notes.adoc.ftl
b/src/changelog/.13.x.x/.release-notes.adoc.ftl
index 8ffd747..e5816b3 100644
--- a/src/changelog/.13.x.x/.release-notes.adoc.ftl
+++ b/src/changelog/.13.x.x/.release-notes.adoc.ftl
@@ -34,7 +34,7 @@
////
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
-=== ${release.version}
+== ${release.version}
<#if release.date?has_content>Release date:: ${release.date}</#if>
diff --git a/src/changelog/.13.x.x/antora.xml b/src/changelog/.13.x.x/antora.xml
new file mode 100644
index 0000000..07c73e0
--- /dev/null
+++ b/src/changelog/.13.x.x/antora.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
+ type="changed">
+ <issue id="apache/logging-log4j2#2443"
link="https://github.com/apache/logging-log4j2/pull/2443"/>
+ <description format="asciidoc">Website is migrated to Antora with several
formatting</description>
+</entry>
diff --git a/src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml
b/src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml
new file mode 100644
index 0000000..d674691
--- /dev/null
+++ b/src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
+ type="updated">
+ <description format="asciidoc">Update `org.apache.logging:logging-parent` to
version `11.0.0`</description>
+</entry>
diff --git a/src/changelog/.changelog.adoc.ftl
b/src/changelog/.changelog.adoc.ftl
index ebd41f0..00a9a1a 100644
--- a/src/changelog/.changelog.adoc.ftl
+++ b/src/changelog/.changelog.adoc.ftl
@@ -17,7 +17,8 @@
<#if entriesByType?size gt 0>
<#list entriesByType as entryType, entries>
-==== ${entryType?capitalize}
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-",
"r")}-${entryType?lower_case}]
+=== ${entryType?capitalize}
<#list entries as entry>
* ${entry.description.text?replace("\\s+", " ", "r")}<#if
entry.issues?has_content> (<#list entry.issues as
issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list>)</#if>
diff --git a/src/changelog/.index.adoc.ftl b/src/changelog/.index.adoc.ftl
index 8c4ff21..24c1ef3 100644
--- a/src/changelog/.index.adoc.ftl
+++ b/src/changelog/.index.adoc.ftl
@@ -33,9 +33,12 @@
3. Commit both `.index.adoc.ftl` and the generated `.index.adoc`
////
-[#release-notes]
-== Release Notes
+// Release notes index does not look nice with a deep sectioning, override it:
+:page-toclevels: 1
+[#release-notes]
+= Release notes
<#list releases as release><#if release.changelogEntryCount gt 0>
-include::_release-notes/_${release.version}.adoc[]
+
+include::_release-notes/${release.version}.adoc[]
</#if></#list>
diff --git a/src/changelog/12.0/.release-notes.adoc.ftl
b/src/changelog/12.0/.release-notes.adoc.ftl
index a3c917c..b2e6229 100644
--- a/src/changelog/12.0/.release-notes.adoc.ftl
+++ b/src/changelog/12.0/.release-notes.adoc.ftl
@@ -34,7 +34,7 @@
////
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
-=== ${release.version}
+== ${release.version}
<#if release.date?has_content>Release date:: ${release.date}</#if>
diff --git a/src/changelog/12.0/.release.xml b/src/changelog/12.0/.release.xml
index 65ee095..b73b312 100644
--- a/src/changelog/12.0/.release.xml
+++ b/src/changelog/12.0/.release.xml
@@ -1,21 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<release xmlns="http://logging.apache.org/log4j/changelog";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
date="2020-05-03" version="12.0"/>
diff --git a/src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml
b/src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml
index 7458b6e..b46ad64 100644
--- a/src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml
+++ b/src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="changed">
<issue id="LOG4J2-1882"
link="https://issues.apache.org/jira/browse/LOG4J2-1882"/>
<description format="asciidoc">Switch from `sbt` to Maven to take advantage
of `logging-parent` conveniences</description>
diff --git a/src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml
b/src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml
index 73c4046..0d86eb9 100644
--- a/src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml
+++ b/src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<issue id="LOG4J2-2291"
link="https://issues.apache.org/jira/browse/LOG4J2-2291"/>
<description format="asciidoc">Add Jenkins pipeline for `sbt`
build</description>
diff --git a/src/changelog/12.0/LOG4J2-2293_add-license-files.xml
b/src/changelog/12.0/LOG4J2-2293_add-license-files.xml
index 5ac7d03..55d6824 100644
--- a/src/changelog/12.0/LOG4J2-2293_add-license-files.xml
+++ b/src/changelog/12.0/LOG4J2-2293_add-license-files.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<issue id="LOG4J2-2293"
link="https://issues.apache.org/jira/browse/LOG4J2-2293"/>
<description format="asciidoc">Add required license files to `sbt` output
artifacts</description>
diff --git a/src/changelog/12.0/LOG4J2-2294_rat-plugin.xml
b/src/changelog/12.0/LOG4J2-2294_rat-plugin.xml
index 63d704b..5123846 100644
--- a/src/changelog/12.0/LOG4J2-2294_rat-plugin.xml
+++ b/src/changelog/12.0/LOG4J2-2294_rat-plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<issue id="LOG4J2-2294"
link="https://issues.apache.org/jira/browse/LOG4J2-2294"/>
<description format="asciidoc">Add `apache-rat-plugin` reports</description>
diff --git a/src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml
b/src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml
index d3aa003..58f7132 100644
--- a/src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml
+++ b/src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<issue id="LOG4J2-2295"
link="https://issues.apache.org/jira/browse/LOG4J2-2295"/>
<description format="asciidoc">Add OSGi descriptors</description>
diff --git a/src/changelog/12.0/LOG4J2-2296_add-site.xml
b/src/changelog/12.0/LOG4J2-2296_add-site.xml
index bc53d4e..a509cb6 100644
--- a/src/changelog/12.0/LOG4J2-2296_add-site.xml
+++ b/src/changelog/12.0/LOG4J2-2296_add-site.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<issue id="LOG4J2-2296"
link="https://issues.apache.org/jira/browse/LOG4J2-2296"/>
<description format="asciidoc">Add `sbt-site` plugin and website
configuration</description>
diff --git a/src/changelog/12.0/LOG4J2-2298_add-changelog.xml
b/src/changelog/12.0/LOG4J2-2298_add-changelog.xml
index ccd818b..bcbf657 100644
--- a/src/changelog/12.0/LOG4J2-2298_add-changelog.xml
+++ b/src/changelog/12.0/LOG4J2-2298_add-changelog.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<issue id="LOG4J2-2298"
link="https://issues.apache.org/jira/browse/LOG4J2-2298"/>
<description format="asciidoc">Add changelog to site</description>
diff --git a/src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml
b/src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml
index 95a8a2d..67188f9 100644
--- a/src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml
+++ b/src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="changed">
<issue id="LOG4J2-2303"
link="https://issues.apache.org/jira/browse/LOG4J2-2303"/>
<description format="asciidoc">Add release distribution script</description>
diff --git a/src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml
b/src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml
index d1f9329..2bba3f9 100644
--- a/src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml
+++ b/src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<issue id="LOG4J2-2668"
link="https://issues.apache.org/jira/browse/LOG4J2-2668"/>
<description format="asciidoc">Add support for Scala 2.13</description>
diff --git a/src/changelog/13.0.0/.release-notes.adoc.ftl
b/src/changelog/13.0.0/.release-notes.adoc.ftl
index 490c236..e82e663 100644
--- a/src/changelog/13.0.0/.release-notes.adoc.ftl
+++ b/src/changelog/13.0.0/.release-notes.adoc.ftl
@@ -34,7 +34,7 @@
////
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
-=== ${release.version}
+== ${release.version}
<#if release.date?has_content>Release date:: ${release.date}</#if>
diff --git a/src/changelog/13.0.0/.release.xml
b/src/changelog/13.0.0/.release.xml
index 20d35f8..78d3719 100644
--- a/src/changelog/13.0.0/.release.xml
+++ b/src/changelog/13.0.0/.release.xml
@@ -1,21 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<release xmlns="http://logging.apache.org/log4j/changelog";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.0.xsd";
+<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
date="2023-10-10" version="13.0.0"/>
diff --git a/src/changelog/13.0.0/LOG4J2-3184_add-scala-3.xml
b/src/changelog/13.0.0/LOG4J2-3184_add-scala-3.xml
index 3c20b13..470be9d 100644
--- a/src/changelog/13.0.0/LOG4J2-3184_add-scala-3.xml
+++ b/src/changelog/13.0.0/LOG4J2-3184_add-scala-3.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<issue id="LOG4J2-3184"
link="https://issues.apache.org/jira/browse/LOG4J2-3184"/>
<issue id="26" link="https://github.com/apache/logging-log4j-scala/pull/26"/>
diff --git a/src/changelog/13.0.0/add-module-support.xml
b/src/changelog/13.0.0/add-module-support.xml
index d3bbb30..fc812b6 100644
--- a/src/changelog/13.0.0/add-module-support.xml
+++ b/src/changelog/13.0.0/add-module-support.xml
@@ -1,23 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<description format="asciidoc">Add OSGi and JPMS support</description>
</entry>
diff --git a/src/changelog/13.0.0/java-17.xml b/src/changelog/13.0.0/java-17.xml
index 18aadc9..2831674 100644
--- a/src/changelog/13.0.0/java-17.xml
+++ b/src/changelog/13.0.0/java-17.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="changed">
<description format="asciidoc">Bump the Java version to 17 (Scala 2.10 and
2.11 targets still require Java 8 that build switches to using
`maven-toolchains-plugin`) </description>
</entry>
diff --git a/src/changelog/13.0.0/switch-to-github-actions.xml
b/src/changelog/13.0.0/switch-to-github-actions.xml
index e651137..bddee83 100644
--- a/src/changelog/13.0.0/switch-to-github-actions.xml
+++ b/src/changelog/13.0.0/switch-to-github-actions.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="changed">
<description format="asciidoc">Switch the CI to GitHub Actions</description>
</entry>
diff --git a/src/changelog/13.0.0/switch-to-maven.xml
b/src/changelog/13.0.0/switch-to-maven.xml
index 44d00c1..0f8e84f 100644
--- a/src/changelog/13.0.0/switch-to-maven.xml
+++ b/src/changelog/13.0.0/switch-to-maven.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="changed">
<description format="asciidoc">Switch from `sbt` to Maven to take advantage
of `logging-parent` conveniences</description>
</entry>
diff --git a/src/changelog/13.0.0/switch-to-semver.xml
b/src/changelog/13.0.0/switch-to-semver.xml
index 222fec0..215f583 100644
--- a/src/changelog/13.0.0/switch-to-semver.xml
+++ b/src/changelog/13.0.0/switch-to-semver.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="changed">
<description format="asciidoc">Switch to semantic versioning</description>
</entry>
diff --git a/src/changelog/13.0.0/update_org_apache_logging_log4j_log4j_api.xml
b/src/changelog/13.0.0/update_org_apache_logging_log4j_log4j_api.xml
index 75cf217..c8f5711 100644
--- a/src/changelog/13.0.0/update_org_apache_logging_log4j_log4j_api.xml
+++ b/src/changelog/13.0.0/update_org_apache_logging_log4j_log4j_api.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="changed">
<description format="asciidoc">Update `org.apache.logging.log4j:log4j-api`
version to `2.20.0`</description>
</entry>
diff --git a/src/changelog/13.0.0/update_org_apache_logging_logging_parent.xml
b/src/changelog/13.0.0/update_org_apache_logging_logging_parent.xml
index 0d42efe..325d8ce 100644
--- a/src/changelog/13.0.0/update_org_apache_logging_logging_parent.xml
+++ b/src/changelog/13.0.0/update_org_apache_logging_logging_parent.xml
@@ -1,23 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="changed">
<description format="asciidoc">Update `org.apache.logging:logging-parent` to
version `10.1.1`</description>
</entry>
diff --git a/src/changelog/13.0.0/use-changelog.xml
b/src/changelog/13.0.0/use-changelog.xml
index 120dee1..26b5597 100644
--- a/src/changelog/13.0.0/use-changelog.xml
+++ b/src/changelog/13.0.0/use-changelog.xml
@@ -1,23 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="changed">
<description format="asciidoc">Start using `log4j-changelog`</description>
</entry>
diff --git a/src/changelog/13.1.0/.release-notes.adoc.ftl
b/src/changelog/13.1.0/.release-notes.adoc.ftl
index b449c05..d8a8151 100644
--- a/src/changelog/13.1.0/.release-notes.adoc.ftl
+++ b/src/changelog/13.1.0/.release-notes.adoc.ftl
@@ -34,7 +34,7 @@
////
[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
-=== ${release.version}
+== ${release.version}
<#if release.date?has_content>Release date:: ${release.date}</#if>
diff --git a/src/changelog/13.1.0/.release.xml
b/src/changelog/13.1.0/.release.xml
index 1ec7ceb..6a4b992 100644
--- a/src/changelog/13.1.0/.release.xml
+++ b/src/changelog/13.1.0/.release.xml
@@ -1,21 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<release xmlns="http://logging.apache.org/log4j/changelog";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.3.xsd";
+<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
date="2024-02-01" version="13.1.0"/>
diff --git a/src/changelog/13.1.0/add-sbom.xml
b/src/changelog/13.1.0/add-sbom.xml
index f83471b..fb17665 100644
--- a/src/changelog/13.1.0/add-sbom.xml
+++ b/src/changelog/13.1.0/add-sbom.xml
@@ -1,23 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="added">
<description format="asciidoc">Start generating CycloneDX SBOM</description>
</entry>
diff --git a/src/changelog/13.1.0/fix-scala-3-macro-inlining.xml
b/src/changelog/13.1.0/fix-scala-3-macro-inlining.xml
index 1a364eb..5328299 100644
--- a/src/changelog/13.1.0/fix-scala-3-macro-inlining.xml
+++ b/src/changelog/13.1.0/fix-scala-3-macro-inlining.xml
@@ -1,23 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="fixed">
<issue id="40" link="https://github.com/apache/logging-log4j-scala/pull/40"/>
<description format="asciidoc">Fix recursive inlining issues in Scala 3
macros</description>
diff --git a/src/changelog/13.1.0/update_org_apache_logging_log4j_log4j_bom.xml
b/src/changelog/13.1.0/update_org_apache_logging_log4j_log4j_bom.xml
index 6f48185..015239b 100644
--- a/src/changelog/13.1.0/update_org_apache_logging_log4j_log4j_bom.xml
+++ b/src/changelog/13.1.0/update_org_apache_logging_log4j_log4j_bom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.3.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
<issue id="43" link="https://github.com/apache/logging-log4j-scala/pull/43"/>
<description format="asciidoc">Update `org.apache.logging.log4j:log4j-bom`
to version `2.22.1`</description>
diff --git a/src/changelog/13.1.0/update_org_apache_logging_logging_parent.xml
b/src/changelog/13.1.0/update_org_apache_logging_logging_parent.xml
index a3e3848..7327bed 100644
--- a/src/changelog/13.1.0/update_org_apache_logging_logging_parent.xml
+++ b/src/changelog/13.1.0/update_org_apache_logging_logging_parent.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://logging.apache.org/log4j/changelog";
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.3.xsd";
+ xmlns="https://logging.apache.org/xml/ns";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
<issue id="44" link="https://github.com/apache/logging-log4j-scala/pull/44"/>
<description format="asciidoc">Update `org.apache.logging:logging-parent` to
version `10.6.0`</description>
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
deleted file mode 100644
index dba91f1..0000000
--- a/src/site/_constants.adoc
+++ /dev/null
@@ -1,41 +0,0 @@
-////
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-////
- ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
- ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
- ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
- ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
- ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
-
- IF THIS FILE DOESN'T HAVE A `.tmpl.adoc` SUFFIX, IT IS AUTO-GENERATED, DO
NOT EDIT IT!
-
- `_constants.adoc` is auto-generated from `_constants.tmpl.adoc`.
- Auto-generation happens during `process-sources` phase of Maven.
- Hence, you must always
-
- 1. Edit `_constants.tmpl.adoc`
- 2. Run `./mvnw process-sources`
- 3. Commit both `_constants.tmpl.adoc` and the generated `_constants.adoc`
-////
-
-:project-github-url: https://github.com/apache/logging-log4j-scala
-:project-version: 13.2.0-SNAPSHOT
-:project-name: Log4j Scala API
-:project-id: log4j-scala
-:java-compiler-version: [17,18)
-:bnd-module-name: org.apache.logging.log4j.api.scala
diff --git a/src/site/_constants.tmpl.adoc b/src/site/_constants.tmpl.adoc
deleted file mode 100644
index 7c63d19..0000000
--- a/src/site/_constants.tmpl.adoc
+++ /dev/null
@@ -1,41 +0,0 @@
-////
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-////
- ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
- ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
- ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
- ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
- ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
-
- IF THIS FILE DOESN'T HAVE A `.tmpl.adoc` SUFFIX, IT IS AUTO-GENERATED, DO
NOT EDIT IT!
-
- `_constants.adoc` is auto-generated from `_constants.tmpl.adoc`.
- Auto-generation happens during `process-sources` phase of Maven.
- Hence, you must always
-
- 1. Edit `_constants.tmpl.adoc`
- 2. Run `./mvnw process-sources`
- 3. Commit both `_constants.tmpl.adoc` and the generated `_constants.adoc`
-////
-
-:project-github-url: ${scm.url}
-:project-version: ${project.version}
-:project-name: Log4j Scala API
-:project-id: log4j-scala
-:java-compiler-version: ${minimalJavaBuildVersion}
-:bnd-module-name: ${bnd-module-name}
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
deleted file mode 100644
index dbceb39..0000000
--- a/src/site/_release-notes.adoc
+++ /dev/null
@@ -1,42 +0,0 @@
-////
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-////
- ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
- ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
- ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
- ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
- ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
-
- IF THIS FILE IS CALLED `index.adoc`, IT IS AUTO-GENERATED, DO NOT EDIT IT!
-
- Release notes `index.adoc` is generated from
`src/changelog/.index.adoc.ftl`.
- Auto-generation happens during `generate-sources` phase of Maven.
- Hence, you must always
-
- 1. Edit `.index.adoc.ftl`
- 2. Run `./mvnw generate-sources`
- 3. Commit both `.index.adoc.ftl` and the generated `.index.adoc`
-////
-
-[#release-notes]
-== Release Notes
-
-include::_release-notes/_13.x.x.adoc[]
-include::_release-notes/_13.1.0.adoc[]
-include::_release-notes/_13.0.0.adoc[]
-include::_release-notes/_12.0.adoc[]
diff --git a/src/site/_release-notes/_12.0.adoc
b/src/site/_release-notes/_12.0.adoc
deleted file mode 100644
index e2b9eda..0000000
--- a/src/site/_release-notes/_12.0.adoc
+++ /dev/null
@@ -1,57 +0,0 @@
-////
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-////
- ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
- ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
- ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
- ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
- ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
-
- IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT
EDIT IT!
-
- Version-specific release notes (`7.8.0.adoc`, etc.) are generated from
`src/changelog/*/.release-notes.adoc.ftl`.
- Auto-generation happens during `generate-sources` phase of Maven.
- Hence, you must always
-
- 1. Find and edit the associated `.release-notes.adoc.ftl`
- 2. Run `./mvnw generate-sources`
- 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
-////
-
-[#release-notes-12-0]
-=== 12.0
-
-Release date:: 2020-05-03
-
-This is the first release of the project.
-
-
-==== Added
-
-* Add Jenkins pipeline for `sbt` build
(https://issues.apache.org/jira/browse/LOG4J2-2291[LOG4J2-2291])
-* Add required license files to `sbt` output artifacts
(https://issues.apache.org/jira/browse/LOG4J2-2293[LOG4J2-2293])
-* Add `apache-rat-plugin` reports
(https://issues.apache.org/jira/browse/LOG4J2-2294[LOG4J2-2294])
-* Add OSGi descriptors
(https://issues.apache.org/jira/browse/LOG4J2-2295[LOG4J2-2295])
-* Add `sbt-site` plugin and website configuration
(https://issues.apache.org/jira/browse/LOG4J2-2296[LOG4J2-2296])
-* Add changelog to site
(https://issues.apache.org/jira/browse/LOG4J2-2298[LOG4J2-2298])
-* Add support for Scala 2.13
(https://issues.apache.org/jira/browse/LOG4J2-2668[LOG4J2-2668])
-
-==== Changed
-
-* Switch from `sbt` to Maven to take advantage of `logging-parent`
conveniences (https://issues.apache.org/jira/browse/LOG4J2-1882[LOG4J2-1882])
-* Add release distribution script
(https://issues.apache.org/jira/browse/LOG4J2-2303[LOG4J2-2303])
diff --git a/src/site/_release-notes/_13.0.0.adoc
b/src/site/_release-notes/_13.0.0.adoc
deleted file mode 100644
index d25dea0..0000000
--- a/src/site/_release-notes/_13.0.0.adoc
+++ /dev/null
@@ -1,60 +0,0 @@
-////
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-////
- ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
- ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
- ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
- ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
- ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
-
- IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT
EDIT IT!
-
- Version-specific release notes (`7.8.0.adoc`, etc.) are generated from
`src/changelog/*/.release-notes.adoc.ftl`.
- Auto-generation happens during `generate-sources` phase of Maven.
- Hence, you must always
-
- 1. Find and edit the associated `.release-notes.adoc.ftl`
- 2. Run `./mvnw generate-sources`
- 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
-////
-
-[#release-notes-13-0-0]
-=== 13.0.0
-
-Release date:: 2023-10-10
-
-The highlights of this major release are Scala 3 support, OSGi and JPMS
descriptors, and the switch to https://semver.org[semantic versioning].
-
-Note that this release is still binary backward compatible with the earlier
release `12.0`.
-Though we needed to bump the major version number for the semantic versioning
switch to avoid the confusion related with version ordering.
-
-
-==== Added
-
-* Add support for Scala 3
(https://issues.apache.org/jira/browse/LOG4J2-3184[LOG4J2-3184],
https://github.com/apache/logging-log4j-scala/pull/26[26])
-* Add OSGi and JPMS support
-
-==== Changed
-
-* Bump the Java version to 17 (Scala 2.10 and 2.11 targets still require Java
8 that build switches to using `maven-toolchains-plugin`)
-* Switch the CI to GitHub Actions
-* Switch from `sbt` to Maven to take advantage of `logging-parent` conveniences
-* Switch to semantic versioning
-* Update `org.apache.logging.log4j:log4j-api` version to `2.20.0`
-* Update `org.apache.logging:logging-parent` to version `10.1.1`
-* Start using `log4j-changelog`
diff --git a/src/site/_release-notes/_13.1.0.adoc
b/src/site/_release-notes/_13.1.0.adoc
deleted file mode 100644
index bb806b9..0000000
--- a/src/site/_release-notes/_13.1.0.adoc
+++ /dev/null
@@ -1,55 +0,0 @@
-////
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-////
- ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
- ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
- ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
- ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
- ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
-
- IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT
EDIT IT!
-
- Version-specific release notes (`7.8.0.adoc`, etc.) are generated from
`src/changelog/*/.release-notes.adoc.ftl`.
- Auto-generation happens during `generate-sources` phase of Maven.
- Hence, you must always
-
- 1. Find and edit the associated `.release-notes.adoc.ftl`
- 2. Run `./mvnw generate-sources`
- 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
-////
-
-[#release-notes-13-1-0]
-=== 13.1.0
-
-Release date:: 2024-02-01
-
-This minor release contains a bug fix, Software Bill of Materials (SBOM)
generation, and some dependency updates.
-
-
-==== Added
-
-* Start generating CycloneDX SBOM
-
-==== Fixed
-
-* Fix recursive inlining issues in Scala 3 macros
(https://github.com/apache/logging-log4j-scala/pull/40[40])
-
-==== Updated
-
-* Update `org.apache.logging.log4j:log4j-bom` to version `2.22.1`
(https://github.com/apache/logging-log4j-scala/pull/43[43])
-* Update `org.apache.logging:logging-parent` to version `10.6.0`
(https://github.com/apache/logging-log4j-scala/pull/44[44])
diff --git a/src/site/_release-notes/_13.x.x.adoc
b/src/site/_release-notes/_13.x.x.adoc
deleted file mode 100644
index 0123374..0000000
--- a/src/site/_release-notes/_13.x.x.adoc
+++ /dev/null
@@ -1,47 +0,0 @@
-////
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-////
- ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
- ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
- ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
- ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
- ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
-
- IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT
EDIT IT!
-
- Version-specific release notes (`7.8.0.adoc`, etc.) are generated from
`src/changelog/*/.release-notes.adoc.ftl`.
- Auto-generation happens during `generate-sources` phase of Maven.
- Hence, you must always
-
- 1. Find and edit the associated `.release-notes.adoc.ftl`
- 2. Run `./mvnw generate-sources`
- 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
-////
-
-[#release-notes-13-x-x]
-=== 13.x.x
-
-
-
-This minor release contains various bug fixes and improvements.
-
-
-==== Updated
-
-* Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1`
(https://github.com/apache/logging-log4j-scala/pull/49[49])
-* Update `org.scala-lang:scala3-library_3` to version `3.4.1`
(https://github.com/apache/logging-log4j-scala/pull/50[50])
diff --git a/src/site/antora/antora.tmpl.yml b/src/site/antora/antora.tmpl.yml
new file mode 100644
index 0000000..1305186
--- /dev/null
+++ b/src/site/antora/antora.tmpl.yml
@@ -0,0 +1,49 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
+# ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
+# ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
+# ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
+# ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
+#
+# THIS FILE IS USED AS A TEMPLATE TO AUTO-GENERATE `antora.yml`!
+#
+# The actual `antora.yml` that is used in `target/generated-site/antora` is
auto-generated from `.antora.yml`.
+# Auto-generation happens during `pre-site` phase of Maven.
+# Hence, you must always
+#
+# 1. Edit `.antora.yml`
+# 2. Edit `antora.yml` to match the fields in `.antora.yml` and fill Maven
property placeholders with dummy values
+#
+
+name: ROOT
+title: Home
+version: ~
+start_page: index.adoc
+asciidoc:
+ attributes:
+ project-github-url: "${scm.url}"
+ project-version: "${project.version}"
+ project-name: "Log4j Scala API"
+ project-id: "log4j-scala"
+ java-compiler-version: "${minimalJavaBuildVersion}"
+ bnd-module-name: "${bnd-module-name}"
+ logging-services-url: "https://logging.apache.org";
+nav:
+ - modules/ROOT/nav.adoc
diff --git a/src/site/antora/antora.yml b/src/site/antora/antora.yml
new file mode 100644
index 0000000..a1c2412
--- /dev/null
+++ b/src/site/antora/antora.yml
@@ -0,0 +1,49 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# ██ ██ █████ ██████ ███ ██ ██ ███ ██ ██████ ██
+# ██ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██ ██ ██
+# ██ █ ██ ███████ ██████ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██
+# ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
+# ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
+#
+# THIS FILE IS USED AS A TEMPLATE TO AUTO-GENERATE `antora.yml`!
+#
+# The actual `antora.yml` that is used in `target/generated-site/antora` is
auto-generated from `.antora.yml`.
+# Auto-generation happens during `pre-site` phase of Maven.
+# Hence, you must always
+#
+# 1. Edit `.antora.yml`
+# 2. Edit `antora.yml` to match the fields in `.antora.yml` and fill Maven
property placeholders with dummy values
+#
+
+name: ROOT
+title: Home
+version: ~
+start_page: index.adoc
+asciidoc:
+ attributes:
+ project-github-url: "https://github.com/apache/logging-log4j-scala";
+ project-version: "1.2.3"
+ project-name: "Log4j Scala API"
+ project-id: "log4j-scala"
+ java-compiler-version: "[17,18)"
+ bnd-module-name: "org.apache.logging.log4j.api.scala"
+ logging-services-url: "https://logging.apache.org";
+nav:
+ - modules/ROOT/nav.adoc
diff --git a/src/site/antora/modules/ROOT/nav.adoc
b/src/site/antora/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..c40ea29
--- /dev/null
+++ b/src/site/antora/modules/ROOT/nav.adoc
@@ -0,0 +1,22 @@
+////
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+////
+
+* xref:development.adoc[]
+* xref:release-notes.adoc[]
+* {logging-services-url}/download.html[Download]
+* {logging-services-url}/support.html[Support]
+* {logging-services-url}/security.html[Security]
diff --git a/src/site/antora/modules/ROOT/pages/development.adoc
b/src/site/antora/modules/ROOT/pages/development.adoc
new file mode 100644
index 0000000..31f3ada
--- /dev/null
+++ b/src/site/antora/modules/ROOT/pages/development.adoc
@@ -0,0 +1,47 @@
+////
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+////
+
+= Development
+
+{project-name} uses {project-github-url}[GitHub] for source code management.
+
+The project requires two Java compilers to build:
+
+. `8` (required for Scala `2.10` and `2.11`)
+. one matching the `{java-compiler-version}` range.
+
+You can build and verify sources using:
+
+[source,bash]
+----
+./mvnw verify
+----
+
+You can build and view the website as follows:
+
+[source,bash]
+----
+./mvnw -N site
+----
+
+You can view the generated website with a browser by pointing it to
`target/site` directory.
+
+[#release-instructions]
+== Release instructions
+
+{project-name} employs the CI/CD foundation provided by the
{logging-services-url}/logging-parent[`logging-parent`].
+You can simply use its release instructions.
diff --git a/src/site/antora/modules/ROOT/pages/index.adoc
b/src/site/antora/modules/ROOT/pages/index.adoc
new file mode 100644
index 0000000..1280168
--- /dev/null
+++ b/src/site/antora/modules/ROOT/pages/index.adoc
@@ -0,0 +1,90 @@
+////
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+////
+
+:log4j-url: {logging-services-url}/log4j/2.x
+:log4j-api-url: {log4j-url}/manual/api-separation.html
+
+= Log4j Scala API
+
+{project-name} provides a Scala-friendly interface to log against
{log4j-api-url}[the Log4j API].
+It supports Scala `2.10`, `2.11`, `2.12`, `2.13`, and `3`.
+
+[IMPORTANT]
+====
+This is just a logging API.
+Your application still needs to have a logging backend (e.g.,
{log4j-url}[Log4j]) configured.
+====
+
+[#dependencies]
+== Dependencies
+
+You need to have the `org.apache.logging.log4j:log4j-api-scala` dependency in
your classpath:
+
+[source,sbt,subs="+attributes"]
+----
+libraryDependencies ++= Seq(
+ "org.apache.logging.log4j" %% "log4j-api-scala" % "{project-version}"
+)
+----
+
+Java module name is set to `org.apache.logging.log4j.api.scala`.
+OSGi ``Bundle-SymbolicName``s are set to
`org.apache.logging.log4j.api.scala.2.10`,
`org.apache.logging.log4j.api.scala.2.11`, and so on.
+
+[#usage]
+== Usage
+
+Using the Scala API is as simple as mixing in the `Logging` trait to your
class:
+
+[source,scala]
+----
+import org.apache.logging.log4j.scala.Logging
+import org.apache.logging.log4j.Level
+
+class MyClass extends BaseClass with Logging {
+
+ def doStuff(): Unit = {
+ logger.info("Doing stuff")
+ }
+
+ def doStuffWithLevel(level: Level): Unit = {
+ logger(level, "Doing stuff with arbitrary level")
+ }
+
+ def doStuffWithUser(user: User): Unit = {
+ logger.info(s"Doing stuff with ${user.getName}.")
+ }
+
+}
+----
+
+[#params]
+== Parameter substitution
+
+Unlike in Java, Scala provides native functionality for string interpolation
https://docs.scala-lang.org/overviews/core/string-interpolation.html[beginning
in Scala 2.10].
+As all logger calls are implemented as macros, using string interpolation
directly does not require additional if checks:
+
+[source,scala]
+----
+logger.debug(s"Logging in user ${user.getName} with birthday
${user.calcBirthday}")
+----
+
+[#logger-names]
+== Logger names
+
+Most logging implementations use a hierarchical scheme for matching logger
names with logging configuration.
+In this scheme the logger name hierarchy is represented by `.` characters in
the logger name, in a fashion very similar to the hierarchy used for Java/Scala
package names.
+The `Logger` property added by the `Logging` trait follows this convention:
the trait ensures the `Logger` is automatically named according to the class it
is being used in.
diff --git a/src/site/antora/modules/ROOT/pages/release-notes.adoc
b/src/site/antora/modules/ROOT/pages/release-notes.adoc
new file mode 100644
index 0000000..a2bfd86
--- /dev/null
+++ b/src/site/antora/modules/ROOT/pages/release-notes.adoc
@@ -0,0 +1,21 @@
+////
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+////
+
+= Release notes
+
+This file is a stub.
+Its content will be auto-generated during build.
diff --git a/src/site/index.adoc b/src/site/index.adoc
deleted file mode 100644
index 3aa4bfe..0000000
--- a/src/site/index.adoc
+++ /dev/null
@@ -1,164 +0,0 @@
-////
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-////
-
-include::_constants.adoc[]
-:log4j-url: https://logging.apache.org/log4j/2.x
-:log4j-api-url: {log4j-url}/manual/api-separation.html
-
-= Log4j Scala API
-
-{project-name} provides a Scala-friendly interface to log against
{log4j-api-url}[the Log4j API].
-It supports Scala `2.10`, `2.11`, `2.12`, `2.13`, and `3`.
-
-[IMPORTANT]
-====
-This is just a logging API.
-Your application still needs to have a logging backend (e.g.,
{log4j-url}[Log4j]) configured.
-====
-
-[#dependencies]
-== Dependencies
-
-You need to have the `org.apache.logging.log4j:log4j-api-scala` dependency in
your classpath:
-
-[source,sbt,subs="+attributes"]
-----
-libraryDependencies ++= Seq(
- "org.apache.logging.log4j" %% "log4j-api-scala" % "{project-version}"
-)
-----
-
-Java module name is set to `org.apache.logging.log4j.api.scala`.
-OSGi ``Bundle-SymbolicName``s are set to
`org.apache.logging.log4j.api.scala.2.10`,
`org.apache.logging.log4j.api.scala.2.11`, and so on.
-
-[#usage]
-== Usage
-
-Using the Scala API is as simple as mixing in the `Logging` trait to your
class:
-
-[source,scala]
-----
-import org.apache.logging.log4j.scala.Logging
-import org.apache.logging.log4j.Level
-
-class MyClass extends BaseClass with Logging {
-
- def doStuff(): Unit = {
- logger.info("Doing stuff")
- }
-
- def doStuffWithLevel(level: Level): Unit = {
- logger(level, "Doing stuff with arbitrary level")
- }
-
- def doStuffWithUser(user: User): Unit = {
- logger.info(s"Doing stuff with ${user.getName}.")
- }
-
-}
-----
-
-[#params]
-== Parameter substitution
-
-Unlike in Java, Scala provides native functionality for string interpolation
https://docs.scala-lang.org/overviews/core/string-interpolation.html[beginning
in Scala 2.10].
-As all logger calls are implemented as macros, using string interpolation
directly does not require additional if checks:
-
-[source,scala]
-----
-logger.debug(s"Logging in user ${user.getName} with birthday
${user.calcBirthday}")
-----
-
-[#logger-names]
-== Logger names
-
-Most logging implementations use a hierarchical scheme for matching logger
names with logging configuration.
-In this scheme the logger name hierarchy is represented by `.` characters in
the logger name, in a fashion very similar to the hierarchy used for Java/Scala
package names.
-The `Logger` property added by the `Logging` trait follows this convention:
the trait ensures the `Logger` is automatically named according to the class it
is being used in.
-
-[#development]
-== Development
-
-{project-name} uses {project-github-url}[GitHub] for source code management.
-
-The project requires two Java compilers to build:
-
-. `8` (required for Scala `2.10` and `2.11`)
-. one matching the `{java-compiler-version}` range.
-
-You can build and verify sources using:
-
-[source,bash]
-----
-./mvnw verify
-----
-
-You can build and view the website as follows:
-
-[source,bash]
-----
-./mvnw -N site
-python -m http.server -d target/site
-----
-
-[#distribution]
-== Distribution
-
-In accordance with the Apache Software Foundation's release
https://infra.apache.org/release-distribution.html[distribution policy] and
https://infra.apache.org/release-publishing.html[creation process], project
artifacts are _officially_ accessible from the following locations:
-
-* ASF https://repository.apache.org/content/repositories/releases[Release] and
https://repository.apache.org/content/repositories/snapshots[snapshot]
repositories (mirrored to https://central.sonatype.dev/[the Maven Central
Repository])
-* ASF https://downloads.apache.org/logging/{project-id}[Distribution directory]
-
-See xref:#release-instructions[the release instructions] for details.
-
-[#cyclonedx-sbom]
-=== CycloneDX Software Bill of Materials (SBOM)
-
-Starting with version `13.1.0`, {project-name} distributes
https://cyclonedx.org/capabilities/sbom/[CyclenoDX Software Bill of Materials
(SBOM)] along with each deployed artifact.
-This is streamlined by `logging-parent`, see
https://logging.apache.org/logging-parent/latest/#cyclonedx-sbom[its website]
for details.
-
-[#support]
-== Support
-
-Please keep in mind that this project is intended for internal usage only.
-You can use GitHub Issues for feature requests and bug reports – not questions!
-See https://logging.apache.org/log4j/2.x/support.html[the Log4j support
policy] for details.
-
-[#security]
-== Security
-
-If you have encountered an unlisted security vulnerability or other unexpected
behaviour that has security impact, please report them privately to
mailto:[email protected][the Log4j security mailing list].
-See https://logging.apache.org/log4j/2.x/security.html[the Log4j Security
page] for further details.
-
-include::_release-notes.adoc[]
-
-[#release-instructions]
-== Release instructions
-
-{project-name} employs the CI/CD foundation provided by the
https://logging.apache.org/logging-parent[`logging-parent`].
-You can simply use its release instructions.
-
-[#license]
-== License
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements.
-See `NOTICE.txt` distributed with this work for additional information
regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0[].
-
-Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
limitations under the License.
