Skip to content

Commit

Permalink
[MNG-7047] Adjust repositoryUrl for MNG-6759
Browse files Browse the repository at this point in the history
  • Loading branch information
rfscholte committed Jul 21, 2021
1 parent 63410da commit 4c5d721
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,16 @@ public MavenITmng6759TransitiveDependencyRepositoriesTest() {
* where C is in a non-Central repository should use B's {@literal <repositories>} to resolve C.
*/
public void testTransitiveDependenciesAccountForRepositoriesListedByDependencyTrailPredecessor() throws Exception {
URI customRepoUri = installDependencyCInCustomRepo();
installDependencyCInCustomRepo();
File testDir = ResourceExtractor.simpleExtractResources( getClass(), projectBaseDir );

Verifier verifier = newVerifier( testDir.getAbsolutePath() );

verifier.addCliOption( "-Dcustom.repo.uri=" + customRepoUri );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
}

private URI installDependencyCInCustomRepo() throws Exception {
private void installDependencyCInCustomRepo() throws Exception {
File dependencyCProjectDir = ResourceExtractor.simpleExtractResources( getClass(), projectBaseDir + "/dependency-in-custom-repo" );
URI customRepoUri = new File(new File(dependencyCProjectDir, "target" ), "repo" ).toURI();
Verifier verifier = newVerifier( dependencyCProjectDir.getAbsolutePath() );
Expand All @@ -65,7 +64,6 @@ private URI installDependencyCInCustomRepo() throws Exception {
}
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
return customRepoUri;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<repositories>
<repository>
<id>customRepo</id>
<url>${custom.repo.uri}</url>
<url>file:///${basedir}/../dependency-in-custom-repo/target/repo</url>
</repository>
</repositories>

Expand Down

0 comments on commit 4c5d721

Please sign in to comment.