Skip to content

Fix schema locations in code which lead to 404 #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Fix schema locations in code which lead to 404 #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...n-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...mmon/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...ommon/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down