From adb2fcb9624eda6b6da1d82768ef1dedfac7a8b4 Mon Sep 17 00:00:00 2001
From: "Piotr P. Karwasz" <piotr.github@karwasz.org>
Date: Fri, 22 Dec 2023 10:54:39 +0100
Subject: [PATCH] Updates the content of the changelog

We add an introduction to the changelog entry and remove updates that
only concern dependencies in the `test` scope and Github Actions.
---
 src/changelog/2.22.1/.release-notes.adoc.ftl              | 4 +++-
 src/changelog/2.22.1/update_actions_upload_artifact.xml   | 8 --------
 .../2.22.1/update_ch_qos_logback_logback_classic.xml      | 8 --------
 .../update_co_elastic_clients_elasticsearch_java.xml      | 8 --------
 ...update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml | 8 --------
 src/changelog/2.22.1/update_github_codeql_action.xml      | 8 --------
 src/changelog/2.22.1/update_net_java_dev_jna_jna.xml      | 8 --------
 .../2.22.1/update_org_apache_activemq_activemq_broker.xml | 8 --------
 ...ries_spifly_org_apache_aries_spifly_dynamic_bundle.xml | 8 --------
 .../2.22.1/update_org_apache_maven_maven_core.xml         | 8 --------
 .../update_org_apache_maven_surefire_surefire_junit47.xml | 8 --------
 .../2.22.1/update_org_codehaus_plexus_plexus_utils.xml    | 8 --------
 ...rg_eclipse_persistence_org_eclipse_persistence_jpa.xml | 8 --------
 src/changelog/2.22.1/update_org_jmdns_jmdns.xml           | 8 --------
 14 files changed, 3 insertions(+), 105 deletions(-)
 delete mode 100644 src/changelog/2.22.1/update_actions_upload_artifact.xml
 delete mode 100644 src/changelog/2.22.1/update_ch_qos_logback_logback_classic.xml
 delete mode 100644 src/changelog/2.22.1/update_co_elastic_clients_elasticsearch_java.xml
 delete mode 100644 src/changelog/2.22.1/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml
 delete mode 100644 src/changelog/2.22.1/update_github_codeql_action.xml
 delete mode 100644 src/changelog/2.22.1/update_net_java_dev_jna_jna.xml
 delete mode 100644 src/changelog/2.22.1/update_org_apache_activemq_activemq_broker.xml
 delete mode 100644 src/changelog/2.22.1/update_org_apache_aries_spifly_org_apache_aries_spifly_dynamic_bundle.xml
 delete mode 100644 src/changelog/2.22.1/update_org_apache_maven_maven_core.xml
 delete mode 100644 src/changelog/2.22.1/update_org_apache_maven_surefire_surefire_junit47.xml
 delete mode 100644 src/changelog/2.22.1/update_org_codehaus_plexus_plexus_utils.xml
 delete mode 100644 src/changelog/2.22.1/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml
 delete mode 100644 src/changelog/2.22.1/update_org_jmdns_jmdns.xml

diff --git a/src/changelog/2.22.1/.release-notes.adoc.ftl b/src/changelog/2.22.1/.release-notes.adoc.ftl
index c95aa7ad698..c8c97b6557a 100644
--- a/src/changelog/2.22.1/.release-notes.adoc.ftl
+++ b/src/changelog/2.22.1/.release-notes.adoc.ftl
@@ -20,6 +20,8 @@
 
 <#if release.date?has_content>Release date:: ${release.date}</#if>
 
-This releases contains ...
+This releases fixes several issues from the previous releases.
+
+While maintaining compatibility with Java 8, the artifacts in this release where generated using JDK 17.
 
 <#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.22.1/update_actions_upload_artifact.xml b/src/changelog/2.22.1/update_actions_upload_artifact.xml
deleted file mode 100644
index d7eb238218b..00000000000
--- a/src/changelog/2.22.1/update_actions_upload_artifact.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2096" link="https://github.com/apache/logging-log4j2/pull/2096"/>
-  <description format="asciidoc">Update `actions/upload-artifact` to version `4.0.0`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_ch_qos_logback_logback_classic.xml b/src/changelog/2.22.1/update_ch_qos_logback_logback_classic.xml
deleted file mode 100644
index 12f4fca0519..00000000000
--- a/src/changelog/2.22.1/update_ch_qos_logback_logback_classic.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2029" link="https://github.com/apache/logging-log4j2/pull/2029"/>
-  <description format="asciidoc">Update `ch.qos.logback:logback-classic` to version `1.3.14`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_co_elastic_clients_elasticsearch_java.xml b/src/changelog/2.22.1/update_co_elastic_clients_elasticsearch_java.xml
deleted file mode 100644
index 7f4def21b54..00000000000
--- a/src/changelog/2.22.1/update_co_elastic_clients_elasticsearch_java.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2078" link="https://github.com/apache/logging-log4j2/pull/2078"/>
-  <description format="asciidoc">Update `co.elastic.clients:elasticsearch-java` to version `8.11.2`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml b/src/changelog/2.22.1/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml
deleted file mode 100644
index c5707cd7686..00000000000
--- a/src/changelog/2.22.1/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="1979" link="https://github.com/apache/logging-log4j2/pull/1979"/>
-  <description format="asciidoc">Update `de.flapdoodle.reverse:de.flapdoodle.reverse` to version `1.7.2`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_github_codeql_action.xml b/src/changelog/2.22.1/update_github_codeql_action.xml
deleted file mode 100644
index c2487b49af7..00000000000
--- a/src/changelog/2.22.1/update_github_codeql_action.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2093" link="https://github.com/apache/logging-log4j2/pull/2093"/>
-  <description format="asciidoc">Update `github/codeql-action` to version `3.22.11`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_net_java_dev_jna_jna.xml b/src/changelog/2.22.1/update_net_java_dev_jna_jna.xml
deleted file mode 100644
index 5f49029631d..00000000000
--- a/src/changelog/2.22.1/update_net_java_dev_jna_jna.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2081" link="https://github.com/apache/logging-log4j2/pull/2081"/>
-  <description format="asciidoc">Update `net.java.dev.jna:jna` to version `5.14.0`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_org_apache_activemq_activemq_broker.xml b/src/changelog/2.22.1/update_org_apache_activemq_activemq_broker.xml
deleted file mode 100644
index c3e2879474b..00000000000
--- a/src/changelog/2.22.1/update_org_apache_activemq_activemq_broker.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2043" link="https://github.com/apache/logging-log4j2/pull/2043"/>
-  <description format="asciidoc">Update `org.apache.activemq:activemq-broker` to version `6.0.1`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_org_apache_aries_spifly_org_apache_aries_spifly_dynamic_bundle.xml b/src/changelog/2.22.1/update_org_apache_aries_spifly_org_apache_aries_spifly_dynamic_bundle.xml
deleted file mode 100644
index a7361a977a3..00000000000
--- a/src/changelog/2.22.1/update_org_apache_aries_spifly_org_apache_aries_spifly_dynamic_bundle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2058" link="https://github.com/apache/logging-log4j2/pull/2058"/>
-  <description format="asciidoc">Update `org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle` to version `1.3.7`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_org_apache_maven_maven_core.xml b/src/changelog/2.22.1/update_org_apache_maven_maven_core.xml
deleted file mode 100644
index 69d83a194f9..00000000000
--- a/src/changelog/2.22.1/update_org_apache_maven_maven_core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2040" link="https://github.com/apache/logging-log4j2/pull/2040"/>
-  <description format="asciidoc">Update `org.apache.maven:maven-core` to version `3.9.6`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_org_apache_maven_surefire_surefire_junit47.xml b/src/changelog/2.22.1/update_org_apache_maven_surefire_surefire_junit47.xml
deleted file mode 100644
index b2af327bac3..00000000000
--- a/src/changelog/2.22.1/update_org_apache_maven_surefire_surefire_junit47.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2088" link="https://github.com/apache/logging-log4j2/pull/2088"/>
-  <description format="asciidoc">Update `org.apache.maven.surefire:surefire-junit47` to version `3.2.3`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_org_codehaus_plexus_plexus_utils.xml b/src/changelog/2.22.1/update_org_codehaus_plexus_plexus_utils.xml
deleted file mode 100644
index 24276e27e78..00000000000
--- a/src/changelog/2.22.1/update_org_codehaus_plexus_plexus_utils.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2056" link="https://github.com/apache/logging-log4j2/pull/2056"/>
-  <description format="asciidoc">Update `org.codehaus.plexus:plexus-utils` to version `3.5.1`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml b/src/changelog/2.22.1/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml
deleted file mode 100644
index 010ecba8673..00000000000
--- a/src/changelog/2.22.1/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2094" link="https://github.com/apache/logging-log4j2/pull/2094"/>
-  <description format="asciidoc">Update `org.eclipse.persistence:org.eclipse.persistence.jpa` to version `2.7.14`</description>
-</entry>
diff --git a/src/changelog/2.22.1/update_org_jmdns_jmdns.xml b/src/changelog/2.22.1/update_org_jmdns_jmdns.xml
deleted file mode 100644
index 20d46d5a483..00000000000
--- a/src/changelog/2.22.1/update_org_jmdns_jmdns.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"
-       type="updated">
-  <issue id="2067" link="https://github.com/apache/logging-log4j2/pull/2067"/>
-  <description format="asciidoc">Update `org.jmdns:jmdns` to version `3.5.9`</description>
-</entry>