Skip to content

Commit c19d857

Browse files
committed
Fix schema locations in code which lead to 404
1 parent 9a43d06 commit c19d857

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ protected String[] getDefaultIncludes() {
601601

602602
@Override
603603
protected String getReportSchemaLocation() {
604-
return "https://maven.apache.org/surefire/maven-failsafe-plugin/xsd/failsafe-test-report-3.0.xsd";
604+
return "https://maven.apache.org/surefire/maven-failsafe-plugin/xsd/failsafe-test-report.xsd";
605605
}
606606

607607
@Override

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void shouldCreateConsoleListener() {
6363
File target = new File(System.getProperty("user.dir"), "target");
6464
File reportsDirectory = new File(target, "surefire-reports");
6565
String reportNameSuffix = "suffix";
66-
String schema = "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd";
66+
String schema = "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd";
6767
Map<String, Deque<WrappedReportEntry>> testClassMethodRunHistory = new HashMap<>();
6868
DefaultStatelessReportMojoConfiguration config = new DefaultStatelessReportMojoConfiguration(
6969
reportsDirectory, reportNameSuffix, true, 5, schema, testClassMethodRunHistory);
@@ -138,7 +138,7 @@ public void shouldCreateJUnit5ConsoleListener() {
138138
File target = new File(System.getProperty("user.dir"), "target");
139139
File reportsDirectory = new File(target, "surefire-reports");
140140
String reportNameSuffix = "suffix";
141-
String schema = "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd";
141+
String schema = "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd";
142142
Map<String, Deque<WrappedReportEntry>> testClassMethodRunHistory = new HashMap<>();
143143
DefaultStatelessReportMojoConfiguration config = new DefaultStatelessReportMojoConfiguration(
144144
reportsDirectory, reportNameSuffix, true, 5, schema, testClassMethodRunHistory);

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
@SuppressWarnings({"ResultOfMethodCallIgnored", "checkstyle:magicnumber"})
6767
public class StatelessXmlReporterTest extends TestCase {
6868
private static final String XSD =
69-
"https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd";
69+
"https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd";
7070
private static final String TEST_ONE = "aTestMethod";
7171
private static final String TEST_TWO = "bTestMethod";
7272
private static final String TEST_THREE = "cTestMethod";

maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ protected String[] getDefaultIncludes() {
559559

560560
@Override
561561
protected String getReportSchemaLocation() {
562-
return "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd";
562+
return "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd";
563563
}
564564

565565
public File getSystemPropertiesFile() {

maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testDefaultIncludes() {
4242

4343
public void testReportSchemaLocation() {
4444
assertThat(new SurefirePlugin().getReportSchemaLocation())
45-
.isEqualTo("https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd");
45+
.isEqualTo("https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd");
4646
}
4747

4848
public void testFailIfNoTests() throws Exception {

surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
public class JUnitPlatformEnginesIT extends SurefireJUnit4IntegrationTestCase {
5151
private static final String XML_TESTSUITE_FRAGMENT =
5252
"<testsuite xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation="
53-
+ "\"https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd\" "
53+
+ "\"https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd\" "
5454
+ "version=\"3.0\" name=\"&lt;&lt; ✨ &gt;&gt;\"";
5555

5656
@Parameter

0 commit comments

Comments
 (0)