Bump org.elasticsearch.client:elasticsearch-rest-high-level-client from 7.17.20 to 7.17.21

antora-playbook.yaml

@@ -38,8 +38,11 @@ asciidoc:
     log4j-docgen-type-filter-exclude-pattern: ^java\..+
     log4j-docgen-type-target-template: |
       #{{{replaceAll sourcedType.groupId "." "-"}}}_{{{replaceAll sourcedType.artifactId "." "-"}}}_{{{replaceAll sourcedType.type.className "." "-"}}}
+    # Force Kroki to download images at build time
+    kroki-fetch-diagram: true
   extensions:
     - "@asciidoctor/tabs"
+    - asciidoctor-kroki
     - src/docgen/apiref-macro.js
 
 ui:
@@ -88,10 +91,10 @@ ui:
           .doc pre { font-size: 0.7rem; }
           .doc .colist { font-size: 0.75rem; }
           /* Tab header fonts aren't rendered good, adjusting the font weight: */
-          .tablist > ul li { font-weight: 500; } 
+          .tablist > ul li { font-weight: 500; }
           /* `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
+            padding-left: 2.75rem;
           }
           /* Replace the default highlight.js color for strings from red (unnecessarily signaling something negative) to green: */
           .hljs-string {

log4j-parent/pom.xml

@@ -98,22 +98,22 @@
     <bsh.version>2.0b6</bsh.version>
     <commons-codec.version>1.17.0</commons-codec.version>
     <commons-compress.version>1.26.1</commons-compress.version>
-    <commons-csv.version>1.10.0</commons-csv.version>
+    <commons-csv.version>1.11.0</commons-csv.version>
     <commons-dbcp2.version>2.12.0</commons-dbcp2.version>
     <commons-io.version>2.16.1</commons-io.version>
     <commons-lang3.version>3.14.0</commons-lang3.version>
     <commons-logging.version>1.3.1</commons-logging.version>
     <conversant.disruptor.version>1.2.21</conversant.disruptor.version>
     <disruptor.version>4.0.0</disruptor.version>
-    <elasticsearch.version>7.17.20</elasticsearch.version>
+    <elasticsearch.version>7.17.21</elasticsearch.version>
     <embedded-ldap.version>0.9.0</embedded-ldap.version>
     <felix.version>7.0.5</felix.version>
     <flapdoodle-embed.version>4.8.1</flapdoodle-embed.version>
     <flapdoodle-reverse.version>1.7.2</flapdoodle-reverse.version>
     <flume.version>1.11.0</flume.version>
     <graalvm.version>24.0.1</graalvm.version>
     <groovy.version>4.0.21</groovy.version>
-    <guava.version>33.1.0-jre</guava.version>
+    <guava.version>33.2.0-jre</guava.version>
     <h2.version>2.2.222</h2.version>
     <hadoop.version>1.2.1</hadoop.version>
     <hamcrest.version>2.2</hamcrest.version>

package.json

@@ -3,6 +3,7 @@
     "@antora/cli": "^3.2.0-alpha.4",
     "@antora/site-generator-default": "^3.2.0-alpha.4",
     "@asciidoctor/tabs": "^1.0.0-beta.6",
+    "asciidoctor-kroki": "^0.18.1",
     "fast-xml-parser": "^4.3.6",
     "handlebars": "^4.7.8"
   }

src/changelog/.3.x.x/update_com_google_guava_guava.xml

@@ -3,6 +3,6 @@
        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="2375" link="https://github.com/apache/logging-log4j2/pull/2375"/>
-  <description format="asciidoc">Update `com.google.guava:guava` to version `33.1.0-jre`</description>
+  <issue id="2563" link="https://github.com/apache/logging-log4j2/pull/2563"/>
+  <description format="asciidoc">Update `com.google.guava:guava` to version `33.2.0-jre`</description>
 </entry>

src/changelog/.3.x.x/update_org_apache_commons_commons_csv.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="updated">
+  <issue id="2562" link="https://github.com/apache/logging-log4j2/pull/2562"/>
+  <description format="asciidoc">Update `org.apache.commons:commons-csv` to version `1.11.0`</description>
+</entry>

src/changelog/.3.x.x/update_org_elasticsearch_client_elasticsearch_rest_high_level_client.xml

@@ -3,6 +3,6 @@
        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="2455" link="https://github.com/apache/logging-log4j2/pull/2455"/>
-  <description format="asciidoc">Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.20`</description>
+  <issue id="2559" link="https://github.com/apache/logging-log4j2/pull/2559"/>
+  <description format="asciidoc">Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.21`</description>
 </entry>

src/site/antora/modules/ROOT/nav.adoc

@@ -22,43 +22,46 @@
 ** link:{logging-services-url}/security.html[Security]
 ** xref:thanks.adoc[Thanks]
 
-.Learn
-* xref:manual/index.adoc[]
-** xref:manual/installation.adoc[]
-** xref:manual/architecture.adoc[]
-** xref:manual/migration.adoc[]
-** xref:manual/api.adoc[]
-*** xref:manual/logbuilder.adoc[]
-*** xref:manual/flowtracing.adoc[]
-*** xref:manual/markers.adoc[]
-*** xref:manual/eventlogging.adoc[]
-*** xref:manual/messages.adoc[]
-*** xref:manual/thread-context.adoc[]
-*** xref:manual/scoped-context.adoc[]
-*** xref:manual/resource-logger.adoc[]
-** xref:manual/configuration.adoc[]
-** xref:manual/usage.adoc[]
-** xref:manual/cloud.adoc[]
-** xref:manual/lookups.adoc[]
-** xref:manual/appenders.adoc[]
-** xref:manual/layouts.adoc[]
-*** xref:manual/json-template-layout.adoc[]
-** xref:manual/filters.adoc[]
-** xref:manual/async.adoc[]
-** xref:manual/garbagefree.adoc[]
-** xref:manual/extending.adoc[]
-** xref:manual/plugins.adoc[]
-** xref:manual/customconfig.adoc[]
-** xref:manual/customloglevels.adoc[]
-** xref:manual/jmx.adoc[]
-** xref:manual/logsep.adoc[]
-** xref:manual/performance.adoc[]
-* xref:plugin-reference.adoc[Plugin reference]
-* xref:javadoc.adoc[Java API reference]
-* xref:articles.adoc[Articles]
+.Resources
 * xref:faq.adoc[F.A.Q.]
+* xref:5min.adoc[]
 * xref:development.adoc[]
 
+.xref:manual/index.adoc[]
+* xref:manual/installation.adoc[]
+* xref:manual/architecture.adoc[]
+* xref:manual/migration.adoc[]
+* xref:manual/api.adoc[]
+** xref:manual/logbuilder.adoc[]
+** xref:manual/flowtracing.adoc[]
+** xref:manual/markers.adoc[]
+** xref:manual/eventlogging.adoc[]
+** xref:manual/messages.adoc[]
+** xref:manual/thread-context.adoc[]
+** xref:manual/scoped-context.adoc[]
+** xref:manual/resource-logger.adoc[]
+* xref:manual/configuration.adoc[]
+* xref:manual/usage.adoc[]
+* xref:manual/cloud.adoc[]
+* xref:manual/lookups.adoc[]
+* xref:manual/appenders.adoc[]
+* xref:manual/layouts.adoc[]
+** xref:manual/json-template-layout.adoc[]
+* xref:manual/filters.adoc[]
+* xref:manual/async.adoc[]
+* xref:manual/garbagefree.adoc[]
+* xref:manual/extending.adoc[]
+* xref:manual/plugins.adoc[]
+* xref:manual/customconfig.adoc[]
+* xref:manual/customloglevels.adoc[]
+* xref:manual/jmx.adoc[]
+* xref:manual/logsep.adoc[]
+* xref:manual/performance.adoc[]
+
+.References
+* xref:plugin-reference.adoc[Plugin reference]
+* xref:javadoc.adoc[Java API reference]
+
 .Components
 * xref:log4j-api.adoc[]
 * xref:log4j-1.2-api.adoc[]