This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch fix-nonexisting-schemalocations
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 9e6c5901fd4c0216d53d324233873aea34ac8893
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Wed Jun 5 22:20:51 2024 +0200
Fix schema locations in code which lead to 404
---
.../java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java | 2 +-
.../maven/plugin/surefire/extensions/StatelessReporterTest.java | 4 ++--
.../apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java | 2 +-
.../main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java | 2 +-
.../java/org/apache/maven/plugin/surefire/SurefirePluginTest.java | 2 +-
.../java/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 918b39445..cceb79409 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 @@ public class IntegrationTestMojo extends
AbstractSurefireMojo {
@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 41e6b250f..71140a48e 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 class StatelessReporterTest {
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 class StatelessReporterTest {
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/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 50c9b5906..19393bded 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 @@ import static org.powermock.reflect.Whitebox.setInternalState;
@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 aa256b983..addc8834a 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 @@ public class SurefirePlugin extends AbstractSurefireMojo
implements SurefireRepo
@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 a2ace0b77..c5a0c3e63 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 class SurefirePluginTest extends TestCase {
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 38eb553d0..06d075621 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 @@ import static org.junit.Assume.assumeThat;
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=\"<< ✨ >>\"";
@Parameter
