Modified: trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/pom.xml (40781 => 40782)
--- trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/pom.xml 2012-12-02 22:53:22 UTC (rev 40781)
+++ trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/pom.xml 2012-12-25 18:48:04 UTC (rev 40782)
@@ -1,48 +1,23 @@
-<!--
-/*******************************************************************************
-* Copyright (c) 2010-2011 Thales Corporate Services SAS *
-* Author : Gregory Boissinot *
-* *
-* Permission is hereby granted, free of charge, to any person obtaining a copy *
-* of this software and associated documentation files (the "Software"), to deal*
-* in the Software without restriction, including without limitation the rights *
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell *
-* copies of the Software, and to permit persons to whom the Software is *
-* furnished to do so, subject to the following conditions: *
-* *
-* The above copyright notice and this permission notice shall be included in *
-* all copies or substantial portions of the Software. *
-* *
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE *
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER *
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,*
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN *
-* THE SOFTWARE. *
-*******************************************************************************/
--->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.thalesgroup.dtkit</groupId>
+ <groupId>org.jenkins-ci.lib.dtkit</groupId>
<artifactId>dtkit-metrics-parent</artifactId>
- <version>9</version>
+ <version>11-SNAPSHOT</version>
</parent>
<artifactId>dtkit-junit-model</artifactId>
- <version>0.16.2-SNAPSHOT</version>
+ <version>0.17-SNAPSHOT</version>
<name>DTKit JUnit Model</name>
<properties>
- <frmk.model.version>0.14.1</frmk.model.version>
+ <frmk.model.version>0.18</frmk.model.version>
</properties>
<dependencies>
<dependency>
- <groupId>com.thalesgroup.dtkit</groupId>
+ <groupId>org.jenkins-ci.lib.dtkit</groupId>
<artifactId>dtkit-metrics-model</artifactId>
<version>${frmk.model.version}</version>
</dependency>
@@ -108,6 +83,19 @@
<goal>xjc</goal>
</goals>
</execution>
+ <execution>
+ <id>junitv5</id>
+ <configuration>
+ <schemaDirectory>${basedir}/src/main/resources/com/thalesgroup/dtkit/junit/model/xsd
+ </schemaDirectory>
+ <schemaFiles>junit-5.xsd</schemaFiles>
+ <staleFile>${project.build.directory}/generated-sources/jaxb/junitv5/.staleFlag.</staleFile>
+ <clearOutputDir>false</clearOutputDir>
+ </configuration>
+ <goals>
+ <goal>xjc</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
Added: trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/java/com/thalesgroup/dtkit/junit/model/JUnit5.java (0 => 40782)
--- trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/java/com/thalesgroup/dtkit/junit/model/JUnit5.java (rev 0)
+++ trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/java/com/thalesgroup/dtkit/junit/model/JUnit5.java 2012-12-25 18:48:04 UTC (rev 40782)
@@ -0,0 +1,40 @@
+package com.thalesgroup.dtkit.junit.model;
+
+import com.thalesgroup.dtkit.metrics.model.AbstractOutputMetric;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import java.io.Serializable;
+
+/**
+ * @author Gregory Boissinot
+ */
+@XmlAccessorType(XmlAccessType.PROPERTY)
+public class JUnit5 extends AbstractOutputMetric implements Serializable {
+
+ @Override
+ @XmlElement
+ public String getKey() {
+ return "junit";
+ }
+
+ @Override
+ @XmlElement
+ public String getDescription() {
+ return "JUNIT OUTPUT FORMAT 5.0";
+ }
+
+ @Override
+ @XmlElement
+ public String getVersion() {
+ return "5.0";
+ }
+
+ @Override
+ @XmlElement
+ public String[] getXsdNameList() {
+ return new String[]{"xsd/junit-5.xsd"};
+ }
+}
+
Modified: trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/java/com/thalesgroup/dtkit/junit/model/JUnitModel.java (40781 => 40782)
--- trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/java/com/thalesgroup/dtkit/junit/model/JUnitModel.java 2012-12-02 22:53:22 UTC (rev 40781)
+++ trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/java/com/thalesgroup/dtkit/junit/model/JUnitModel.java 2012-12-25 18:48:04 UTC (rev 40782)
@@ -60,4 +60,12 @@
set(new ValidationService());
}
};
+
+ @SuppressWarnings("unused")
+ public static JUnit5 OUTPUT_JUNIT_5 = new JUnit5() {
+ {
+ set(new ValidationService());
+ }
+ };
+
}
Added: trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/resources/com/thalesgroup/dtkit/junit/model/xsd/junit-5.xsd (0 => 40782)
--- trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/resources/com/thalesgroup/dtkit/junit/model/xsd/junit-5.xsd (rev 0)
+++ trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/resources/com/thalesgroup/dtkit/junit/model/xsd/junit-5.xsd 2012-12-25 18:48:04 UTC (rev 40782)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="failure">
+ <xs:complexType mixed="true">
+ <xs:attribute name="type" type="xs:string" use="optional"/>
+ <xs:attribute name="message" type="xs:string" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="error">
+ <xs:complexType mixed="true">
+ <xs:attribute name="type" type="xs:string" use="optional"/>
+ <xs:attribute name="message" type="xs:string" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="skipped">
+ <xs:complexType mixed="true">
+ <xs:attribute name="type" type="xs:string" use="optional"/>
+ <xs:attribute name="message" type="xs:string" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="properties">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="property" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="property">
+ <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:element name="system-err" type="xs:string"/>
+ <xs:element name="system-out" type="xs:string"/>
+
+ <xs:element name="testcase">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="skipped" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="error" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="failure" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="system-out" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="system-err" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="assertions" type="xs:string" use="optional"/>
+ <xs:attribute name="time" type="xs:string" use="optional"/>
+ <xs:attribute name="classname" type="xs:string" use="optional"/>
+ <xs:attribute name="status" type="xs:string" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="testsuite">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="properties" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="testcase" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="system-out" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="system-err" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="tests" type="xs:string" use="required"/>
+ <xs:attribute name="failures" type="xs:string" use="optional"/>
+ <xs:attribute name="errors" type="xs:string" use="optional"/>
+ <xs:attribute name="time" type="xs:string" use="optional"/>
+ <xs:attribute name="disabled" type="xs:string" use="optional"/>
+ <xs:attribute name="skipped" type="xs:string" use="optional"/>
+ <xs:attribute name="timestamp" type="xs:string" use="optional"/>
+ <xs:attribute name="hostname" type="xs:string" use="optional"/>
+ <xs:attribute name="id" type="xs:string" use="optional"/>
+ <xs:attribute name="package" type="xs:string" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="testsuites">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="testsuite" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="optional"/>
+ <xs:attribute name="time" type="xs:string" use="optional"/>
+ <xs:attribute name="tests" type="xs:string" use="optional"/>
+ <xs:attribute name="failures" type="xs:string" use="optional"/>
+ <xs:attribute name="disabled" type="xs:string" use="optional"/>
+ <xs:attribute name="errors" type="xs:string" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+
+
+</xs:schema>
\ No newline at end of file
Modified: trunk/hudson/dtkit/dtkit-format/pom.xml (40781 => 40782)
--- trunk/hudson/dtkit/dtkit-format/pom.xml 2012-12-02 22:53:22 UTC (rev 40781)
+++ trunk/hudson/dtkit/dtkit-format/pom.xml 2012-12-25 18:48:04 UTC (rev 40782)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.thalesgroup.dtkit</groupId>
+ <groupId>org.jenkins-ci.lib.dtkit</groupId>
<artifactId>dtkit-format</artifactId>
<version>1</version>
<packaging>pom</packaging>
