From 5d57ddca04376763e4ec13eef872c56dbdfe036a Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sat, 26 Dec 2020 14:51:12 +0100 Subject: [PATCH] [MNG-6972] Allow access to org.apache.maven.graph Use a fresh, preconfigured verifier which has global settings set. This issue can be observed when Maven is ran with MNG-4645 where no preconfigured Maven Central is in global settings. This closes #94 --- ...Tmng6972AllowAccessToGraphPackageTest.java | 8 +- .../test/resources/bootstrap/group-12/pom.xml | 83 +++++++++++++++++++ .../src/test/resources/bootstrap/pom.xml | 1 + 3 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 core-it-suite/src/test/resources/bootstrap/group-12/pom.xml diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java index dfe8d91f4..77aa12baa 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java @@ -35,7 +35,7 @@ public MavenITmng6972AllowAccessToGraphPackageTest() super( "[4.0.0-alpha-1,)" ); } - public void testitMNG6972() + public void testit() throws Exception { @@ -51,17 +51,17 @@ public void testitMNG6972() * unstable test results. Fortunately, the verifier * makes it easy to do this. */ - verifier = new Verifier( testDir.getAbsolutePath() ); + verifier = newVerifier( testDir.getAbsolutePath() ); verifier.deleteArtifact( "mng-6972-allow-access-to-graph-package", "build-plugin", "1.0", "jar" ); verifier.deleteArtifact( "mng-6972-allow-access-to-graph-package", "using-module", "1.0", "jar" ); - verifier = new Verifier( new File( testDir.getAbsolutePath(), "build-plugin" ).getAbsolutePath() ); + verifier = newVerifier( new File( testDir.getAbsolutePath(), "build-plugin" ).getAbsolutePath() ); verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - verifier = new Verifier( new File( testDir.getAbsolutePath(), "using-module" ).getAbsolutePath() ); + verifier = newVerifier( new File( testDir.getAbsolutePath(), "using-module" ).getAbsolutePath() ); verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); diff --git a/core-it-suite/src/test/resources/bootstrap/group-12/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-12/pom.xml new file mode 100644 index 000000000..f037419af --- /dev/null +++ b/core-it-suite/src/test/resources/bootstrap/group-12/pom.xml @@ -0,0 +1,83 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.bootstrap + maven-it-boostrap + 1.0 + + + org.apache.maven.its.bootstrap + group-12 + 1.0 + jar + + Maven Integration Test :: Boostrap :: Group-12 + + + + + + + org.apache.maven + maven-core + 3.3.1 + + + org.codehaus.plexus + plexus-component-metadata + 1.5.5 + + + org.codehaus.plexus + plexus-component-annotations + 1.5.5 + + + org.codehaus.plexus + plexus-utils + 1.4.5 + + + org.codehaus.plexus + plexus-java + 1.0.5 + + + org.apache.maven.shared + maven-common-artifact-filters + 3.1.0 + + + org.apache.maven.shared + maven-artifact-transfer + 0.11.0 + + + org.ow2.asm + asm + 7.2 + + + diff --git a/core-it-suite/src/test/resources/bootstrap/pom.xml b/core-it-suite/src/test/resources/bootstrap/pom.xml index 1c711a98e..7c331d239 100644 --- a/core-it-suite/src/test/resources/bootstrap/pom.xml +++ b/core-it-suite/src/test/resources/bootstrap/pom.xml @@ -48,6 +48,7 @@ under the License. group-9 group-10 group-11 + group-12