From c19d8574a995ec0dbfc3422aff3d71b8188c8a57 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Wed, 5 Jun 2024 22:20:51 +0200 Subject: [PATCH] Fix schema locations in code which lead to 404 --- .../org/apache/maven/plugin/failsafe/IntegrationTestMojo.java | 2 +- .../plugin/surefire/extensions/StatelessReporterTest.java | 4 ++-- .../plugin/surefire/report/StatelessXmlReporterTest.java | 2 +- .../java/org/apache/maven/plugin/surefire/SurefirePlugin.java | 2 +- .../org/apache/maven/plugin/surefire/SurefirePluginTest.java | 2 +- .../org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java index 918b39445b..cceb794096 100644 --- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java +++ b/maven-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/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 41e6b250f2..71140a48e1 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 @@ -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> 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> testClassMethodRunHistory = new HashMap<>(); DefaultStatelessReportMojoConfiguration config = new DefaultStatelessReportMojoConfiguration( reportsDirectory, reportNameSuffix, true, 5, schema, testClassMethodRunHistory); 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 50c9b59064..19393bded0 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 @@ -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 index aa256b9831..addc8834ae 100644 --- 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 index a2ace0b770..c5a0c3e63b 100644 --- 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 index 38eb553d00..06d0756217 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 @@ -50,7 +50,7 @@ public class JUnitPlatformEnginesIT extends SurefireJUnit4IntegrationTestCase { private static final String XML_TESTSUITE_FRAGMENT = "