Merge remote-tracking branch 'apache/main' into feature/remove-picocli

Author: ppkarwasz

.gitignore

@@ -35,3 +35,6 @@ velocity.log
 felix-cache/
 /.metadata/
 .DS_Store
+node
+node_modules
+package-lock.json

BUILDING.adoc

@@ -53,21 +53,20 @@ printf '127.0.0.1 %s\n::1 %s\n' `hostname` `hostname` | sudo tee -a /etc/hosts
 ----
 
 [#website]
-== Building the website and manual
+== Building the website
 
-You can build the website and manual as follows:
+You can build the website as follows:
 
 [source,bash]
 ----
-./mvnw site
+./mvnw compile    # <1>
+./mvnw site       # <2>
 ----
+<1> Generate plugin descriptors that will be used to generate the plugin reference page.
+Descriptors are placed under `target/plugin-descriptors`.
+<2> Generate the website to `target/site`
 
-And view it using a simple HTTP server, e.g., the one comes with the Python:
-
-[source,bash]
-----
-python3 -m http.server -d target/site
-----
+You can view the generated website with a browser by pointing it to `target/site` directory.
 
 [#development]
 == Development
@@ -81,7 +80,7 @@ You can follow below steps for casual development needs:
 
 You can connect your IDE to a `./mvnw test` run by
 
-. Add `-Dmaven.surefire.debug` to the `./mvnw test` command
+. Run `./mvnw test -pl :log4j-core-test -Dtest=FooBarTest -Dmaven.surefire.debug`
 . Use _"Run > Attach to process"_ in IntelliJ IDEA
 
 [#development-faq]

antora-playbook.yaml

@@ -0,0 +1,124 @@
+#
+# 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
+  url: "https://logging.apache.org/log4j/3.x"
+  start_page: "ROOT::index.adoc"
+
+content:
+  sources:
+    - url: .
+      branches: HEAD
+      start_paths:
+        - target/generated-site/antora
+      edit_url:
+
+asciidoc:
+  attributes:
+    # JSON Template Layout manual page has a deep sectioning, support it.
+    # The trailing `@` is added so the attribute can still can be overridden in the header of a page.
+    # For instance, we override this value in release notes page.
+    page-toclevels: "4@"
+    log4j-docgen-descriptor-directory: target/plugin-descriptors
+    log4j-docgen-type-filter-exclude-pattern: ^java\..+
+    log4j-docgen-type-target-template: |
+      #{{{replaceAll sourcedType.groupId "." "-"}}}_{{{replaceAll sourcedType.artifactId "." "-"}}}_{{{replaceAll sourcedType.type.className "." "-"}}}
+  extensions:
+    - "@asciidoctor/tabs"
+    - src/docgen/apiref-macro.js
+
+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">
+              <div class="navbar-item">
+                <img src="{{{uiRootPath}}}/../_images/logo-small-white.png" alt="Apache Log4j"/>
+              </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-log4j2/edit/main/src/site/antora/modules/{{page.module}}/pages/{{page.relativeSrcPath}}">Edit this Page</a></div>

log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MaxLengthConverter.java

@@ -30,7 +30,9 @@
  * On invalid length the default value 100 is used (and an error message is logged).
  * If max length is greater than 20, an abbreviated text will get ellipsis ("...") appended.
  * Example usage (for email subject):
- * {@code "%maxLen{[AppName, ${hostName}, ${web:contextPath}] %p: %c{1} - %m%notEmpty{ =>%ex{short}}}{160}"}
+ * <pre>{@code
+ * %maxLen{[AppName, ${hostName}, ${web:contextPath}] %p: %c{1} - %m%notEmpty{ =>%ex{short}}}{160}
+ * }</pre>
  *
  * @author Thies Wellpott
  */

log4j-kubernetes/.log4j-plugin-processing-activator

@@ -140,7 +140,7 @@
     <logback.version>1.4.14</logback.version>
     <maven.version>3.9.6</maven.version>
     <mockito.version>5.11.0</mockito.version>
-    <mongodb.version>5.0.0</mongodb.version>
+    <mongodb.version>5.0.1</mongodb.version>
     <nashorn.version>15.4</nashorn.version>
     <netty.version>4.1.108.Final</netty.version>
     <opentest4j.version>1.3.0</opentest4j.version>
@@ -158,7 +158,7 @@
     <wiremock.version>2.35.2</wiremock.version>
     <xmlunit.version>2.9.1</xmlunit.version>
     <xz.version>1.9</xz.version>
-    <zstd.version>1.5.6-1</zstd.version>
+    <zstd.version>1.5.6-2</zstd.version>
 
     <!-- =====================================================
          Pinned transitive dependency version properties (in alphabetical order)

log4j-parent/pom.xml

@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "@antora/cli": "^3.2.0-alpha.4",
+    "@antora/site-generator-default": "^3.2.0-alpha.4",
+    "@asciidoctor/tabs": "^1.0.0-beta.6",
+    "fast-xml-parser": "^4.3.6",
+    "handlebars": "^4.7.8"
+  }
+}