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/13 09:04:47 UTC
(logging-log4j-tools) branch main updated (c2755c1 -> 5c20318)
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 c2755c1 Remove the redundant `distribution-attachment-count` CI argument
new def6437 Set the version to `0.6.0`
new 1474059 Release changelog for version `0.6.0`
new 5c20318 Add the `project.build.outputTimestamp` Maven property
The 3 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 | 11 ++++++++++-
src/changelog/{.0.x.x => 0.6.0}/.release-notes.adoc.ftl | 0
src/changelog/{0.4.0 => 0.6.0}/.release.xml | 2 +-
src/changelog/{.0.x.x => 0.6.0}/add-sbom.xml | 0
src/changelog/{.0.x.x => 0.6.0}/fix-bom.xml | 0
src/changelog/{.0.x.x => 0.6.0}/update-parent.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 2 +-
src/site/_release-notes/{_0.x.x.adoc => _0.6.0.adoc} | 6 +++---
src/site/_release-notes/_0.x.x.adoc | 12 ------------
10 files changed, 16 insertions(+), 19 deletions(-)
copy src/changelog/{.0.x.x => 0.6.0}/.release-notes.adoc.ftl (100%)
copy src/changelog/{0.4.0 => 0.6.0}/.release.xml (96%)
rename src/changelog/{.0.x.x => 0.6.0}/add-sbom.xml (100%)
rename src/changelog/{.0.x.x => 0.6.0}/fix-bom.xml (100%)
rename src/changelog/{.0.x.x => 0.6.0}/update-parent.xml (100%)
copy src/site/_release-notes/{_0.x.x.adoc => _0.6.0.adoc} (97%)
(logging-log4j-tools) 02/03: Release changelog for version `0.6.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 1474059749862415712820e4645de4d5b5b1655e
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Mon Nov 13 08:46:54 2023 +0000
Release changelog for version `0.6.0`
---
.../0.6.0/.release-notes.adoc.ftl} | 19 ++++---------------
.../{.0.x.x/update-parent.xml => 0.6.0/.release.xml} | 10 ++++------
src/changelog/{.0.x.x => 0.6.0}/add-sbom.xml | 0
src/changelog/{.0.x.x => 0.6.0}/fix-bom.xml | 0
src/changelog/{.0.x.x => 0.6.0}/update-parent.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 2 +-
src/site/_release-notes/{_0.x.x.adoc => _0.6.0.adoc} | 6 +++---
src/site/_release-notes/_0.x.x.adoc | 12 ------------
9 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/changelog/0.6.0/.release-notes.adoc.ftl
similarity index 83%
copy from src/site/_release-notes/_0.x.x.adoc
copy to src/changelog/0.6.0/.release-notes.adoc.ftl
index 6c70f68..8ffd747 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/changelog/0.6.0/.release-notes.adoc.ftl
@@ -33,22 +33,11 @@
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
////
-[#release-notes-0-x-x]
-=== 0.x.x
-
+[#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.
-
-==== 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.
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/.0.x.x/update-parent.xml b/src/changelog/0.6.0/.release.xml
similarity index 69%
copy from src/changelog/.0.x.x/update-parent.xml
copy to src/changelog/0.6.0/.release.xml
index ada6ad9..5b4c7e9 100644
--- a/src/changelog/.0.x.x/update-parent.xml
+++ b/src/changelog/0.6.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.2.xsd"
- type="changed">
- <description format="asciidoc">Update `org.apache.logging:logging-parent` to version `10.3.0`</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-11-13" version="0.6.0"/>
diff --git a/src/changelog/.0.x.x/add-sbom.xml b/src/changelog/0.6.0/add-sbom.xml
similarity index 100%
rename from src/changelog/.0.x.x/add-sbom.xml
rename to src/changelog/0.6.0/add-sbom.xml
diff --git a/src/changelog/.0.x.x/fix-bom.xml b/src/changelog/0.6.0/fix-bom.xml
similarity index 100%
rename from src/changelog/.0.x.x/fix-bom.xml
rename to src/changelog/0.6.0/fix-bom.xml
diff --git a/src/changelog/.0.x.x/update-parent.xml b/src/changelog/0.6.0/update-parent.xml
similarity index 100%
rename from src/changelog/.0.x.x/update-parent.xml
rename to src/changelog/0.6.0/update-parent.xml
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index f7e9360..0fe2d10 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.6.0-SNAPSHOT
+:project-version: 0.6.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 33cb92b..3d24771 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.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[]
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.6.0.adoc
similarity index 97%
copy from src/site/_release-notes/_0.x.x.adoc
copy to src/site/_release-notes/_0.6.0.adoc
index 6c70f68..a1c9454 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.6.0.adoc
@@ -33,10 +33,10 @@
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-6-0]
+=== 0.6.0
+Release date:: 2023-11-13
This minor release contains various bug fixes and improvements.
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc
index 6c70f68..5e8caa4 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.x.x.adoc
@@ -40,15 +40,3 @@
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.
(logging-log4j-tools) 03/03: Add the `project.build.outputTimestamp` Maven 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 5c20318f9b237372325b480ffd75d4f0d5bbe49f
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 13 10:04:48 2023 +0100
Add the `project.build.outputTimestamp` Maven property
---
pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pom.xml b/pom.xml
index 5b3273c..4552842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,15 @@
<!-- project version -->
<revision>0.6.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`.
+ Though inheriting this property has two undesired consequences:
+ 1. `artifact:compare` dumps an `ERROR` log stating that this `property should not be inherited but defined` (apache/logging-parent#50)
+ 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-13T09:04:19Z</project.build.outputTimestamp>
+
<!-- disable `maven-site-plugin`-->
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
(logging-log4j-tools) 01/03: Set the version to `0.6.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 def6437cd78e759c6af2c1cf1f9b38be1d21d15b
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Nov 13 09:43:32 2023 +0100
Set the version to `0.6.0`
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d9cc4fb..5b3273c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
<properties>
<!-- project version -->
- <revision>0.6.0-SNAPSHOT</revision>
+ <revision>0.6.0</revision>
<!-- disable `maven-site-plugin`-->
<maven.site.skip>true</maven.site.skip>