This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 91d16c36f Fix formatting of XML schema files
91d16c36f is described below
commit 91d16c36f1c90226df4b891f81184140cf805c3c
Author: Michael Osipov <[email protected]>
AuthorDate: Tue Oct 29 12:07:42 2024 +0100
Fix formatting of XML schema files
---
.../src/site/resources/xsd/failsafe-summary.xsd | 42 +++-
.../site/resources/xsd/surefire-test-report.xsd | 215 +++++++++++----------
2 files changed, 149 insertions(+), 108 deletions(-)
diff --git a/maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xsd
b/maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xsd
index dca134b09..c412ec59e 100644
--- a/maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xsd
+++ b/maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xsd
@@ -1 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!-- ~ 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.
--> <xsd:schema version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
<xsd:element name="failsafe-summary"> <xsd:complexType>
<xsd:sequence> <xsd:element name="completed"
type="xsd:int"/> <xsd:element name="errors" type="xsd:int"/>
<xsd:element name="failures" type="xsd:int"/>
<xsd:element name="skipped" type="xsd:int"/> <xsd:element
name="failureMessage" type="xsd:string" nillable="true"/>
</xsd:sequence> <xsd:attribute name="result" type="errorType"
use="optional"/> <xsd:attribute name="timeout" type="xsd:boolean"
use="required"/> </xsd:complexType> </xsd:element>
<xsd:simpleType name="errorType"> <xsd:restriction base="xsd:string">
<xsd:enumeration id="FAILURE" value="255"/>
<xsd:enumeration id="NO_TESTS" value="254"/> </xsd:restriction>
</xsd:simpleType> </xsd:schema>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+~ 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.
+-->
+<xsd:schema version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <xsd:element name="failsafe-summary">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="completed" type="xsd:int"/>
+ <xsd:element name="errors" type="xsd:int"/>
+ <xsd:element name="failures" type="xsd:int"/>
+ <xsd:element name="skipped" type="xsd:int"/>
+ <xsd:element name="failureMessage" type="xsd:string" nillable="true"/>
+ </xsd:sequence>
+ <xsd:attribute name="result" type="errorType" use="optional"/>
+ <xsd:attribute name="timeout" type="xsd:boolean" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:simpleType name="errorType">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration id="FAILURE" value="255"/>
+ <xsd:enumeration id="NO_TESTS" value="254"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+</xsd:schema>
+
diff --git
a/maven-surefire-plugin/src/site/resources/xsd/surefire-test-report.xsd
b/maven-surefire-plugin/src/site/resources/xsd/surefire-test-report.xsd
index e6a1e5c20..a70bed30d 100644
--- a/maven-surefire-plugin/src/site/resources/xsd/surefire-test-report.xsd
+++ b/maven-surefire-plugin/src/site/resources/xsd/surefire-test-report.xsd
@@ -18,115 +18,116 @@
~ under the License.
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; version="3.0.2">
- <xs:element name="testsuite">
- <xs:complexType>
+ <xs:element name="testsuite">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="properties" minOccurs="0">
+ <xs:complexType>
<xs:sequence>
- <xs:element name="properties" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="property" minOccurs="0"
maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string"
use="required"/>
- <xs:attribute name="value"
type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="testcase" minOccurs="0"
maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="failure" nillable="true"
minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="message"
type="xs:string"/>
- <xs:attribute name="type"
type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="rerunFailure" minOccurs="0"
maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="stackTrace"
type="xs:string"/>
- <xs:element name="system-out"
type="xs:string" minOccurs="0"/>
- <xs:element name="system-err"
type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="message"
type="xs:string"/>
- <xs:attribute name="type"
type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="flakyFailure" minOccurs="0"
maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="stackTrace"
type="xs:string"/>
- <xs:element name="system-out"
type="xs:string" minOccurs="0"/>
- <xs:element name="system-err"
type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="message"
type="xs:string"/>
- <xs:attribute name="type"
type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="skipped" nillable="true"
minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="message"
type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="error" nillable="true"
minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="message"
type="xs:string"/>
- <xs:attribute name="type"
type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="rerunError" minOccurs="0"
maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="stackTrace"
type="xs:string"/>
- <xs:element name="system-out"
type="xs:string" minOccurs="0"/>
- <xs:element name="system-err"
type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="message"
type="xs:string"/>
- <xs:attribute name="type"
type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="flakyError" minOccurs="0"
maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="stackTrace"
type="xs:string"/>
- <xs:element name="system-out"
type="xs:string" minOccurs="0"/>
- <xs:element name="system-err"
type="xs:string" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="message"
type="xs:string"/>
- <xs:attribute name="type"
type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="system-out" type="xs:string"
minOccurs="0"/>
- <xs:element name="system-err" type="xs:string"
minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string"
use="required"/>
- <xs:attribute name="classname" type="xs:string"/>
- <xs:attribute name="group" type="xs:string"/>
- <xs:attribute name="time" type="xs:float"
use="required"/>
- </xs:complexType>
- </xs:element>
+ <xs:element name="property" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="value" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="testcase" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="failure" nillable="true" minOccurs="0"
maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="rerunFailure" minOccurs="0"
maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="stackTrace" type="xs:string"/>
+ <xs:element name="system-out" type="xs:string"
minOccurs="0"/>
+ <xs:element name="system-err" type="xs:string"
minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="message" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="flakyFailure" minOccurs="0"
maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="stackTrace" type="xs:string"/>
+ <xs:element name="system-out" type="xs:string"
minOccurs="0"/>
+ <xs:element name="system-err" type="xs:string"
minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="message" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="skipped" nillable="true" minOccurs="0"
maxOccurs="1">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="error" nillable="true" minOccurs="0"
maxOccurs="1">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="message" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="rerunError" minOccurs="0"
maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="stackTrace" type="xs:string"/>
+ <xs:element name="system-out" type="xs:string"
minOccurs="0"/>
+ <xs:element name="system-err" type="xs:string"
minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="message" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="flakyError" minOccurs="0"
maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="stackTrace" type="xs:string"/>
+ <xs:element name="system-out" type="xs:string"
minOccurs="0"/>
+ <xs:element name="system-err" type="xs:string"
minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="message" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="system-out" type="xs:string" minOccurs="0"/>
+ <xs:element name="system-err" type="xs:string" minOccurs="0"/>
</xs:sequence>
- <xs:attribute name="version" type="xs:string"/>
<xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="time" type="xs:float"/>
- <xs:attribute name="tests" type="xs:string" use="required"/>
- <xs:attribute name="errors" type="xs:string" use="required"/>
- <xs:attribute name="skipped" type="xs:string" use="required"/>
- <xs:attribute name="failures" type="xs:string" use="required"/>
+ <xs:attribute name="classname" type="xs:string"/>
<xs:attribute name="group" type="xs:string"/>
- </xs:complexType>
- </xs:element>
+ <xs:attribute name="time" type="xs:float" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="version" type="xs:string"/>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="time" type="xs:float"/>
+ <xs:attribute name="tests" type="xs:string" use="required"/>
+ <xs:attribute name="errors" type="xs:string" use="required"/>
+ <xs:attribute name="skipped" type="xs:string" use="required"/>
+ <xs:attribute name="failures" type="xs:string" use="required"/>
+ <xs:attribute name="group" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
+
