Fix schema locations in code which lead to 404

apache · Jun 6, 2024 · c19d857 · c19d857
1 parent 9a43d06
commit c19d857
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/...n-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java b/...n-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -601,7 +601,7 @@ protected String[] getDefaultIncludes() {
 
     @Override
     protected String getReportSchemaLocation() {
-        return "https://maven.apache.org/surefire/maven-failsafe-plugin/xsd/failsafe-test-report-3.0.xsd";
+        return "https://maven.apache.org/surefire/maven-failsafe-plugin/xsd/failsafe-test-report.xsd";
     }
 
     @Override

diff --git a/...mmon/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java b/...mmon/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
@@ -63,7 +63,7 @@ public void shouldCreateConsoleListener() {
         File target = new File(System.getProperty("user.dir"), "target");
         File reportsDirectory = new File(target, "surefire-reports");
         String reportNameSuffix = "suffix";
-        String schema = "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd";
+        String schema = "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd";
         Map<String, Deque<WrappedReportEntry>> testClassMethodRunHistory = new HashMap<>();
         DefaultStatelessReportMojoConfiguration config = new DefaultStatelessReportMojoConfiguration(
                 reportsDirectory, reportNameSuffix, true, 5, schema, testClassMethodRunHistory);
@@ -138,7 +138,7 @@ public void shouldCreateJUnit5ConsoleListener() {
         File target = new File(System.getProperty("user.dir"), "target");
         File reportsDirectory = new File(target, "surefire-reports");
         String reportNameSuffix = "suffix";
-        String schema = "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd";
+        String schema = "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd";
         Map<String, Deque<WrappedReportEntry>> testClassMethodRunHistory = new HashMap<>();
         DefaultStatelessReportMojoConfiguration config = new DefaultStatelessReportMojoConfiguration(
                 reportsDirectory, reportNameSuffix, true, 5, schema, testClassMethodRunHistory);

diff --git a/...ommon/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/...ommon/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
@@ -66,7 +66,7 @@
 @SuppressWarnings({"ResultOfMethodCallIgnored", "checkstyle:magicnumber"})
 public class StatelessXmlReporterTest extends TestCase {
     private static final String XSD =
-            "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd";
+            "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd";
     private static final String TEST_ONE = "aTestMethod";
     private static final String TEST_TWO = "bTestMethod";
     private static final String TEST_THREE = "cTestMethod";

diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
@@ -559,7 +559,7 @@ protected String[] getDefaultIncludes() {
 
     @Override
     protected String getReportSchemaLocation() {
-        return "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd";
+        return "https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd";
     }
 
     public File getSystemPropertiesFile() {

diff --git a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
@@ -42,7 +42,7 @@ public void testDefaultIncludes() {
 
     public void testReportSchemaLocation() {
         assertThat(new SurefirePlugin().getReportSchemaLocation())
-                .isEqualTo("https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd");
+                .isEqualTo("https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd");
     }
 
     public void testFailIfNoTests() throws Exception {

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
@@ -50,7 +50,7 @@
 public class JUnitPlatformEnginesIT extends SurefireJUnit4IntegrationTestCase {
     private static final String XML_TESTSUITE_FRAGMENT =
             "<testsuite xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation="
-                    + "\"https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd\" "
+                    + "\"https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd\" "
                     + "version=\"3.0\" name=\"&lt;&lt; ✨ &gt;&gt;\"";
 
     @Parameter