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/01/24 18:45:48 UTC
[logging-log4j-tools] 03/03: Removed `security` as a change type from `log4j-changelog` (#14)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
commit 48a66f9bfdbccf83861849a170838e87d05d1d74
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Jan 24 19:46:55 2023 +0100
Removed `security` as a change type from `log4j-changelog` (#14)
---
CHANGELOG.adoc | 2 ++
log4j-changelog/README.adoc | 3 +--
.../main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java | 4 +---
log4j-changelog/src/main/resources/log4j-changelog.xsd | 1 -
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 37a456a..ed63ff4 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -17,6 +17,8 @@ limitations under the License.
== Unreleased
+* Removed `security` as a change type from `log4j-changelog` (for https://github.com/apache/logging-log4j-tools/issues/14[#14] by Ralph Goers, Volkan Yazıcı)
+
* Added XSD for `log4j-changelog` XML files (for https://github.com/apache/logging-log4j-tools/issues/13[#13] by Piotr P. Karwasz, Volkan Yazıcı)
* Added `log4j-changelog-maven-plugin` module and renamed `log4j.changelog.exporter.outputDirectory` property to `log4j.changelog.outputDirectory` (for https://github.com/apache/logging-log4j-tools/issues/20[#20] by Ralph Goers, Volkan Yazıcı)
diff --git a/log4j-changelog/README.adoc b/log4j-changelog/README.adoc
index 7f8ba83..1e13468 100644
--- a/log4j-changelog/README.adoc
+++ b/log4j-changelog/README.adoc
@@ -174,13 +174,12 @@ A sample _changelog entry_ file is shared below.
Some remarks about the structure of changelog entry files:
* The root element must be named `entry`
-* `entry.type` attribute is required and must be one of the https://keepachangelog.com/en/1.0.0/#how[_Keep a Changelog_ change types]:
+* `entry.type` attribute is required and must be one of the change types:
** `added` – for new features
** `changed` – for changes in existing functionality
** `deprecated` – for soon-to-be removed features
** `removed` – for now removed features
** `fixed` – for any bug fixes
-** `security` – for vulnerabilities
* `issue` element is optional, and, if present, must contain `id` and `link` attributes
* `author` element must have at least one of `id` or `name` attributes
* There must be at least one `author`
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java
index 6d2b239..f31d36a 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java
@@ -48,9 +48,7 @@ public final class ChangelogEntry {
REMOVED,
- FIXED,
-
- SECURITY;
+ FIXED;
private String toXmlAttribute() {
return toString().toLowerCase(Locale.US);
diff --git a/log4j-changelog/src/main/resources/log4j-changelog.xsd b/log4j-changelog/src/main/resources/log4j-changelog.xsd
index 754aeb4..4f17b15 100644
--- a/log4j-changelog/src/main/resources/log4j-changelog.xsd
+++ b/log4j-changelog/src/main/resources/log4j-changelog.xsd
@@ -59,7 +59,6 @@
<enumeration value="deprecated"/>
<enumeration value="removed"/>
<enumeration value="fixed"/>
- <enumeration value="security"/>
</restriction>
</simpleType>