You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/07/17 09:57:15 UTC
[maven-integration-testing] branch MNG-6271 created (now 96aae8c)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-6271
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
at 96aae8c Remove unused code
This branch includes the following new commits:
new 9f7037f [MNG-6271] Adjust repositoryUrl for MNG-6759
new 96aae8c Remove unused code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-integration-testing] 01/02: [MNG-6271] Adjust repositoryUrl
for MNG-6759
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6271
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 9f7037f5812923d8350a5df12bdc9af3a3aa38e3
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Jun 27 13:39:52 2021 +0200
[MNG-6271] Adjust repositoryUrl for MNG-6759
---
.../maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java | 1 -
.../mng-6759-transitive-dependency-repositories/module2/pom.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
index 45a6665..b96aba0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
@@ -44,7 +44,6 @@ public class MavenITmng6759TransitiveDependencyRepositoriesTest extends Abstract
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.addCliOption( "-Dcustom.repo.uri=" + customRepoUri );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/resources/mng-6759-transitive-dependency-repositories/module2/pom.xml b/core-it-suite/src/test/resources/mng-6759-transitive-dependency-repositories/module2/pom.xml
index c0c3041..7d25740 100644
--- a/core-it-suite/src/test/resources/mng-6759-transitive-dependency-repositories/module2/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6759-transitive-dependency-repositories/module2/pom.xml
@@ -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>
[maven-integration-testing] 02/02: Remove unused code
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6271
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 96aae8c15d9554d6bcf23da3f87031513ba77212
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Jun 27 13:41:01 2021 +0200
Remove unused code
---
.../maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
index b96aba0..17e1607 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java
@@ -39,7 +39,7 @@ public class MavenITmng6759TransitiveDependencyRepositoriesTest extends Abstract
* 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() );
@@ -48,7 +48,7 @@ public class MavenITmng6759TransitiveDependencyRepositoriesTest extends Abstract
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() );
@@ -64,7 +64,6 @@ public class MavenITmng6759TransitiveDependencyRepositoriesTest extends Abstract
}
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
- return customRepoUri;
}
}