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:47 UTC

[logging-log4j-tools] 02/03: Minor `log4j-changelog` XSD improvements (#13)

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 1ec4bfb7a8b0566ff868a1d9a492b6f848d30eb0
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Jan 24 19:41:39 2023 +0100

    Minor `log4j-changelog` XSD improvements (#13)
---
 .editorconfig                                          |  2 +-
 CHANGELOG.adoc                                         |  2 ++
 log4j-changelog/src/main/resources/log4j-changelog.xsd | 11 ++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 4274445..6c3d154 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -56,7 +56,7 @@ ij_any_while_brace_force = always
 ij_java_doc_align_param_comments = false
 ij_java_doc_align_exception_comments = false
 
-[*.{xml,properties,yml,yaml,json}]
+[*.{xml,xsd,properties,yml,yaml,json}]
 indent_size = 2
 
 [*.{md,adoc}]
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index fe2ce95..37a456a 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -17,6 +17,8 @@ limitations under the License.
 
 == Unreleased
 
+* 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ı)
 
 == 0.1.0 (2023-01-10)
diff --git a/log4j-changelog/src/main/resources/log4j-changelog.xsd b/log4j-changelog/src/main/resources/log4j-changelog.xsd
index bf6993e..754aeb4 100644
--- a/log4j-changelog/src/main/resources/log4j-changelog.xsd
+++ b/log4j-changelog/src/main/resources/log4j-changelog.xsd
@@ -16,8 +16,10 @@
   limitations under the License.
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-  targetNamespace="https://logging.apache.org/log4j/changelog"
-  xmlns:cl="https://logging.apache.org/log4j/changelog" elementFormDefault="qualified">
+        targetNamespace="https://logging.apache.org/log4j/changelog"
+        xmlns:cl="https://logging.apache.org/log4j/changelog"
+        elementFormDefault="qualified"
+        version="0.1.0">
 
   <element name="release">
     <complexType>
@@ -25,7 +27,6 @@
         <extension base="string">
           <attribute name="version" use="required"/>
           <attribute name="date" type="date" use="required"/>
-          <attribute name="schemaVersion" use="required" fixed="1.0"/>
         </extension>
       </simpleContent>
     </complexType>
@@ -39,7 +40,6 @@
         <element name="description" type="cl:descriptionType"/>
       </sequence>
       <attribute name="type" type="cl:changeType" use="required"/>
-      <attribute name="schemaVersion" use="required" fixed="1.0"/>
     </complexType>
   </element>
 
@@ -67,7 +67,7 @@
     <simpleContent>
       <extension base="string">
         <attribute name="id" type="string"/>
-        <attribute name="name"/>
+        <attribute name="name" type="string"/>
       </extension>
     </simpleContent>
   </complexType>
@@ -79,4 +79,5 @@
       </extension>
     </simpleContent>
   </complexType>
+
 </schema>