Skip to content

Commit 493bedf

Browse files
committed
If there are duplicate packages use the first declaration
In some rare cases it can happen that duplicate exports are present (seen in org.eclipse.osgi with java.io package resolved from jre), in this case API tools fails with an error. THis now simply always ever use the first declared package for analysis.
1 parent b8f34f6 commit 493bedf

File tree

1 file changed

+2
-2
lines changed
  • apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder

1 file changed

+2
-2
lines changed

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2301,10 +2301,10 @@ private void checkApiComponentPackageVersions(BundleComponent referenceBundle, B
23012301
IDelta[] breakingChanges, IDelta[] compatibleChanges) throws CoreException {
23022302
Map<String, ExportPackageDescription> referencePackages = Arrays
23032303
.stream(referenceBundle.getBundleDescription().getExportPackages())
2304-
.collect(Collectors.toMap(ExportPackageDescription::getName, Function.identity()));
2304+
.collect(Collectors.toMap(ExportPackageDescription::getName, Function.identity(), (a, b) -> a));
23052305
Map<String, ExportPackageDescription> componentPackages = Arrays
23062306
.stream(componentBundle.getBundleDescription().getExportPackages())
2307-
.collect(Collectors.toMap(ExportPackageDescription::getName, Function.identity()));
2307+
.collect(Collectors.toMap(ExportPackageDescription::getName, Function.identity(), (a, b) -> a));
23082308
// a mapping between a package name and a required change
23092309
Map<String, RequiredPackageVersionChange> requiredChanges = new HashMap<>();
23102310
// we must compare compatible changes first, so these where overwritten later by

0 commit comments

Comments
 (0)