This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch release/2.21.1
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jmx-gui.git
The following commit(s) were added to refs/heads/release/2.21.1 by this push:
new 9732081 Migrate changelog to AsciiDoc
9732081 is described below
commit 97320814d4c057a311b3f144c8647012876624bc
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Thu Oct 19 21:13:14 2023 +0200
Migrate changelog to AsciiDoc
---
pom.xml | 2 +-
src/changelog/.2.x.x/.release-notes.adoc.ftl | 43 ++++++++++++++++++++++
.../{.changelog.md.ftl => .changelog.adoc.ftl} | 6 +--
src/changelog/2.21.0/.release-notes.adoc.ftl | 24 ++++++++++++
src/changelog/2.21.0/.release-notes.md.ftl | 22 -----------
src/site/_release-notes/_2.21.0.adoc | 27 ++++++++++++++
6 files changed, 98 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index a177664..d416f44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
<properties>
<!-- For reproducible builds -->
-
<project.build.outputTimestamp>2023-10-20T18:29:45+02:00</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2023-10-22T19:33:34+02:00</project.build.outputTimestamp>
<!-- project version -->
<revision>2.21.1</revision>
diff --git a/src/changelog/.2.x.x/.release-notes.adoc.ftl
b/src/changelog/.2.x.x/.release-notes.adoc.ftl
new file mode 100644
index 0000000..b220984
--- /dev/null
+++ b/src/changelog/.2.x.x/.release-notes.adoc.ftl
@@ -0,0 +1,43 @@
+////
+ 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 several small improvements.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/.changelog.md.ftl b/src/changelog/.changelog.adoc.ftl
similarity index 76%
rename from src/changelog/.changelog.md.ftl
rename to src/changelog/.changelog.adoc.ftl
index 497caaa..ebd41f0 100644
--- a/src/changelog/.changelog.md.ftl
+++ b/src/changelog/.changelog.adoc.ftl
@@ -14,13 +14,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<#if entriesByType?size gt 0>## Changes
+<#if entriesByType?size gt 0>
<#list entriesByType as entryType, entries>
-### ${entryType?capitalize}
+==== ${entryType?capitalize}
<#list entries as entry>
-* ${entry.description.text?replace("\\s+", " ", "r")}<#if
entry.issues?has_content> (<#list entry.issues as issue><#if
issue.link?starts_with("https://github.com/apache/logging-log4j-jmx-gui";)>#${issue.id}<#else>[${issue.id}](${issue.link})</#if><#if
issue?has_next>, </#if></#list>)</#if>
+* ${entry.description.text?replace("\\s+", " ", "r")}<#if
entry.issues?has_content> (<#list entry.issues as
issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list>)</#if>
</#list>
</#list>
</#if>
diff --git a/src/changelog/2.21.0/.release-notes.adoc.ftl
b/src/changelog/2.21.0/.release-notes.adoc.ftl
new file mode 100644
index 0000000..156444a
--- /dev/null
+++ b/src/changelog/2.21.0/.release-notes.adoc.ftl
@@ -0,0 +1,24 @@
+////
+ 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.version}
+
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This marks the first release where the Log4j JMX GUI is released separately
from the Log4j itself.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.21.0/.release-notes.md.ftl
b/src/changelog/2.21.0/.release-notes.md.ftl
deleted file mode 100644
index d2635ca..0000000
--- a/src/changelog/2.21.0/.release-notes.md.ftl
+++ /dev/null
@@ -1,22 +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.
- -->
-
-# ${release.version}<#if release.date?has_content> (${release.date})</#if>
-
-This marks the first release where the Log4j JMX GUI is released separately
from the Log4j itself.
-
-<#include "../.changelog.md.ftl">
diff --git a/src/site/_release-notes/_2.21.0.adoc
b/src/site/_release-notes/_2.21.0.adoc
new file mode 100644
index 0000000..db5c38b
--- /dev/null
+++ b/src/site/_release-notes/_2.21.0.adoc
@@ -0,0 +1,27 @@
+////
+ 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.
+////
+
+=== 2.21.0
+
+Release date:: 2023-09-15
+
+This marks the first release where the Log4j JMX GUI is released separately
from the Log4j itself.
+
+
+==== Added
+
+* Project is moved to a new
[repository](https://github.com/apache/logging-log4j-jmx-gui) with its own
release cycle
