This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.24.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.24.x by this push:
new a05d9217ed Revert "Prepare release notes for `2.24.1`"
a05d9217ed is described below
commit a05d9217eda94fda2554c14d12f6d3d335dac1cb
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Mon Sep 23 22:49:21 2024 +0200
Revert "Prepare release notes for `2.24.1`"
This reverts commit a01f7e41d4ab8bf0aa6eefa2c83c67b002e57cd5.
---
pom.xml | 9 ++++----
.../{2.24.1 => .2.x.x}/2229_mongodb_docker.xml | 0
...ke_LoggerRegistry_MessageFactory_namespaced.xml | 0
.../{2.24.1 => .2.x.x}/2937-http-watcher.xml | 0
.../2942_fix_ThreadContext_putAll.xml | 0
.../2953_enable_docker_for_JTL.xml | 0
.../update_org_apache_logging_logging_parent.xml | 0
src/changelog/2.24.1/.release-notes.adoc.ftl | 27 ----------------------
src/changelog/2.24.1/.release.xml | 21 -----------------
9 files changed, 4 insertions(+), 53 deletions(-)
diff --git a/pom.xml b/pom.xml
index ef780ffc40..35d64db194 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,11 +302,7 @@
<properties>
<!-- project version -->
- <revision>2.24.1</revision>
- <!-- Versions used on the site: no snapshots! -->
- <site-log4j-api.version>2.24.1</site-log4j-api.version>
- <site-log4j-core.version>2.24.1</site-log4j-core.version>
-
<site-log4j-layout-template-json.version>2.24.1</site-log4j-layout-template-json.version>
+ <revision>2.24.1-SNAPSHOT</revision>
<!-- =================
Common properties
@@ -347,6 +343,9 @@
<site-je.version>18.3.12</site-je.version>
<site-jeromq.version>0.6.0</site-jeromq.version>
<site-kafka.version>3.8.0</site-kafka.version>
+ <site-log4j-api.version>2.24.0</site-log4j-api.version>
+ <site-log4j-core.version>2.24.0</site-log4j-core.version>
+
<site-log4j-layout-template-json.version>2.24.0</site-log4j-layout-template-json.version>
<site-logback.version>1.5.5</site-logback.version>
<site-slf4j.version>2.0.16</site-slf4j.version>
diff --git a/src/changelog/2.24.1/2229_mongodb_docker.xml
b/src/changelog/.2.x.x/2229_mongodb_docker.xml
similarity index 100%
rename from src/changelog/2.24.1/2229_mongodb_docker.xml
rename to src/changelog/.2.x.x/2229_mongodb_docker.xml
diff --git
a/src/changelog/2.24.1/2936_make_LoggerRegistry_MessageFactory_namespaced.xml
b/src/changelog/.2.x.x/2936_make_LoggerRegistry_MessageFactory_namespaced.xml
similarity index 100%
rename from
src/changelog/2.24.1/2936_make_LoggerRegistry_MessageFactory_namespaced.xml
rename to
src/changelog/.2.x.x/2936_make_LoggerRegistry_MessageFactory_namespaced.xml
diff --git a/src/changelog/2.24.1/2937-http-watcher.xml
b/src/changelog/.2.x.x/2937-http-watcher.xml
similarity index 100%
rename from src/changelog/2.24.1/2937-http-watcher.xml
rename to src/changelog/.2.x.x/2937-http-watcher.xml
diff --git a/src/changelog/2.24.1/2942_fix_ThreadContext_putAll.xml
b/src/changelog/.2.x.x/2942_fix_ThreadContext_putAll.xml
similarity index 100%
rename from src/changelog/2.24.1/2942_fix_ThreadContext_putAll.xml
rename to src/changelog/.2.x.x/2942_fix_ThreadContext_putAll.xml
diff --git a/src/changelog/2.24.1/2953_enable_docker_for_JTL.xml
b/src/changelog/.2.x.x/2953_enable_docker_for_JTL.xml
similarity index 100%
rename from src/changelog/2.24.1/2953_enable_docker_for_JTL.xml
rename to src/changelog/.2.x.x/2953_enable_docker_for_JTL.xml
diff --git a/src/changelog/2.24.1/update_org_apache_logging_logging_parent.xml
b/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml
similarity index 100%
rename from src/changelog/2.24.1/update_org_apache_logging_logging_parent.xml
rename to src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml
diff --git a/src/changelog/2.24.1/.release-notes.adoc.ftl
b/src/changelog/2.24.1/.release-notes.adoc.ftl
deleted file mode 100644
index 085094cc99..0000000000
--- a/src/changelog/2.24.1/.release-notes.adoc.ftl
+++ /dev/null
@@ -1,27 +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
-
- 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.
-////
-
-[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
-== ${release.version}
-
-<#if release.date?has_content>Release date:: ${release.date}</#if>
-
-This releases contains only bug fixes of problems encountered with the thread
context map, logger registry and configuration reloading.
-
-It also enhances integration tests to use Docker images of the most recent
releases of MongoDB and Elastic Search.
-
-<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.24.1/.release.xml
b/src/changelog/2.24.1/.release.xml
deleted file mode 100644
index 1cb6cb8e14..0000000000
--- a/src/changelog/2.24.1/.release.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="https://logging.apache.org/xml/ns";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
- date="2024-09-23" version="2.24.1"/>
