This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/1.3.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git
The following commit(s) were added to refs/heads/release/1.3.0 by this push:
new b273cfb Release changelog for version `1.3.0`
b273cfb is described below
commit b273cfb450898f079d2fd10b575330bfb900101b
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Thu Sep 28 15:09:20 2023 +0200
Release changelog for version `1.3.0`
---
.../1.3.0/.release-notes.adoc.ftl} | 23 +++++++++++-----------
src/changelog/1.3.0/.release.xml | 21 ++++++++++++++++++++
.../{.1.x.x => 1.3.0}/28-Update_Log4j_baseline.xml | 0
.../29-Add_extension_property_for_logger.xml | 0
.../30-Add_facade_APIs_for_ThreadContext.xml | 0
.../{.1.x.x => 1.3.0}/32-Catching_Throwing.xml | 0
src/changelog/{.1.x.x => 1.3.0}/37-facelift.xml | 0
src/changelog/{.1.x.x => 1.3.0}/JPMS.xml | 0
.../{.1.x.x => 1.3.0}/OSGi-Bundle-SymbolicName.xml | 0
src/changelog/{.1.x.x => 1.3.0}/junit5.xml | 0
.../{.1.x.x => 1.3.0}/kotlin-baseline.xml | 0
src/site/_release-notes.adoc | 2 +-
.../_release-notes/{_1.x.x.adoc => _1.3.0.adoc} | 6 +++---
src/site/_release-notes/_1.x.x.adoc | 15 --------------
14 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/src/site/_release-notes.adoc
b/src/changelog/1.3.0/.release-notes.adoc.ftl
similarity index 69%
copy from src/site/_release-notes.adoc
copy to src/changelog/1.3.0/.release-notes.adoc.ftl
index 6fbed8f..a0d914e 100644
--- a/src/site/_release-notes.adoc
+++ b/src/changelog/1.3.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,21 +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/_1.x.x.adoc[]
-include::_release-notes/_1.2.0.adoc[]
-include::_release-notes/_1.1.0.adoc[]
-include::_release-notes/_1.0.0.adoc[]
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This minor release bumps the Kotlin baseline to 1.6.21 and contains various
small improvements.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/1.3.0/.release.xml b/src/changelog/1.3.0/.release.xml
new file mode 100644
index 0000000..c75a4a9
--- /dev/null
+++ b/src/changelog/1.3.0/.release.xml
@@ -0,0 +1,21 @@
+<?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.0.xsd"
+ date="2023-09-28" version="1.3.0"/>
diff --git a/src/changelog/.1.x.x/28-Update_Log4j_baseline.xml
b/src/changelog/1.3.0/28-Update_Log4j_baseline.xml
similarity index 100%
rename from src/changelog/.1.x.x/28-Update_Log4j_baseline.xml
rename to src/changelog/1.3.0/28-Update_Log4j_baseline.xml
diff --git a/src/changelog/.1.x.x/29-Add_extension_property_for_logger.xml
b/src/changelog/1.3.0/29-Add_extension_property_for_logger.xml
similarity index 100%
rename from src/changelog/.1.x.x/29-Add_extension_property_for_logger.xml
rename to src/changelog/1.3.0/29-Add_extension_property_for_logger.xml
diff --git a/src/changelog/.1.x.x/30-Add_facade_APIs_for_ThreadContext.xml
b/src/changelog/1.3.0/30-Add_facade_APIs_for_ThreadContext.xml
similarity index 100%
rename from src/changelog/.1.x.x/30-Add_facade_APIs_for_ThreadContext.xml
rename to src/changelog/1.3.0/30-Add_facade_APIs_for_ThreadContext.xml
diff --git a/src/changelog/.1.x.x/32-Catching_Throwing.xml
b/src/changelog/1.3.0/32-Catching_Throwing.xml
similarity index 100%
rename from src/changelog/.1.x.x/32-Catching_Throwing.xml
rename to src/changelog/1.3.0/32-Catching_Throwing.xml
diff --git a/src/changelog/.1.x.x/37-facelift.xml
b/src/changelog/1.3.0/37-facelift.xml
similarity index 100%
rename from src/changelog/.1.x.x/37-facelift.xml
rename to src/changelog/1.3.0/37-facelift.xml
diff --git a/src/changelog/.1.x.x/JPMS.xml b/src/changelog/1.3.0/JPMS.xml
similarity index 100%
rename from src/changelog/.1.x.x/JPMS.xml
rename to src/changelog/1.3.0/JPMS.xml
diff --git a/src/changelog/.1.x.x/OSGi-Bundle-SymbolicName.xml
b/src/changelog/1.3.0/OSGi-Bundle-SymbolicName.xml
similarity index 100%
rename from src/changelog/.1.x.x/OSGi-Bundle-SymbolicName.xml
rename to src/changelog/1.3.0/OSGi-Bundle-SymbolicName.xml
diff --git a/src/changelog/.1.x.x/junit5.xml b/src/changelog/1.3.0/junit5.xml
similarity index 100%
rename from src/changelog/.1.x.x/junit5.xml
rename to src/changelog/1.3.0/junit5.xml
diff --git a/src/changelog/.1.x.x/kotlin-baseline.xml
b/src/changelog/1.3.0/kotlin-baseline.xml
similarity index 100%
rename from src/changelog/.1.x.x/kotlin-baseline.xml
rename to src/changelog/1.3.0/kotlin-baseline.xml
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 6fbed8f..04a78f0 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
[#release-notes]
== Release Notes
-include::_release-notes/_1.x.x.adoc[]
+include::_release-notes/_1.3.0.adoc[]
include::_release-notes/_1.2.0.adoc[]
include::_release-notes/_1.1.0.adoc[]
include::_release-notes/_1.0.0.adoc[]
diff --git a/src/site/_release-notes/_1.x.x.adoc
b/src/site/_release-notes/_1.3.0.adoc
similarity index 98%
copy from src/site/_release-notes/_1.x.x.adoc
copy to src/site/_release-notes/_1.3.0.adoc
index 151f5b7..f3acc7b 100644
--- a/src/site/_release-notes/_1.x.x.adoc
+++ b/src/site/_release-notes/_1.3.0.adoc
@@ -33,10 +33,10 @@
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
////
-[#release-notes-1-x-x]
-=== 1.x.x
-
+[#release-notes-1-3-0]
+=== 1.3.0
+Release date:: 2023-09-28
This minor release bumps the Kotlin baseline to 1.6.21 and contains various
small improvements.
diff --git a/src/site/_release-notes/_1.x.x.adoc
b/src/site/_release-notes/_1.x.x.adoc
index 151f5b7..cc4cccf 100644
--- a/src/site/_release-notes/_1.x.x.adoc
+++ b/src/site/_release-notes/_1.x.x.adoc
@@ -40,18 +40,3 @@
This minor release bumps the Kotlin baseline to 1.6.21 and contains various
small improvements.
-
-==== Added
-
-* Added an extension property for storing a cached logger
(https://github.com/apache/logging-log4j-kotlin/issues/29[29])
-* Added facade APIs for manipulating the context map and stack
(https://github.com/apache/logging-log4j-kotlin/issues/30[30])
-* Added missing `catching` and `throwing` API methods in `KotlinLogger`
(https://github.com/apache/logging-log4j-kotlin/issues/32[32])
-* Added JPMS support and used `org.apache.logging.log4j.api_kotlin` for the
module name (identical to OSGi `Bundle-SymbolicName`) of the `log4j-api-kotlin`
artifact
-
-==== Changed
-
-* Updated Log4j dependency to `2.20.0`
-* Bumped `logging-parent` version to `10.1.0` and overhauled the entire
project infrastructure to take advantage of its goodies
(https://github.com/apache/logging-log4j-kotlin/pull/37[37])
-* Renamed OSGi `Bundle-SymbolicName` from `org.apache.logging.log4j.kotlin` to
`org.apache.logging.log4j.api_kotlin`
-* Migrated tests to JUnit 5
-* Bumped Kotlin and Kotlin Extensions baseline to `1.6.21` and `1.6.4`
respectively