From 1307bf39a4bbb243e7a349dbf387dbfa1ba62f40 Mon Sep 17 00:00:00 2001 From: "Henning P. Schmiedehausen" Date: Sat, 20 Aug 2022 14:28:53 -0700 Subject: [PATCH] [MNG-7529] Integration test for MNG-7529 This test checks whether version range resolution with multiple repositories maps releases onto repos that are not enabled for releases. Tested with 3.8.x, 3.9.x and master. Reliably fails without the MNG-7529 fix applies, reliable passes with the fix applied. --- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...ng7529VersionRangeRepositorySelection.java | 57 +++++++++++++ .../test/resources/mng-7529/.gitattributes | 3 + .../src/test/resources/mng-7529/pom.xml | 62 ++++++++++++++ .../resources/mng-7529/repo/.gitattributes | 3 + .../apache/maven/its/mng7529/a/1.0/a-1.0.jar | Bin 0 -> 4394 bytes .../maven/its/mng7529/a/1.0/a-1.0.jar.sha1 | 1 + .../apache/maven/its/mng7529/a/1.0/a-1.0.pom | 28 +++++++ .../maven/its/mng7529/a/1.0/a-1.0.pom.sha1 | 1 + .../apache/maven/its/mng7529/a/1.1/a-1.1.jar | Bin 0 -> 4394 bytes .../maven/its/mng7529/a/1.1/a-1.1.jar.sha1 | 1 + .../apache/maven/its/mng7529/a/1.1/a-1.1.pom | 29 +++++++ .../maven/its/mng7529/a/1.1/a-1.1.pom.sha1 | 1 + .../maven/its/mng7529/a/maven-metadata.xml | 13 +++ .../its/mng7529/a/maven-metadata.xml.sha1 | 1 + .../resources/mng-7529/settings-template.xml | 61 ++++++++++++++ .../core-it-plugins/mng7529-plugin/pom.xml | 66 +++++++++++++++ .../maven/its/mng7529/plugin/ResolveMojo.java | 77 ++++++++++++++++++ its/core-it-support/core-it-plugins/pom.xml | 1 + 19 files changed, 406 insertions(+) create mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java create mode 100644 its/core-it-suite/src/test/resources/mng-7529/.gitattributes create mode 100644 its/core-it-suite/src/test/resources/mng-7529/pom.xml create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/.gitattributes create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.jar create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.jar.sha1 create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.pom create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.pom.sha1 create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.jar create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.jar.sha1 create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.pom create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.pom.sha1 create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/maven-metadata.xml create mode 100644 its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/maven-metadata.xml.sha1 create mode 100644 its/core-it-suite/src/test/resources/mng-7529/settings-template.xml create mode 100644 its/core-it-support/core-it-plugins/mng7529-plugin/pom.xml create mode 100644 its/core-it-support/core-it-plugins/mng7529-plugin/src/main/java/org/apache/maven/its/mng7529/plugin/ResolveMojo.java diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index eddacd921e..8f3f160f93 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -106,6 +106,7 @@ public static Test suite() // Tests that don't run stable and need to be fixed // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng7529VersionRangeRepositorySelection.class ); suite.addTestSuite( MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.class ); suite.addTestSuite( MavenITmng7353CliGoalInvocationTest.class ); suite.addTestSuite( MavenITmng7504NotWarnUnsupportedReportPluginsTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java new file mode 100644 index 0000000000..341e657b2c --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java @@ -0,0 +1,57 @@ +package org.apache.maven.it; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.util.Properties; +import org.apache.maven.it.util.ResourceExtractor; + +/** + * This is a test set for MNG-7529. + */ +public class MavenITmng7529VersionRangeRepositorySelection + extends AbstractMavenIntegrationTestCase { + + public MavenITmng7529VersionRangeRepositorySelection() { + super("(3.8.6,)"); + } + + /** + * Test dependency resolution from a version range using multiple remote repositories + * with snapshot or release enabled. + * + * @throws Exception in case of failure + */ + public void testit() + throws Exception { + File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-7529"); + Verifier verifier = newVerifier(testDir.getAbsolutePath()); + verifier.setAutoclean(false); + verifier.deleteDirectory("target"); + verifier.deleteArtifacts("org.apache.maven.its.mng7529"); + verifier.addCliOption("--settings"); + verifier.addCliOption("settings.xml"); + + verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties()); + verifier.executeGoal("validate"); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + } +} diff --git a/its/core-it-suite/src/test/resources/mng-7529/.gitattributes b/its/core-it-suite/src/test/resources/mng-7529/.gitattributes new file mode 100644 index 0000000000..e3bce59d1b --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/.gitattributes @@ -0,0 +1,3 @@ +*.pom text eol=lf +maven-metadata.xml text eol=lf + diff --git a/its/core-it-suite/src/test/resources/mng-7529/pom.xml b/its/core-it-suite/src/test/resources/mng-7529/pom.xml new file mode 100644 index 0000000000..2a39a105e2 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/pom.xml @@ -0,0 +1,62 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng7529 + test + 0.1 + jar + + Maven Integration Test :: MNG-7529 + + Verify that artifact ranges are resolved to the right release repository. + + + + + org.apache.maven.its.mng7529 + a + (0.0,] + + + + + + + org.apache.maven.its.plugins + mng-7529-version-range-repository-selection-plugin + 2.1-SNAPSHOT + + + resolve + validate + + resolve + + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/.gitattributes b/its/core-it-suite/src/test/resources/mng-7529/repo/.gitattributes new file mode 100644 index 0000000000..e3bce59d1b --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/repo/.gitattributes @@ -0,0 +1,3 @@ +*.pom text eol=lf +maven-metadata.xml text eol=lf + diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.jar b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..b3f60649d2cabebf5f8a67cfd6a563ed61df6c85 GIT binary patch literal 4394 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 literal 0 HcmV?d00001 diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.jar.sha1 b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.jar.sha1 new file mode 100644 index 0000000000..f3ef6b9335 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.jar.sha1 @@ -0,0 +1 @@ +d532fcb4ba249192671e9954b80422819ce72679 diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.pom b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.pom new file mode 100644 index 0000000000..810c1b6d11 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.pom @@ -0,0 +1,28 @@ + + + + + + 4.0.0 + org.apache.maven.its.mng7529 + a + 1.0 + jar + diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.pom.sha1 b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.pom.sha1 new file mode 100644 index 0000000000..1bfa2dd51f --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.0/a-1.0.pom.sha1 @@ -0,0 +1 @@ +e231c56d8ec5e15fa40147933ece7335cb450b80 diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.jar b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..b3f60649d2cabebf5f8a67cfd6a563ed61df6c85 GIT binary patch literal 4394 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 literal 0 HcmV?d00001 diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.jar.sha1 b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.jar.sha1 new file mode 100644 index 0000000000..f3ef6b9335 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.jar.sha1 @@ -0,0 +1 @@ +d532fcb4ba249192671e9954b80422819ce72679 diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.pom b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.pom new file mode 100644 index 0000000000..093ae54cff --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.pom @@ -0,0 +1,29 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng7529 + a + 1.1 + jar + diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.pom.sha1 new file mode 100644 index 0000000000..993259be37 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/1.1/a-1.1.pom.sha1 @@ -0,0 +1 @@ +2463dfbdb7f0a1efbb1163e39dfed1f5a4a8bdc5 diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/maven-metadata.xml new file mode 100644 index 0000000000..af588405ff --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/maven-metadata.xml @@ -0,0 +1,13 @@ + + org.apache.maven.its.mng7529 + a + 1.0 + + 1.1 + + 1.0 + 1.1 + + 20220820180700 + + diff --git a/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/maven-metadata.xml.sha1 b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/maven-metadata.xml.sha1 new file mode 100644 index 0000000000..e45bef318d --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/repo/org/apache/maven/its/mng7529/a/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +1879cdd62495339b931a092a7e899b2dce39b826 \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-7529/settings-template.xml b/its/core-it-suite/src/test/resources/mng-7529/settings-template.xml new file mode 100644 index 0000000000..2201ee3778 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-7529/settings-template.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + maven-core-it-repo + + + maven-core-it-snapshots + @baseurl@/repo + + false + + + ignore + + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + + diff --git a/its/core-it-support/core-it-plugins/mng7529-plugin/pom.xml b/its/core-it-support/core-it-plugins/mng7529-plugin/pom.xml new file mode 100644 index 0000000000..a9a8a80cd2 --- /dev/null +++ b/its/core-it-support/core-it-plugins/mng7529-plugin/pom.xml @@ -0,0 +1,66 @@ + + + + + + 4.0.0 + + + maven-it-plugins + org.apache.maven.its.plugins + 2.1-SNAPSHOT + + + mng-7529-version-range-repository-selection-plugin + maven-plugin + + + 3.6.0 + + + Maven IT Plugin :: mng-7529 plugin + + + + org.apache.maven + maven-plugin-api + ${maven-version} + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.apache.maven + maven-core + ${maven-version} + provided + + + org.apache.maven + maven-model + ${maven-version} + provided + + + diff --git a/its/core-it-support/core-it-plugins/mng7529-plugin/src/main/java/org/apache/maven/its/mng7529/plugin/ResolveMojo.java b/its/core-it-support/core-it-plugins/mng7529-plugin/src/main/java/org/apache/maven/its/mng7529/plugin/ResolveMojo.java new file mode 100644 index 0000000000..5582f112e9 --- /dev/null +++ b/its/core-it-support/core-it-plugins/mng7529-plugin/src/main/java/org/apache/maven/its/mng7529/plugin/ResolveMojo.java @@ -0,0 +1,77 @@ +package org.apache.maven.its.mng7529.plugin; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.execution.MavenSession; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; +import org.apache.maven.project.DefaultDependencyResolutionRequest; +import org.apache.maven.project.DefaultProjectBuildingRequest; +import org.apache.maven.project.DependencyResolutionRequest; +import org.apache.maven.project.DependencyResolutionResult; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectDependenciesResolver; + +/** + * Attempts to resolve a single artifact from dependencies with the project dependency resolver, + * and logs the results for the Verifier to look at. + */ +@Mojo( name = "resolve", requiresDependencyResolution = ResolutionScope.NONE ) +public class ResolveMojo + extends AbstractMojo +{ + @Parameter( defaultValue = "${project}", readonly = true, required = true ) + private MavenProject project; + + @Parameter( defaultValue = "${session}", readonly = true, required = true ) + private MavenSession mavenSession; + + @Component + private ProjectDependenciesResolver dependencyResolver; + + public void execute() + throws MojoExecutionException + { + + try + { + DefaultProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest( + mavenSession.getProjectBuildingRequest() ); + buildingRequest.setRemoteRepositories( project.getRemoteArtifactRepositories() ); + + DependencyResolutionRequest request = new DefaultDependencyResolutionRequest(); + request.setMavenProject( project ); + request.setRepositorySession( buildingRequest.getRepositorySession() ); + + DependencyResolutionResult result = dependencyResolver.resolve( request ); + + getLog().info( "Resolution successful, resolved ok" ); + } + catch ( Exception e ) + { + getLog().error( "Resolution failed, could not resolve ranged dependency" + + " (you hit MNG-7529)" ); + } + } +} diff --git a/its/core-it-support/core-it-plugins/pom.xml b/its/core-it-support/core-it-plugins/pom.xml index 95932b95ef..ed0e815a56 100644 --- a/its/core-it-support/core-it-plugins/pom.xml +++ b/its/core-it-support/core-it-plugins/pom.xml @@ -84,6 +84,7 @@ under the License. mng5805-plugin-dep mng5958-extension mng6759-plugin-resolves-project-dependencies + mng7529-plugin