Domino looses dependency links for artifacts managed at a custom version, fix #399

Author: ppalaga

domino/api/src/main/java/io/quarkus/domino/ProjectDependencyResolver.java

@@ -20,6 +20,7 @@
 import io.quarkus.domino.scm.ScmRevisionResolver;
 import io.quarkus.maven.dependency.ArtifactCoords;
 import io.quarkus.maven.dependency.ArtifactKey;
+import io.quarkus.maven.dependency.GACT;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.file.Files;
@@ -286,6 +287,7 @@ public static Builder builder() {
 
     private Function<ArtifactCoords, List<Dependency>> artifactConstraintsProvider;
     private Set<ArtifactCoords> allConstraints;
+    private Map<GACT, ArtifactCoords> allConstraintsByGa;
     private Set<ArtifactCoords> projectBomConstraints;
     private final Map<ArtifactCoords, ResolvedDependency> allDepsToBuild = new HashMap<>();
     private final Set<ArtifactCoords> nonManagedVisited = new HashSet<>();
@@ -625,7 +627,7 @@ private static Set<ArtifactCoords> toArtifactCoords(Collection<Dependency> deps)
         for (var d : deps) {
             result.add(toCoords(d.getArtifact()));
         }
-        return result;
+        return Collections.unmodifiableSet(result);
     }
 
     public void resolveDependencies() {
@@ -643,6 +645,17 @@ void resolveDependenciesInternal() {
             enforcedConstraints.addAll(getBomConstraints(bomCoords));
         }
         allConstraints = toArtifactCoords(enforcedConstraints);
+        allConstraintsByGa = Collections.unmodifiableMap(
+                allConstraints.stream()
+                        .collect(
+                                HashMap::new,
+                                (m, gav) -> m.put(new GACT(
+                                        gav.getGroupId(),
+                                        gav.getArtifactId(),
+                                        gav.getClassifier(),
+                                        gav.getType()),
+                                        gav),
+                                (m1, m2) -> m1.putAll(m2)));
         if (artifactConstraintsProvider == null) {
             artifactConstraintsProvider = t -> enforcedConstraints;
         }
@@ -997,8 +1010,7 @@ private void configureReleaseRepoDeps() {
             }
             for (Dependency directDep : descriptor.getDependencies()) {
                 final Artifact a = directDep.getArtifact();
-                final ArtifactDependency dirArt = artifactDeps.get(ArtifactCoords.of(a.getGroupId(), a.getArtifactId(),
-                        a.getClassifier(), a.getExtension(), a.getVersion()));
+                final ArtifactDependency dirArt = artifactDeps.get(toManagedCoords(a));
                 if (dirArt != null) {
                     d.addDependency(dirArt);
                 }
@@ -1014,6 +1026,16 @@ private void configureReleaseRepoDeps() {
         }
     }
 
+    private ArtifactCoords toManagedCoords(Artifact a) {
+        final ArtifactCoords managed = allConstraintsByGa.get(new GACT(a.getGroupId(), a.getArtifactId(),
+                a.getClassifier(), a.getExtension()));
+        if (managed != null) {
+            return managed;
+        }
+        return ArtifactCoords.of(a.getGroupId(), a.getArtifactId(),
+                a.getClassifier(), a.getExtension(), a.getVersion());
+    }
+
     private ScmRevision getRevision(ArtifactCoords coords, List<RemoteRepository> repos) {
         final ScmRevision revision;
         if (this.preResolvedRootArtifacts.containsKey(coords)) {
@@ -1712,4 +1734,5 @@ private static GAV toGav(ArtifactCoords coords) {
     private static ArtifactCoords toCoords(Artifact a) {
         return ArtifactCoords.of(a.getGroupId(), a.getArtifactId(), a.getClassifier(), a.getExtension(), a.getVersion());
     }
+
 }

domino/api/src/test/java/io/quarkus/domino/NonCorePlatformMemberDependenciesTest.java

@@ -37,10 +37,16 @@ static void prepareRepo() {
                 .setTag("1.0");
         var byteUtilsLib = byteUtilsProject.createMainModule("byte-utils");
 
-        var commonsIoProject = TestProject.of("org.commons.io", "1.0")
+        var commonsIoProject10 = TestProject.of("org.commons.io", "1.0")
                 .setRepoUrl("https://commons.org/code/io")
                 .setTag("1.0");
-        var commonsIoLib = commonsIoProject.createMainModule("commons-io")
+        var commonsIoLib10 = commonsIoProject10.createMainModule("commons-io")
+                .addDependency(byteUtilsLib);
+
+        var commonsIoProject09 = TestProject.of("org.commons.io", "0.9")
+                .setRepoUrl("https://commons.org/code/io")
+                .setTag("0.9");
+        var commonsIoLib09 = commonsIoProject09.createMainModule("commons-io")
                 .addDependency(byteUtilsLib);
 
         var quarkusProject = TestProject.of("io.quarkus", "1.0")
@@ -52,7 +58,7 @@ static void prepareRepo() {
         var quarkusBuildParent = quarkusParent.addPomModule("quarkus-build-parent")
                 .importBom(quarkusBom);
         var quarkusCore = quarkusBuildParent.addModule("quarkus-core")
-                .addDependency(commonsIoLib);
+                .addDependency(commonsIoLib09);
 
         var filesLibProject = TestProject.of("org.files", "1.0")
                 .setRepoUrl("https://files.org/code")
@@ -73,7 +79,7 @@ static void prepareRepo() {
                 .addVersionConstraint("camel-core")
                 .addVersionConstraint("camel-xml-lib")
                 .addVersionConstraint(xmlLib)
-                .addVersionConstraint(commonsIoLib);
+                .addVersionConstraint(commonsIoLib10);
         var camelBuildParent = camelParent.addPomModule("camel-build-parent")
                 .importBom(camelBom);
         var camelCore = camelBuildParent.addModule("camel-core")
@@ -86,7 +92,8 @@ static void prepareRepo() {
                 .install(camelProject)
                 .install(filesLibProject)
                 .install(xmlLibProject)
-                .install(commonsIoProject)
+                .install(commonsIoProject10)
+                .install(commonsIoProject09)
                 .install(byteUtilsProject);
 
         releaseAssertions = Map.<ScmRevision, Consumer<ReleaseRepo>> of(
@@ -101,6 +108,8 @@ static void prepareRepo() {
                             .containsKey(ArtifactCoords.pom("io.quarkus", "quarkus-build-parent", "1.0"));
                     assertThat(release.getArtifacts()).containsKey(ArtifactCoords.jar("io.quarkus", "quarkus-core", "1.0"));
                     assertThat(release.getDependencies()).hasSize(1);
+                    assertThat(release.getDependencies().iterator().next().artifacts)
+                            .containsKey(ArtifactCoords.jar("org.commons.io", "commons-io", "1.0"));
                 },
                 ReleaseIdFactory.forScmAndTag("https://camel.org/code", "1.0"),
                 release -> {