From 7c496b37e7e7ef4a7bb6c1b5d65777d2c52df58e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Tue, 4 Jan 2022 18:24:46 +0100
Subject: [PATCH] Fix #463 - Computing target platform for MavenProject is
 missleading
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
---
 .../core/resolver/DefaultTychoResolver.java     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTychoResolver.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTychoResolver.java
index 1d76d61e0b..4ccbd49ee7 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTychoResolver.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTychoResolver.java
@@ -120,22 +120,27 @@ public void resolveProject(MavenSession session, MavenProject project, List<Reac
         }
 
         DependencyResolver resolver = dependencyResolverLocator.lookupDependencyResolver(project);
-
-        logger.info("Computing target platform for " + project);
+        String threadMarker;
+        if (logger.isDebugEnabled()) {
+            threadMarker = "[" + Thread.currentThread().getName().replaceAll("^ForkJoinPool-(\\d+)-", "") + "] ";
+        } else {
+            threadMarker = "";
+        }
+        logger.debug(threadMarker + "Computing preliminary target platform for " + project);
         TargetPlatform preliminaryTargetPlatform = resolver.computePreliminaryTargetPlatform(session, project,
                 reactorProjects);
 
+        logger.info(threadMarker + "Resolving dependencies of " + project);
         ReactorProject reactorProject = DefaultReactorProject.adapt(project);
         TargetPlatformConfiguration configuration = TychoProjectUtils.getTargetPlatformConfiguration(reactorProject);
 
         DependencyResolverConfiguration resolverConfiguration = configuration.getDependencyResolverConfiguration();
 
-        logger.info("Resolving dependencies of " + project);
         DependencyArtifacts dependencyArtifacts = resolver.resolveDependencies(session, project,
                 preliminaryTargetPlatform, reactorProjects, resolverConfiguration);
 
         if (logger.isDebugEnabled() && DebugUtils.isDebugEnabled(session, project)) {
-            StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new StringBuilder(threadMarker);
             sb.append("Resolved target platform for ").append(project).append("\n");
             dependencyArtifacts.toDebugString(sb, "  ");
             logger.debug(sb.toString());
@@ -149,7 +154,7 @@ public void resolveProject(MavenSession session, MavenProject project, List<Reac
             List<ArtifactKey> testDependencies = ((BundleProject) tychoProjectType)
                     .getExtraTestRequirements(reactorProject);
             if (!testDependencies.isEmpty()) {
-                logger.info("Resolving test dependencies of " + project);
+                logger.info(threadMarker + "Resolving test dependencies of " + project);
                 DependencyResolverConfiguration testResolverConfiguration = new DependencyResolverConfiguration() {
                     @Override
                     public OptionalResolutionAction getOptionalResolutionAction() {
@@ -173,7 +178,7 @@ public List<ArtifactKey> getExtraRequirements() {
         resolver.injectDependenciesIntoMavenModel(project, dr, dependencyArtifacts, testDependencyArtifacts, logger);
 
         if (logger.isDebugEnabled() && DebugUtils.isDebugEnabled(session, project)) {
-            StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new StringBuilder(threadMarker);
             sb.append("Injected dependencies for ").append(project.toString()).append("\n");
             for (Dependency dependency : project.getDependencies()) {
                 sb.append("  ").append(dependency.toString());