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/12/18 08:16:13 UTC
(logging-log4j-tools) branch main updated (4b65fad -> 2ded1ff)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
from 4b65fad Revert `logging-parent` action upgrade
new 86d4cd6 Set the version to `0.7.0`
new ffbcaaf Update the `project.build.outputTimestamp` property
new b7a1b09 Release changelog for version `0.7.0`
new 2ded1ff Set the version to `0.8.0-SNAPSHOT`
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 4 ++--
src/changelog/{.0.x.x => 0.7.0}/.release-notes.adoc.ftl | 0
src/changelog/{0.4.0 => 0.7.0}/.release.xml | 4 ++--
src/changelog/{.0.x.x => 0.7.0}/add-update-type.xml | 0
.../{.0.x.x => 0.7.0}/fix-changelog-entry-type-order.xml | 0
.../fix-releaser-on-empty-unreleased-dir.xml | 0
src/changelog/{.0.x.x => 0.7.0}/fix-releaser-regex.xml | 0
.../{.0.x.x => 0.7.0}/update_commons_io_commons_io.xml | 0
..._apache_maven_plugin_tools_maven_plugin_annotations.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 1 +
src/site/_release-notes/{_0.x.x.adoc => _0.7.0.adoc} | 13 ++++++-------
src/site/_release-notes/_0.x.x.adoc | 14 --------------
13 files changed, 12 insertions(+), 26 deletions(-)
copy src/changelog/{.0.x.x => 0.7.0}/.release-notes.adoc.ftl (100%)
copy src/changelog/{0.4.0 => 0.7.0}/.release.xml (90%)
rename src/changelog/{.0.x.x => 0.7.0}/add-update-type.xml (100%)
rename src/changelog/{.0.x.x => 0.7.0}/fix-changelog-entry-type-order.xml (100%)
rename src/changelog/{.0.x.x => 0.7.0}/fix-releaser-on-empty-unreleased-dir.xml (100%)
rename src/changelog/{.0.x.x => 0.7.0}/fix-releaser-regex.xml (100%)
rename src/changelog/{.0.x.x => 0.7.0}/update_commons_io_commons_io.xml (100%)
rename src/changelog/{.0.x.x => 0.7.0}/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml (100%)
copy src/site/_release-notes/{_0.x.x.adoc => _0.7.0.adoc} (92%)
(logging-log4j-tools) 04/04: Set the version to `0.8.0-SNAPSHOT`
Posted by vy...@apache.org.
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 2ded1ff42a0f2be3ffbb24afd7eccef0713fcd08
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Dec 18 09:15:11 2023 +0100
Set the version to `0.8.0-SNAPSHOT`
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3d2eaeb..0bd5370 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
<properties>
<!-- project version -->
- <revision>0.7.0</revision>
+ <revision>0.8.0-SNAPSHOT</revision>
<!-- `project.build.outputTimestamp` is required to be present for reproducible builds.
We actually inherit one from the `org.apache:apache` through our parent `org.apache.logging:logging-parent`.
(logging-log4j-tools) 03/04: Release changelog for version `0.7.0`
Posted by vy...@apache.org.
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 b7a1b091bb38cd026c577d33075104b690ea8c7a
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Dec 18 09:15:51 2023 +0100
Release changelog for version `0.7.0`
---
.../0.7.0/.release-notes.adoc.ftl} | 26 ++++++++++------------
.../.release.xml} | 10 ++++-----
.../{.0.x.x => 0.7.0}/add-update-type.xml | 0
.../fix-changelog-entry-type-order.xml | 0
.../fix-releaser-on-empty-unreleased-dir.xml | 0
.../{.0.x.x => 0.7.0}/fix-releaser-regex.xml | 0
.../update_commons_io_commons_io.xml | 0
...maven_plugin_tools_maven_plugin_annotations.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 1 +
.../_release-notes/{_0.x.x.adoc => _0.7.0.adoc} | 13 +++++------
src/site/_release-notes/_0.x.x.adoc | 14 ------------
12 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/src/site/_release-notes.adoc b/src/changelog/0.7.0/.release-notes.adoc.ftl
similarity index 70%
copy from src/site/_release-notes.adoc
copy to src/changelog/0.7.0/.release-notes.adoc.ftl
index 94a963d..8ffd747 100644
--- a/src/site/_release-notes.adoc
+++ b/src/changelog/0.7.0/.release-notes.adoc.ftl
@@ -6,7 +6,7 @@
(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
+ 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,
@@ -22,24 +22,22 @@
██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██
- IF THIS FILE IS CALLED `index.adoc`, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+ IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
- Release notes `index.adoc` is generated from `src/changelog/.index.adoc.ftl`.
+ 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. Edit `.index.adoc.ftl`
+ 1. Find and edit the associated `.release-notes.adoc.ftl`
2. Run `./mvnw generate-sources`
- 3. Commit both `.index.adoc.ftl` and the generated `.index.adoc`
+ 3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
////
-[#release-notes]
-== Release Notes
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+=== ${release.version}
-include::_release-notes/_0.x.x.adoc[]
-include::_release-notes/_0.6.0.adoc[]
-include::_release-notes/_0.5.0.adoc[]
-include::_release-notes/_0.4.0.adoc[]
-include::_release-notes/_0.3.0.adoc[]
-include::_release-notes/_0.2.0.adoc[]
-include::_release-notes/_0.1.0.adoc[]
+<#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.x.x/fix-changelog-entry-type-order.xml b/src/changelog/0.7.0/.release.xml
similarity index 70%
copy from src/changelog/.0.x.x/fix-changelog-entry-type-order.xml
copy to src/changelog/0.7.0/.release.xml
index b4776e4..1c37f36 100644
--- a/src/changelog/.0.x.x/fix-changelog-entry-type-order.xml
+++ b/src/changelog/0.7.0/.release.xml
@@ -15,9 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<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="fixed">
- <description format="asciidoc">Sort changelog entry types alphanumerically</description>
-</entry>
+<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-12-14" version="0.7.0"/>
diff --git a/src/changelog/.0.x.x/add-update-type.xml b/src/changelog/0.7.0/add-update-type.xml
similarity index 100%
rename from src/changelog/.0.x.x/add-update-type.xml
rename to src/changelog/0.7.0/add-update-type.xml
diff --git a/src/changelog/.0.x.x/fix-changelog-entry-type-order.xml b/src/changelog/0.7.0/fix-changelog-entry-type-order.xml
similarity index 100%
rename from src/changelog/.0.x.x/fix-changelog-entry-type-order.xml
rename to src/changelog/0.7.0/fix-changelog-entry-type-order.xml
diff --git a/src/changelog/.0.x.x/fix-releaser-on-empty-unreleased-dir.xml b/src/changelog/0.7.0/fix-releaser-on-empty-unreleased-dir.xml
similarity index 100%
rename from src/changelog/.0.x.x/fix-releaser-on-empty-unreleased-dir.xml
rename to src/changelog/0.7.0/fix-releaser-on-empty-unreleased-dir.xml
diff --git a/src/changelog/.0.x.x/fix-releaser-regex.xml b/src/changelog/0.7.0/fix-releaser-regex.xml
similarity index 100%
rename from src/changelog/.0.x.x/fix-releaser-regex.xml
rename to src/changelog/0.7.0/fix-releaser-regex.xml
diff --git a/src/changelog/.0.x.x/update_commons_io_commons_io.xml b/src/changelog/0.7.0/update_commons_io_commons_io.xml
similarity index 100%
rename from src/changelog/.0.x.x/update_commons_io_commons_io.xml
rename to src/changelog/0.7.0/update_commons_io_commons_io.xml
diff --git a/src/changelog/.0.x.x/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml b/src/changelog/0.7.0/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml
similarity index 100%
rename from src/changelog/.0.x.x/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml
rename to src/changelog/0.7.0/update_org_apache_maven_plugin_tools_maven_plugin_annotations.xml
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index 2124b18..0a233c3 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
////
:project-github-url: https://github.com/apache/logging-log4j-tools
-:project-version: 0.7.0-SNAPSHOT
+:project-version: 0.7.0
:project-name: Log4j Tools
:project-id: log4j-tools
:java-target-version: 8
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 94a963d..240afd2 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -37,6 +37,7 @@
== Release Notes
include::_release-notes/_0.x.x.adoc[]
+include::_release-notes/_0.7.0.adoc[]
include::_release-notes/_0.6.0.adoc[]
include::_release-notes/_0.5.0.adoc[]
include::_release-notes/_0.4.0.adoc[]
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.7.0.adoc
similarity index 92%
copy from src/site/_release-notes/_0.x.x.adoc
copy to src/site/_release-notes/_0.7.0.adoc
index ac02316..65e231e 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.7.0.adoc
@@ -33,27 +33,26 @@
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
////
-[#release-notes-0-x-x]
-=== 0.x.x
-
+[#release-notes-0-7-0]
+=== 0.7.0
+Release date:: 2023-12-14
This minor release contains various bug fixes and improvements.
-[#release-notes-0-x-x-added]
+[#release-notes-0-7-0-added]
==== Added
* Add the new `updated` changelog entry type and bump the XSD version to `0.1.3`
-[#release-notes-0-x-x-changed]
+[#release-notes-0-7-0-changed]
==== Changed
-* Update `apache/logging-parent` to version `` (https://github.com/apache/logging-log4j-tools/pull/91[91])
* Update `commons-io:commons-io` to version `2.15.1` (https://github.com/apache/logging-log4j-tools/pull/86[86])
* Update `org.apache.maven.plugin-tools:maven-plugin-annotations` to version `3.10.2` (https://github.com/apache/logging-log4j-tools/pull/87[87])
-[#release-notes-0-x-x-fixed]
+[#release-notes-0-7-0-fixed]
==== Fixed
* Sort changelog entry types alphanumerically
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc
index ac02316..67d3d21 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.x.x.adoc
@@ -41,21 +41,7 @@
This minor release contains various bug fixes and improvements.
-[#release-notes-0-x-x-added]
-==== Added
-
-* Add the new `updated` changelog entry type and bump the XSD version to `0.1.3`
-
[#release-notes-0-x-x-changed]
==== Changed
* Update `apache/logging-parent` to version `` (https://github.com/apache/logging-log4j-tools/pull/91[91])
-* Update `commons-io:commons-io` to version `2.15.1` (https://github.com/apache/logging-log4j-tools/pull/86[86])
-* Update `org.apache.maven.plugin-tools:maven-plugin-annotations` to version `3.10.2` (https://github.com/apache/logging-log4j-tools/pull/87[87])
-
-[#release-notes-0-x-x-fixed]
-==== Fixed
-
-* Sort changelog entry types alphanumerically
-* Fix `log4j-changelog:release` failure on empty unreleased changelog directory (https://github.com/apache/logging-log4j-tools/issues/90[90])
-* Fix parsing of patch versions in `log4j-changelog:release` goal (https://github.com/apache/logging-log4j-tools/issues/89[89])
(logging-log4j-tools) 02/04: Update the `project.build.outputTimestamp` property
Posted by vy...@apache.org.
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 ffbcaaf68f5d5db30c649eb0ec240c11de0011dc
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Thu Dec 14 11:03:29 2023 +0000
Update the `project.build.outputTimestamp` property
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 150d384..3d2eaeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
2. This value is employed in various places while creating the distribution
To mitigate these, we define a *dummy* value here and let the CI replace it during a release.
Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
- <project.build.outputTimestamp>2023-11-17T08:55:12Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-12-14T11:00:06Z</project.build.outputTimestamp>
<!-- disable `maven-site-plugin`-->
<maven.site.skip>true</maven.site.skip>
(logging-log4j-tools) 01/04: Set the version to `0.7.0`
Posted by vy...@apache.org.
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 86d4cd6ebac6849bd52a2f1500a53a04bd91d0f2
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Dec 14 12:00:06 2023 +0100
Set the version to `0.7.0`
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f339d88..150d384 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
<properties>
<!-- project version -->
- <revision>0.7.0-SNAPSHOT</revision>
+ <revision>0.7.0</revision>
<!-- `project.build.outputTimestamp` is required to be present for reproducible builds.
We actually inherit one from the `org.apache:apache` through our parent `org.apache.logging:logging-parent`.