Skip to content

Commit ba2a681

Browse files
Cleanup test used only with Maven 4.x
As we have copied test into Maven core we don't need it here for 3.x Also, remove unused resources
1 parent d657c03 commit ba2a681

103 files changed

Lines changed: 8 additions & 3865 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ public class MavenITmng3991ValidDependencyScopeTest extends AbstractMavenIntegra
3434

3535
public MavenITmng3991ValidDependencyScopeTest() {
3636
// TODO: One day, we should be able to error out but this requires to consider extensions and their use cases
37-
super("[4.0,)");
37+
super(ALL_MAVEN_VERSIONS);
3838
}
3939

4040
/**
41-
* Test that invalid dependency scopes cause a validation error during building.
41+
* Test that invalid dependency scopes cause a validation warning during building.
4242
*
4343
* @throws Exception in case of failure
4444
*/
@@ -49,13 +49,9 @@ public void testit() throws Exception {
4949
Verifier verifier = newVerifier(testDir.getAbsolutePath());
5050
verifier.setAutoclean(false);
5151
verifier.deleteDirectory("target");
52-
try {
53-
verifier.addCliArgument("validate");
54-
verifier.execute();
55-
verifier.verifyErrorFreeLog();
56-
fail("Invalid dependency scope did not cause validation error");
57-
} catch (VerificationException e) {
58-
// expected
59-
}
52+
verifier.addCliArgument("validate");
53+
verifier.execute();
54+
verifier.verifyErrorFreeLog();
55+
verifier.verifyTextInLog("[WARNING] 'dependencies.dependency.scope' for org.apache.maven.its.mng3991:a:jar must be one of");
6056
}
6157
}

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
public class MavenITmng4262MakeLikeReactorDottedPath370Test extends AbstractMavenIntegrationTestCase {
3333

3434
public MavenITmng4262MakeLikeReactorDottedPath370Test() {
35-
super("[4.0.0-alpha-1,)");
35+
super(ALL_MAVEN_VERSIONS);
3636
}
3737

3838
private void clean(Verifier verifier) throws Exception {
@@ -47,6 +47,7 @@ private void clean(Verifier verifier) throws Exception {
4747
*/
4848
@Test
4949
public void testitMakeRoot() throws Exception {
50+
requiresMavenVersion("[4.0.0,)");
5051
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-4262");
5152

5253
Verifier verifier = newVerifier(new File(testDir, "parent").getAbsolutePath());

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java

Lines changed: 0 additions & 167 deletions
This file was deleted.

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java

Lines changed: 0 additions & 105 deletions
This file was deleted.

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5659ProjectSettingsTest.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)