Fix eclipse-tycho#806 - Improve debug output in case of failing equin…

…ox resolver Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
laeubi · Mar 26, 2022 · d7abc4f · d7abc4f
1 parent 1815355
commit d7abc4f
Showing 1 changed file with 26 additions and 1 deletion.
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EquinoxResolver.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EquinoxResolver.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.StringJoiner;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -162,8 +163,32 @@ public ModuleContainer newResolvedState(ReactorProject project, MavenSession mav
                     report = container.refresh(null);
                 }
             }
+            if (logger.isDebugEnabled()) {
+                Set<Module> unresolvedModules = container.getModules().stream()
+                        .filter(m -> m.getState() != State.RESOLVED).collect(Collectors.toSet());
+                if (!unresolvedModules.isEmpty()) {
+                    logger.warn("OSGi state has " + unresolvedModules.size() + " unresolved module(s):");
+                    logger.debug("The following modules are used to build the current state:");
+                    for (Module m : container.getModules()) {
+                        State state = m.getState();
+                        ModuleRevision revision = m.getCurrentRevision();
+                        boolean unresolved = unresolvedModules.contains(m);
+                        String message = "| " + state + " | " + revision.getSymbolicName() + " ("
+                                + revision.getVersion() + ") @ " + m.getLocation();
+                        if (unresolved) {
+                            logger.warn(message);
+                            String reportMessage = report.getResolutionReportMessage(revision);
+                            String[] lines = reportMessage.split("\r?\n");
+                            for (int i = 1; i < lines.length; i++) {
+                                logger.warn("            " + lines[i]);
+                            }
+                        } else {
+                            logger.debug("   " + message);
+                        }
+                    }
+                }
+            }
             assertResolved(report, moduleRevision);
-
             return container;
         } finally {
             executorService.shutdownNow();