Merge pull request #217 from ascopes/bugfix/GH-172

GH-172: Fix dependency conflict resolution
ascopes · May 12, 2024 · 6187513 · 6187513
2 parents 2d0cea3 + 176367b
commit 6187513
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/protobuf-maven-plugin/src/it/gh-172-transitive-dependency-conflicts/selector.groovy b/protobuf-maven-plugin/src/it/gh-172-transitive-dependency-conflicts/selector.groovy
diff --git a/...n/src/main/java/io/github/ascopes/protobufmavenplugin/generation/SourceCodeGenerator.java b/...n/src/main/java/io/github/ascopes/protobufmavenplugin/generation/SourceCodeGenerator.java
@@ -85,8 +85,8 @@ public boolean generate(GenerationRequest request) throws ResolutionException, I
     final var protocPath = discoverProtocPath(request);
 
     final var resolvedPlugins = discoverPlugins(request);
-    final var importPaths = discoverImportPaths(request);
     final var sourcePaths = discoverCompilableSources(request);
+    final var importPaths = discoverImportPaths(sourcePaths, request);
 
     if (sourcePaths.isEmpty()) {
       if (request.isFailOnMissingSources()) {
@@ -173,17 +173,24 @@ private Collection<ResolvedProtocPlugin> discoverPlugins(
   }
 
   private Collection<ProtoFileListing> discoverImportPaths(
+      Collection<ProtoFileListing> sourcePathListings,
       GenerationRequest request
   ) throws IOException, ResolutionException {
-    var artifacts = concat(request.getImportDependencies(), request.getSourceDependencies());
     var artifactPaths = artifactPathResolver.resolveDependencies(
-        artifacts,
+        request.getImportDependencies(),
         request.getDependencyResolutionDepth(),
         !request.isIgnoreProjectDependencies()
     );
-    var importPaths = request.getImportPaths();
 
-    return protoListingResolver.createProtoFileListings(concat(artifactPaths, importPaths));
+    var importPathListings = protoListingResolver
+        .createProtoFileListings(concat(request.getImportPaths(), artifactPaths));
+
+    // Use the source paths here as well and use them first to give them precedence. This works
+    // around GH-172 where we can end up with different versions on the import and source paths
+    // depending on how dependency conflicts arise.
+    return Stream.concat(sourcePathListings.stream(), importPathListings.stream())
+        .distinct()
+        .collect(Collectors.toList());
   }
 
   private Collection<ProtoFileListing> discoverCompilableSources(