Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7047] Adjust repositoryUrl for MNG-6759

This commit is contained in:
rfscholte 2021-07-21 10:32:57 +02:00
parent 63410da462
commit 4c5d721120
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
View File

@ -39,17 +39,16 @@ public class MavenITmng6759TransitiveDependencyRepositoriesTest extends Abstract
* where C is in a non-Central repository should use B's {@literal <repositories>} to resolve C. * where C is in a non-Central repository should use B's {@literal <repositories>} to resolve C.
*/ */
public void testTransitiveDependenciesAccountForRepositoriesListedByDependencyTrailPredecessor() throws Exception { public void testTransitiveDependenciesAccountForRepositoriesListedByDependencyTrailPredecessor() throws Exception {
URI customRepoUri = installDependencyCInCustomRepo(); installDependencyCInCustomRepo();
File testDir = ResourceExtractor.simpleExtractResources( getClass(), projectBaseDir ); File testDir = ResourceExtractor.simpleExtractResources( getClass(), projectBaseDir );
Verifier verifier = newVerifier( testDir.getAbsolutePath() ); Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.addCliOption( "-Dcustom.repo.uri=" + customRepoUri );
verifier.executeGoal( "package" ); verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog(); verifier.verifyErrorFreeLog();
} }
private URI installDependencyCInCustomRepo() throws Exception { private void installDependencyCInCustomRepo() throws Exception {
File dependencyCProjectDir = ResourceExtractor.simpleExtractResources( getClass(), projectBaseDir + "/dependency-in-custom-repo" ); File dependencyCProjectDir = ResourceExtractor.simpleExtractResources( getClass(), projectBaseDir + "/dependency-in-custom-repo" );
URI customRepoUri = new File(new File(dependencyCProjectDir, "target" ), "repo" ).toURI(); URI customRepoUri = new File(new File(dependencyCProjectDir, "target" ), "repo" ).toURI();
Verifier verifier = newVerifier( dependencyCProjectDir.getAbsolutePath() ); Verifier verifier = newVerifier( dependencyCProjectDir.getAbsolutePath() );
@ -65,7 +64,6 @@ public class MavenITmng6759TransitiveDependencyRepositoriesTest extends Abstract
} }
verifier.executeGoal( "deploy" ); verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog(); verifier.verifyErrorFreeLog();
return customRepoUri;
} }
} }

2
its/core-it-suite/src/test/resources/mng-6759-transitive-dependency-repositories/module2/pom.xml
View File

@ -11,7 +11,7 @@
<repositories> <repositories>
<repository> <repository>
<id>customRepo</id> <id>customRepo</id>
<url>${custom.repo.uri}</url> <url>file:///${basedir}/../dependency-in-custom-repo/target/repo</url>
</repository> </repository>
</repositories> </repositories>