Skip to content

Commit 3f2cfa5

Browse files
committed
First compilation
1 parent 6c1a62e commit 3f2cfa5

File tree

724 files changed

+1840
-2065
lines changed

Some content is hidden

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

724 files changed

+1840
-2065
lines changed

its/core-it-suite/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,12 @@ under the License.
356356
<artifactId>maven-it-plugin-plexus-lifecycle</artifactId>
357357
<version>${core-it-support-version}</version>
358358
</dependency>
359+
<dependency>
360+
<groupId>commons-jxpath</groupId>
361+
<artifactId>commons-jxpath</artifactId>
362+
<version>1.4.0</version>
363+
<scope>test</scope>
364+
</dependency>
359365
</dependencies>
360366

361367
<build>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
*/
3333
class ItUtils {
3434

35+
public static String calcHash(Path file, String algo) throws Exception {
36+
return ItUtils.calcHash(file.toFile(), algo);
37+
}
38+
3539
public static String calcHash(File file, String algo) throws Exception {
3640
MessageDigest digester = MessageDigest.getInstance(algo);
3741

@@ -81,6 +85,10 @@ public static void assertCanonicalFileEquals(File expected, File actual) throws
8185
assertEquals(expected.getCanonicalFile(), actual.getCanonicalFile());
8286
}
8387

88+
public static void assertCanonicalFileEquals(Path expected, Path actual) throws IOException {
89+
assertEquals(expected.toFile().getCanonicalFile(), actual.toFile().getCanonicalFile());
90+
}
91+
8492
public static void assertCanonicalFileEquals(String expected, String actual, String message) throws IOException {
8593
assertEquals(new File(expected).getCanonicalFile(), new File(actual).getCanonicalFile(), message);
8694
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class MavenIT0008SimplePluginTest extends AbstractMavenIntegrationTestCas
3636
@Test
3737
public void testit0008() throws Exception {
3838
Path testDir = extractResources("/it0008");
39-
Verifier verifier = newVerifier(testDir.toString());
39+
Verifier verifier = newVerifier(testDir);
4040
verifier.setAutoclean(false);
4141
verifier.deleteDirectory("target");
4242
verifier.deleteArtifact("org.apache.maven.its.plugins", "maven-it-plugin-touch", "1.0", "maven-plugin");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void testit0009() throws Exception {
4444
boolean supportSpaceInXml = true;
4545

4646
Path testDir = extractResources("/it0009");
47-
Verifier verifier = newVerifier(testDir.toString());
47+
Verifier verifier = newVerifier(testDir);
4848
verifier.setAutoclean(false);
4949
verifier.deleteDirectory("target");
5050
verifier.addCliArgument("validate");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class MavenIT0010DependencyClosureResolutionTest extends AbstractMavenInt
3939
public void testit0010() throws Exception {
4040
Path testDir = extractResources("/it0010");
4141

42-
Verifier verifier = newVerifier(testDir.toString());
42+
Verifier verifier = newVerifier(testDir);
4343
verifier.setAutoclean(false);
4444
verifier.deleteDirectory("target");
4545
verifier.deleteArtifacts("org.apache.maven.its.it0010");

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
*/
1919
package org.apache.maven.it;
2020

21-
import java.io.File;
2221
import java.nio.file.Path;
2322
import java.util.List;
24-
2523
import org.junit.jupiter.api.Test;
2624

2725
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -36,7 +34,7 @@ public class MavenIT0011DefaultVersionByDependencyManagementTest extends Abstrac
3634
@Test
3735
public void testit0011() throws Exception {
3836
Path testDir = extractResources("/it0011");
39-
Verifier verifier = newVerifier(testDir.toString());
37+
Verifier verifier = newVerifier(testDir);
4038
verifier.setAutoclean(false);
4139
verifier.deleteDirectory("target");
4240
verifier.deleteArtifacts("org.apache.maven.its.it0011");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class MavenIT0012PomInterpolationTest extends AbstractMavenIntegrationTes
3333
@Test
3434
public void testit0012() throws Exception {
3535
Path testDir = extractResources("/it0012");
36-
Verifier verifier = newVerifier(testDir.toString());
36+
Verifier verifier = newVerifier(testDir);
3737
verifier.setAutoclean(false);
3838
verifier.deleteDirectory("target");
3939
verifier.deleteDirectory("child-project/target");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class MavenIT0018DependencyManagementTest extends AbstractMavenIntegratio
3535
@Test
3636
public void testit0018() throws Exception {
3737
Path testDir = extractResources("/it0018");
38-
Verifier verifier = newVerifier(testDir.toString());
38+
Verifier verifier = newVerifier(testDir);
3939
verifier.setAutoclean(false);
4040
verifier.deleteArtifacts("org.apache.maven.its.it0018");
4141
verifier.filterFile("settings-template.xml", "settings.xml");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class MavenIT0019PluginVersionMgmtBySuperPomTest extends AbstractMavenInt
3333
@Test
3434
public void testit0019() throws Exception {
3535
Path testDir = extractResources("/it0019");
36-
Verifier verifier = newVerifier(testDir.toString());
36+
Verifier verifier = newVerifier(testDir);
3737
verifier.setAutoclean(false);
3838
verifier.deleteDirectory("target");
3939
verifier.addCliArgument("process-resources");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class MavenIT0021PomProfileTest extends AbstractMavenIntegrationTestCase
3535
public void testit0021() throws Exception {
3636
Path testDir = extractResources("/it0021");
3737

38-
Verifier verifier = newVerifier(testDir.toString());
38+
Verifier verifier = newVerifier(testDir);
3939
verifier.setAutoclean(false);
4040
verifier.deleteArtifacts("org.apache.maven.its.it0021");
4141
verifier.getSystemProperties().setProperty("includeProfile", "true");

0 commit comments

Comments
 (0)