diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 7cd860960a..f158c68d1a 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1936,7 +1936,7 @@ private Artifact getShadefireArtifact() {
private StartupReportConfiguration getStartupReportConfiguration(String configChecksum, boolean isForking) {
SurefireStatelessReporter xmlReporter = statelessTestsetReporter == null
- ? new SurefireStatelessReporter(/*todo call def. constr.*/ isDisableXmlReport(), "3.0")
+ ? new SurefireStatelessReporter(/*todo call def. constr.*/ isDisableXmlReport(), "3.0.1")
: statelessTestsetReporter;
xmlReporter.setDisable(isDisableXmlReport()); // todo change to Boolean in the version 3.0.0-M6
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireStatelessReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireStatelessReporter.java
index 7e73432fb6..ebd7d0051f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireStatelessReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireStatelessReporter.java
@@ -41,13 +41,13 @@ public class SurefireStatelessReporter
* Activated in the injection point of MOJO.
*/
public SurefireStatelessReporter() {
- this(false, "3.0");
+ this(false, "3.0.1");
}
/**
* Activated if null injection point in MOJO.
* @param disable {@code true} to disable performing the report
- * @param version (xsd 3.0) version of the schema
+ * @param version version of the schema
*/
public SurefireStatelessReporter(boolean disable, String version) {
setDisable(disable);
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/junit5/JUnit5Xml30StatelessReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/junit5/JUnit5Xml30StatelessReporter.java
index 91182c5650..689a4caed8 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/junit5/JUnit5Xml30StatelessReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/junit5/JUnit5Xml30StatelessReporter.java
@@ -26,7 +26,7 @@
import org.apache.maven.surefire.extensions.StatelessReportEventListener;
/**
- * The extension of {@link StatelessReportEventListener xml reporter} based on XSD version 3.0 for JUnit5.
+ * The extension of {@link StatelessReportEventListener xml reporter} based on XSD version 3.0.1 for JUnit5.
* Selectively enables phrased classes, methods and report files upon JUnit5 annotation DisplayName.
*
* author Tibor Digana (tibor17)
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
index d3717fc7d4..5e1b0a87e3 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
@@ -67,7 +67,7 @@ public void testGetStartupReportConfiguration() throws Exception {
@Test
public void testGetStartupReportConfiguration2() throws Exception {
AbstractSurefireMojo surefirePlugin = new Mojo(null, null);
- SurefireStatelessReporter xmlReporter = new SurefireStatelessReporter(false, "3.0");
+ SurefireStatelessReporter xmlReporter = new SurefireStatelessReporter();
SurefireConsoleOutputReporter consoleReporter = new SurefireConsoleOutputReporter();
SurefireStatelessTestsetInfoReporter testsetInfoReporter = new SurefireStatelessTestsetInfoReporter();
setInternalState(surefirePlugin, "statelessTestsetReporter", xmlReporter);
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
index 71140a48e1..e034e2f56e 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
@@ -55,7 +55,7 @@ public void shouldCloneXmlReporter() {
@Test
public void shouldAssertToStringXmlReporter() {
SurefireStatelessReporter extension = new SurefireStatelessReporter();
- assertThat(extension.toString()).isEqualTo("SurefireStatelessReporter{version=3.0, disable=false}");
+ assertThat(extension.toString()).isEqualTo("SurefireStatelessReporter{version=3.0.1, disable=false}");
}
@Test
@@ -69,7 +69,7 @@ public void shouldCreateConsoleListener() {
reportsDirectory, reportNameSuffix, true, 5, schema, testClassMethodRunHistory);
SurefireStatelessReporter extension = new SurefireStatelessReporter();
- assertThat(extension.getVersion()).isEqualTo("3.0");
+ assertThat(extension.getVersion()).isEqualTo("3.0.1");
extension.setVersion("V3");
assertThat(extension.getVersion()).isEqualTo("V3");
@@ -128,7 +128,7 @@ public void shouldCloneJUnit5XmlReporter() {
public void shouldAssertToStringJUnit5ConsoleReporter() {
JUnit5Xml30StatelessReporter extension = new JUnit5Xml30StatelessReporter();
assertThat(extension.toString())
- .isEqualTo("JUnit5Xml30StatelessReporter{version=3.0, disable=false, "
+ .isEqualTo("JUnit5Xml30StatelessReporter{version=3.0.1, disable=false, "
+ "usePhrasedFileName=false, usePhrasedTestSuiteClassName=false, "
+ "usePhrasedTestCaseClassName=false, usePhrasedTestCaseMethodName=false}");
}
@@ -144,7 +144,7 @@ public void shouldCreateJUnit5ConsoleListener() {
reportsDirectory, reportNameSuffix, true, 5, schema, testClassMethodRunHistory);
JUnit5Xml30StatelessReporter extension = new JUnit5Xml30StatelessReporter();
- assertThat(extension.getVersion()).isEqualTo("3.0");
+ assertThat(extension.getVersion()).isEqualTo("3.0.1");
extension.setVersion("V3");
assertThat(extension.getVersion()).isEqualTo("V3");
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
index 19393bded0..ea2cfbc0b3 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
@@ -105,7 +105,7 @@ public void testFileNameWithoutSuffix() {
0,
new ConcurrentHashMap>(),
XSD,
- "3.0",
+ "3.0.1",
false,
false,
false,
@@ -165,7 +165,7 @@ public void testAllFieldsSerialized() throws IOException {
0,
new ConcurrentHashMap>(),
XSD,
- "3.0",
+ "3.0.1",
false,
false,
false,
@@ -267,7 +267,7 @@ public void testOutputRerunFlakyFailure() throws IOException {
1,
new HashMap>(),
XSD,
- "3.0",
+ "3.0.1",
false,
false,
false,
@@ -370,7 +370,7 @@ public void testOutputRerunFlakyAssumption() throws IOException {
rerunStats.testSucceeded(testTwoSecondError);
StatelessXmlReporter reporter = new StatelessXmlReporter(
- reportDir, null, false, 1, new HashMap<>(), XSD, "3.0", false, false, false, false);
+ reportDir, null, false, 1, new HashMap<>(), XSD, "3.0.1", false, false, false, false);
WrappedReportEntry testSetReportEntry = new WrappedReportEntry(
new SimpleReportEntry(
diff --git a/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm b/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
index 7e75af80c3..0ea31bc685 100644
--- a/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
@@ -5,7 +5,7 @@
------
2018-05-14
------
-
+
~~ 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
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
Using JUnit 5 Platform
@@ -632,7 +632,7 @@ else
false
- 3.0
+ 3.0.1
false
true
true
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 e19d6371c5..2c901dc6fd 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
@@ -17,7 +17,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
@@ -41,7 +41,7 @@
-
+
@@ -54,7 +54,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -82,7 +82,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
@@ -106,7 +106,7 @@
-
+
diff --git a/maven-surefire-report-plugin/src/test/resources/surefire-1894/TEST-surefire.MyTest.xml b/maven-surefire-report-plugin/src/test/resources/surefire-1894/TEST-surefire.MyTest.xml
index 4eb6d4557c..690513df88 100644
--- a/maven-surefire-report-plugin/src/test/resources/surefire-1894/TEST-surefire.MyTest.xml
+++ b/maven-surefire-report-plugin/src/test/resources/surefire-1894/TEST-surefire.MyTest.xml
@@ -1,5 +1,5 @@
-
+
@@ -41,4 +41,4 @@
... 26 more
-
\ No newline at end of file
+
diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
index 5d91fca168..021d122314 100644
--- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
@@ -40,7 +40,7 @@ public abstract class StatelessReporter3.0 used by default in XML reporter.
+ * Version of reporter. It is version 3.0.1 used by default in XML reporter.
*/
private String version;
@@ -62,7 +62,7 @@ public void setDisable(boolean disable) {
}
public String getVersion() {
- return isBlank(version) ? "3.0" : version;
+ return isBlank(version) ? "3.0.1" : version;
}
public void setVersion(String version) {
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
index 06d0756217..4679335141 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
@@ -48,6 +48,7 @@
@RunWith(Parameterized.class)
@SuppressWarnings("checkstyle:magicnumber")
public class JUnitPlatformEnginesIT extends SurefireJUnit4IntegrationTestCase {
+ // This must correspond to the Surefire version uses for testing
private static final String XML_TESTSUITE_FRAGMENT =
"
-
+
@@ -88,7 +88,7 @@
at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:495)
]]>
@@ -176,7 +176,7 @@
]]>
@@ -264,7 +264,7 @@
]]>
@@ -352,7 +352,7 @@
]]>
-
\ No newline at end of file
+