This is an automated email from the ASF dual-hosted git repository. rgupta pushed a commit to branch release/1.4.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git
commit 0e9fa8de9a3d565fa5c12dc39d3c93b5abf21c6e Author: Raman Gupta <[email protected]> AuthorDate: Wed Dec 6 19:15:37 2023 -0500 Changelog for `1.4.0` --- .../1.4.0/.release-notes.adoc.ftl} | 24 +++++++++---------- src/changelog/1.4.0/.release.xml | 21 +++++++++++++++++ src/changelog/1.4.0/54-thread-context.xml | 7 ++++++ src/site/_constants.adoc | 2 +- src/site/_release-notes.adoc | 1 + .../_1.4.0.adoc} | 27 ++++++++++++---------- 6 files changed, 57 insertions(+), 25 deletions(-) diff --git a/src/site/_release-notes.adoc b/src/changelog/1.4.0/.release-notes.adoc.ftl similarity index 70% copy from src/site/_release-notes.adoc copy to src/changelog/1.4.0/.release-notes.adoc.ftl index 2a90e46..ee1bac3 100644 --- a/src/site/_release-notes.adoc +++ b/src/changelog/1.4.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,22 +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.3.0.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 fixes incorrect coroutine context map and stack. + +<#include "../.changelog.adoc.ftl"> diff --git a/src/changelog/1.4.0/.release.xml b/src/changelog/1.4.0/.release.xml new file mode 100644 index 0000000..8cd9890 --- /dev/null +++ b/src/changelog/1.4.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.2.xsd"; + date="2023-12-11" version="1.4.0"/> diff --git a/src/changelog/1.4.0/54-thread-context.xml b/src/changelog/1.4.0/54-thread-context.xml new file mode 100644 index 0000000..10f0d35 --- /dev/null +++ b/src/changelog/1.4.0/54-thread-context.xml @@ -0,0 +1,7 @@ +<entry 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"; + type="changed"> + <issue id="54" link="https://github.com/apache/logging-log4j-kotlin/issues/54"/> + <description format="asciidoc">Coroutine context is not cleared properly, only appended to</description> +</entry> diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc index 306ee4b..1a67916 100644 --- a/src/site/_constants.adoc +++ b/src/site/_constants.adoc @@ -34,7 +34,7 @@ //// :project-github-url: https://github.com/apache/logging-log4j-kotlin -:project-version: 1.4.0-SNAPSHOT +:project-version: 1.4.0 :project-name: Log4j Kotlin API :project-id: log4j-kotlin :java-target-version: 8 diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc index 2a90e46..455b48a 100644 --- a/src/site/_release-notes.adoc +++ b/src/site/_release-notes.adoc @@ -37,6 +37,7 @@ == Release Notes include::_release-notes/_1.x.x.adoc[] +include::_release-notes/_1.4.0.adoc[] include::_release-notes/_1.3.0.adoc[] include::_release-notes/_1.2.0.adoc[] include::_release-notes/_1.1.0.adoc[] diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes/_1.4.0.adoc similarity index 70% copy from src/site/_release-notes.adoc copy to src/site/_release-notes/_1.4.0.adoc index 2a90e46..3d48343 100644 --- a/src/site/_release-notes.adoc +++ b/src/site/_release-notes/_1.4.0.adoc @@ -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,22 +22,25 @@ ██ ███ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ███ ███ ██ ██ ██ ██ ██ ████ ██ ██ ████ ██████ ██ - 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-1-4-0] +=== 1.4.0 -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[] +Release date:: 2023-12-11 + +This minor release fixes incorrect coroutine context map and stack. + + +==== Changed + +* Coroutine context is not cleared properly, only appended to (https://github.com/apache/logging-log4j-kotlin/issues/54[54])
