Enhance the map of reactor units

Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
eclipse-tycho · Jan 7, 2022 · c688b19 · c688b19
1 parent 7328349
commit c688b19
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/...p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java b/...p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
@@ -30,6 +30,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -54,6 +55,8 @@
 import org.eclipse.tycho.core.shared.MavenContext;
 import org.eclipse.tycho.core.shared.MavenLogger;
 import org.eclipse.tycho.p2.maven.repository.Activator;
+import org.eclipse.tycho.p2.metadata.IArtifactFacade;
+import org.eclipse.tycho.p2.metadata.ReactorProjectFacade;
 import org.eclipse.tycho.p2.remote.IRepositoryIdManager;
 import org.eclipse.tycho.p2.target.ee.ExecutionEnvironmentResolutionHandler;
 import org.eclipse.tycho.p2.target.facade.PomDependencyCollector;
@@ -496,6 +499,8 @@ P2TargetPlatform createTargetPlatformWithUpdatedReactorUnits(PreliminaryTargetPl
         // external units are already filtered, only reactor units need to be filtered again
         if (reactorUnitsMap != null) {
             allUnits.addAll(filterUnits(configuredFilters, reactorUnitsMap.keySet()));
+        } else {
+            reactorUnitsMap = new LinkedHashMap<>();
         }
 
         IRawArtifactFileProvider pomDependencyArtifactRepo = pomDependencyCollector.getArtifactRepoOfPublishedBundles();
@@ -506,10 +511,18 @@ P2TargetPlatform createTargetPlatformWithUpdatedReactorUnits(PreliminaryTargetPl
         ArtifactRepositoryBlackboard.putRepository(blackboardKey, new ProviderOnlyArtifactRepository(jointArtifacts,
                 Activator.getProvisioningAgent(), blackboardKey.toURI()));
         logger.debug("Registered artifact repository " + blackboardKey);
-        //FIXME map POM deps to reactor ReactorProjectIdentities??
         allUnits.addAll(filterUnits(configuredFilters, pomDependencyCollector.gatherMavenInstallableUnits()));
+        Map<IInstallableUnit, IArtifactFacade> mavenInstallableUnits = pomDependencyCollector
+                .getMavenInstallableUnits();
+        for (Entry<IInstallableUnit, IArtifactFacade> entry : mavenInstallableUnits.entrySet()) {
+            IArtifactFacade value = entry.getValue();
+            if (value instanceof ReactorProjectFacade) {
+                ReactorProjectFacade projectFacade = (ReactorProjectFacade) value;
+                reactorUnitsMap.put(entry.getKey(), projectFacade.getReactorProject().getIdentities());
+            }
+        }
         return new FinalTargetPlatformImpl(allUnits, preliminaryTP.getEEResolutionHints(), jointArtifacts,
-                localArtifactRepository, pomDependencyCollector.getMavenInstallableUnits(), reactorUnitsMap);
+                localArtifactRepository, mavenInstallableUnits, reactorUnitsMap);
     }
 
     protected Collection<? extends IInstallableUnit> filterUnits(TargetPlatformFilterEvaluator configuredFilters,