Fix DependencyComputer missing bundles when they have different versions

laeubi · laeubi · commit ce7e249bb89d · 2023-09-19T13:47:00.000+02:00
Currently the DependencyComputer sorts only by bundle name (even though
the comment for the code mentions the version as well) this can lead to
the situation that if a bundle requires the same bundle in different
versions (e.g. because it has actually different package names like
javax -&gt; jakarta) it only gets one of both on the classpath even though
the P2 input suggests both.

This simply enhances the used key in the mak with the version as already
suggested by the java comment.
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/DependencyComputer.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/DependencyComputer.java
@@ -119,6 +119,11 @@ public String getSymbolicName() {
         public Version getVersion() {
             return getRevision().getVersion();
         }
+
+        @Override
+        public String toString() {
+            return "DependencyEntry [module=" + module + ", rules=" + rules + "]";
+        }
     }
 
     private final class VisiblePackages {
@@ -182,7 +187,7 @@ public List<DependencyEntry> computeDependencies(ModuleRevision module) {
         // sort by symbolicName_version to get a consistent order
         Map<String, BundleRevision> resolvedImportPackages = new TreeMap<>();
         for (BundleRevision bundle : visiblePackages.getParticipatingModules()) {
-            resolvedImportPackages.put(bundle.getSymbolicName(), bundle);
+            resolvedImportPackages.put(bundle.getSymbolicName() + "_" + bundle.getVersion(), bundle);
         }
         for (BundleRevision bundle : resolvedImportPackages.values()) {
             addDependencyViaImportPackage(bundle, added, visiblePackages, entries);

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,11 @@ public String getSymbolicName() {`
`119`	`119`	`public Version getVersion() {`
`120`	`120`	`return getRevision().getVersion();`
`121`	`121`	`}`
	`122`	`+`
	`123`	`+ @Override`
	`124`	`+ public String toString() {`
	`125`	`+ return "DependencyEntry [module=" + module + ", rules=" + rules + "]";`
	`126`	`+ }`
`122`	`127`	`}`
`123`	`128`
`124`	`129`	`private final class VisiblePackages {`
`@@ -182,7 +187,7 @@ public List<DependencyEntry> computeDependencies(ModuleRevision module) {`
`182`	`187`	`// sort by symbolicName_version to get a consistent order`
`183`	`188`	`Map<String, BundleRevision> resolvedImportPackages = new TreeMap<>();`
`184`	`189`	`for (BundleRevision bundle : visiblePackages.getParticipatingModules()) {`
`185`		`- resolvedImportPackages.put(bundle.getSymbolicName(), bundle);`
	`190`	`+ resolvedImportPackages.put(bundle.getSymbolicName() + "_" + bundle.getVersion(), bundle);`
`186`	`191`	`}`
`187`	`192`	`for (BundleRevision bundle : resolvedImportPackages.values()) {`
`188`	`193`	`addDependencyViaImportPackage(bundle, added, visiblePackages, entries);`