You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/11/15 14:28:04 UTC
(logging-log4j-tools) 07/08: Repair changelog broken from the `0.6.0` release attempt
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-tools.git
commit 37e3b2b810722cf1aa51848b5a57e79f16952970
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Wed Nov 15 15:19:39 2023 +0100
Repair changelog broken from the `0.6.0` release attempt
---
src/changelog/{0.6.0 => .0.x.x}/add-sbom.xml | 0
src/changelog/{0.6.0 => .0.x.x}/fix-bom.xml | 0
src/changelog/{0.6.0 => .0.x.x}/update-parent.xml | 0
src/changelog/0.6.0/.release-notes.adoc.ftl | 43 ------------------
src/changelog/0.6.0/.release.xml | 21 ---------
src/site/_release-notes.adoc | 2 +-
src/site/_release-notes/_0.6.0.adoc | 54 -----------------------
src/site/_release-notes/_0.x.x.adoc | 12 +++++
8 files changed, 13 insertions(+), 119 deletions(-)
diff --git a/src/changelog/0.6.0/add-sbom.xml b/src/changelog/.0.x.x/add-sbom.xml
similarity index 100%
rename from src/changelog/0.6.0/add-sbom.xml
rename to src/changelog/.0.x.x/add-sbom.xml
diff --git a/src/changelog/0.6.0/fix-bom.xml b/src/changelog/.0.x.x/fix-bom.xml
similarity index 100%
rename from src/changelog/0.6.0/fix-bom.xml
rename to src/changelog/.0.x.x/fix-bom.xml
diff --git a/src/changelog/0.6.0/update-parent.xml b/src/changelog/.0.x.x/update-parent.xml
similarity index 100%
rename from src/changelog/0.6.0/update-parent.xml
rename to src/changelog/.0.x.x/update-parent.xml
diff --git a/src/changelog/0.6.0/.release-notes.adoc.ftl b/src/changelog/0.6.0/.release-notes.adoc.ftl
deleted file mode 100644
index 8ffd747..0000000
--- a/src/changelog/0.6.0/.release-notes.adoc.ftl
+++ /dev/null
@@ -1,43 +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-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
-=== ${release.version}
-
-<#if release.date?has_content>Release date:: ${release.date}</#if>
-
-This minor release contains various bug fixes and improvements.
-
-<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/0.6.0/.release.xml b/src/changelog/0.6.0/.release.xml
deleted file mode 100644
index 5b4c7e9..0000000
--- a/src/changelog/0.6.0/.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="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"
- date="2023-11-13" version="0.6.0"/>
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 3d24771..33cb92b 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
[#release-notes]
== Release Notes
-include::_release-notes/_0.6.0.adoc[]
+include::_release-notes/_0.x.x.adoc[]
include::_release-notes/_0.5.0.adoc[]
include::_release-notes/_0.4.0.adoc[]
include::_release-notes/_0.3.0.adoc[]
diff --git a/src/site/_release-notes/_0.6.0.adoc b/src/site/_release-notes/_0.6.0.adoc
deleted file mode 100644
index a1c9454..0000000
--- a/src/site/_release-notes/_0.6.0.adoc
+++ /dev/null
@@ -1,54 +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-0-6-0]
-=== 0.6.0
-
-Release date:: 2023-11-13
-
-This minor release contains various bug fixes and improvements.
-
-
-==== Added
-
-* Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.3.0`
-
-==== Changed
-
-* Update `org.apache.logging:logging-parent` to version `10.3.0`
-
-==== Fixed
-
-* `log4j-tools-bom` was broken due to removed `parent` during flattening. This is automatically fixed by the recent `logging-parent` version `10.3.0` update.
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc
index 5e8caa4..6c70f68 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.x.x.adoc
@@ -40,3 +40,15 @@
This minor release contains various bug fixes and improvements.
+
+==== Added
+
+* Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.3.0`
+
+==== Changed
+
+* Update `org.apache.logging:logging-parent` to version `10.3.0`
+
+==== Fixed
+
+* `log4j-tools-bom` was broken due to removed `parent` during flattening. This is automatically fixed by the recent `logging-parent` version `10.3.0` update.