diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CliUtils.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CliUtils.java index 834f017b2e76..b7387a510b79 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CliUtils.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CliUtils.java @@ -115,7 +115,7 @@ public static UnaryOperator or(UnaryOperator... callbacks) { public static int toMavenExecutionRequestLoggingLevel(Slf4jConfiguration.Level level) { requireNonNull(level, "level"); return switch (level) { - case DEBUG -> MavenExecutionRequest.LOGGING_LEVEL_DEBUG; + case TRACE, DEBUG -> MavenExecutionRequest.LOGGING_LEVEL_DEBUG; case INFO -> MavenExecutionRequest.LOGGING_LEVEL_INFO; case ERROR -> MavenExecutionRequest.LOGGING_LEVEL_ERROR; }; @@ -124,7 +124,7 @@ public static int toMavenExecutionRequestLoggingLevel(Slf4jConfiguration.Level l public static int toPlexusLoggingLevel(Slf4jConfiguration.Level level) { requireNonNull(level, "level"); return switch (level) { - case DEBUG -> Logger.LEVEL_DEBUG; + case TRACE, DEBUG -> Logger.LEVEL_DEBUG; case INFO -> Logger.LEVEL_INFO; case ERROR -> Logger.LEVEL_ERROR; }; diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/logging/Slf4jConfiguration.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/logging/Slf4jConfiguration.java index 28fa676f5464..ee6bffe95c8b 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/logging/Slf4jConfiguration.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/logging/Slf4jConfiguration.java @@ -29,6 +29,7 @@ public interface Slf4jConfiguration { * Level */ enum Level { + TRACE, DEBUG, INFO, ERROR diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/logging/impl/MavenSimpleConfiguration.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/logging/impl/MavenSimpleConfiguration.java index 7bef54100bff..7c4acb61e119 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/logging/impl/MavenSimpleConfiguration.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/logging/impl/MavenSimpleConfiguration.java @@ -37,6 +37,7 @@ public class MavenSimpleConfiguration extends BaseSlf4jConfiguration { public void setRootLoggerLevel(Level level) { String value = switch (level) { + case TRACE -> "trace"; case DEBUG -> "debug"; case INFO -> "info"; case ERROR -> "error"; diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/LookupInvokerLoggingTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/LookupInvokerLoggingTest.java index c76cd26764ff..2ada9f443d07 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/LookupInvokerLoggingTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/LookupInvokerLoggingTest.java @@ -158,6 +158,7 @@ public void setRootLoggerLevel(Level level) { // Simulate what MavenSimpleConfiguration does String value = switch (level) { + case TRACE -> "trace"; case DEBUG -> "debug"; case INFO -> "info"; case ERROR -> "error"; diff --git a/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 2ef0706a6302..68bb5a739119 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -131,7 +131,7 @@ private ClassRealm newRealm(String id) { try { ClassRealm classRealm = world.newRealm(realmId, null); - logger.debug("Created new class realm {}", realmId); + logger.trace("Created new class realm {}", realmId); return classRealm; } catch (DuplicateRealmException e) { @@ -177,8 +177,8 @@ private ClassRealm createRealm( for (Artifact artifact : artifacts) { if (!isProvidedArtifact(artifact, v4api) && artifact.getFile() != null) { constituents.add(new ArtifactClassRealmConstituent(artifact)); - } else if (logger.isDebugEnabled()) { - logger.debug(" Excluded: {}", getId(artifact)); + } else if (logger.isTraceEnabled()) { + logger.trace(" Excluded: {}", getId(artifact)); } } } @@ -314,14 +314,14 @@ private void callDelegates( } private void populateRealm(ClassRealm classRealm, List constituents) { - logger.debug("Populating class realm {}", classRealm.getId()); + logger.trace("Populating class realm {}", classRealm.getId()); for (ClassRealmConstituent constituent : constituents) { File file = constituent.getFile(); - if (logger.isDebugEnabled()) { + if (logger.isTraceEnabled()) { String id = getId(constituent); - logger.debug(" Included: {}", id); + logger.trace(" Included: {}", id); } try { @@ -335,23 +335,23 @@ private void populateRealm(ClassRealm classRealm, List co private void wireRealm(ClassRealm classRealm, List parentImports, Map foreignImports) { if (foreignImports != null && !foreignImports.isEmpty()) { - logger.debug("Importing foreign packages into class realm {}", classRealm.getId()); + logger.trace("Importing foreign packages into class realm {}", classRealm.getId()); for (Map.Entry entry : foreignImports.entrySet()) { ClassLoader importedRealm = entry.getValue(); String imp = entry.getKey(); - logger.debug(" Imported: {} < {}", imp, getId(importedRealm)); + logger.trace(" Imported: {} < {}", imp, getId(importedRealm)); classRealm.importFrom(importedRealm, imp); } } if (parentImports != null && !parentImports.isEmpty()) { - logger.debug("Importing parent packages into class realm {}", classRealm.getId()); + logger.trace("Importing parent packages into class realm {}", classRealm.getId()); for (String imp : parentImports) { - logger.debug(" Imported: {} < {}", imp, getId(classRealm.getParentClassLoader())); + logger.trace(" Imported: {} < {}", imp, getId(classRealm.getParentClassLoader())); classRealm.importFromParent(imp); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java index 6695b69a12b9..5954da00bc4f 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java @@ -49,7 +49,7 @@ public class LifecycleDebugLogger { private final Logger logger = LoggerFactory.getLogger(getClass()); public void debug(String s) { - logger.debug(s); + logger.trace(s); } public void info(String s) { @@ -57,45 +57,45 @@ public void info(String s) { } public void debugReactorPlan(ProjectBuildList projectBuilds) { - if (!logger.isDebugEnabled()) { + if (!logger.isTraceEnabled()) { return; } - logger.debug("=== REACTOR BUILD PLAN ================================================"); + logger.trace("=== REACTOR BUILD PLAN ================================================"); for (Iterator it = projectBuilds.iterator(); it.hasNext(); ) { ProjectSegment projectBuild = it.next(); - logger.debug("Project: " + projectBuild.getProject().getId()); - logger.debug("Tasks: " + projectBuild.getTaskSegment().getTasks()); - logger.debug("Style: " + (projectBuild.getTaskSegment().isAggregating() ? "Aggregating" : "Regular")); + logger.trace("Project: " + projectBuild.getProject().getId()); + logger.trace("Tasks: " + projectBuild.getTaskSegment().getTasks()); + logger.trace("Style: " + (projectBuild.getTaskSegment().isAggregating() ? "Aggregating" : "Regular")); if (it.hasNext()) { - logger.debug("-----------------------------------------------------------------------"); + logger.trace("-----------------------------------------------------------------------"); } } - logger.debug("======================================================================="); + logger.trace("======================================================================="); } public void debugProjectPlan(MavenProject currentProject, MavenExecutionPlan executionPlan) { - if (!logger.isDebugEnabled()) { + if (!logger.isTraceEnabled()) { return; } - logger.debug("=== PROJECT BUILD PLAN ================================================"); - logger.debug("Project: " + BuilderCommon.getKey(currentProject)); + logger.trace("=== PROJECT BUILD PLAN ================================================"); + logger.trace("Project: " + BuilderCommon.getKey(currentProject)); debugDependencyRequirements(executionPlan.getMojoExecutions()); - logger.debug("Repositories (dependencies): " + currentProject.getRemoteProjectRepositories()); - logger.debug("Repositories (plugins) : " + currentProject.getRemotePluginRepositories()); + logger.trace("Repositories (dependencies): " + currentProject.getRemoteProjectRepositories()); + logger.trace("Repositories (plugins) : " + currentProject.getRemotePluginRepositories()); for (ExecutionPlanItem mojoExecution : executionPlan) { debugMojoExecution(mojoExecution.getMojoExecution()); } - logger.debug("======================================================================="); + logger.trace("======================================================================="); } private void debugMojoExecution(MojoExecution mojoExecution) { @@ -106,7 +106,7 @@ private void debugMojoExecution(MojoExecution mojoExecution) { Map> forkedExecutions = mojoExecution.getForkedExecutions(); if (!forkedExecutions.isEmpty()) { for (Map.Entry> fork : forkedExecutions.entrySet()) { - logger.debug("--- init fork of " + fork.getKey() + " for " + mojoExecId + " ---"); + logger.trace("--- init fork of " + fork.getKey() + " for " + mojoExecId + " ---"); debugDependencyRequirements(fork.getValue()); @@ -114,15 +114,15 @@ private void debugMojoExecution(MojoExecution mojoExecution) { debugMojoExecution(forkedExecution); } - logger.debug("--- exit fork of " + fork.getKey() + " for " + mojoExecId + " ---"); + logger.trace("--- exit fork of " + fork.getKey() + " for " + mojoExecId + " ---"); } } - logger.debug("-----------------------------------------------------------------------"); - logger.debug("Goal: " + mojoExecId); - logger.debug( + logger.trace("-----------------------------------------------------------------------"); + logger.trace("Goal: " + mojoExecId); + logger.trace( "Style: " + (mojoExecution.getMojoDescriptor().isAggregator() ? "Aggregating" : "Regular")); - logger.debug("Configuration: " + mojoExecution.getConfiguration()); + logger.trace("Configuration: " + mojoExecution.getConfiguration()); } private void debugDependencyRequirements(List mojoExecutions) { @@ -143,7 +143,7 @@ private void debugDependencyRequirements(List mojoExecutions) { } } - logger.debug("Dependencies (collect): " + scopesToCollect); - logger.debug("Dependencies (resolve): " + scopesToResolve); + logger.trace("Dependencies (collect): " + scopesToCollect); + logger.trace("Dependencies (resolve): " + scopesToResolve); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java index c61889cda5fe..ef6909ebb98c 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java @@ -135,7 +135,7 @@ private void multiThreadedProjectTaskSegmentBuild( // schedule independent projects (ordered by critical path priority) for (MavenProject mavenProject : analyzer.getRootSchedulableBuilds()) { ProjectSegment projectSegment = projectBuildList.get(mavenProject); - logger.debug("Scheduling: {}", projectSegment.getProject()); + logger.trace("Scheduling: {}", projectSegment.getProject()); Callable cb = createBuildCallable(rootSession, projectSegment, reactorContext, taskSegment, duplicateArtifactIds); service.submit(cb); @@ -155,7 +155,7 @@ private void multiThreadedProjectTaskSegmentBuild( analyzer.markAsFinished(projectBuild.getProject()); for (MavenProject mavenProject : newItemsThatCanBeBuilt) { ProjectSegment scheduledDependent = projectBuildList.get(mavenProject); - logger.debug("Scheduling: {}", scheduledDependent); + logger.trace("Scheduling: {}", scheduledDependent); Callable cb = createBuildCallable( rootSession, scheduledDependent, reactorContext, taskSegment, duplicateArtifactIds); service.submit(cb); diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java index cbd5ae2ed9db..ebde4a53296d 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java @@ -394,7 +394,7 @@ private void processStep(BuildStep step) { if (shouldExecute && anyPredecessorFailed) { // We'll run the step but mark it as SKIPPED instead of SCHEDULED if (step.status.compareAndSet(CREATED, SKIPPED)) { - logger.debug( + logger.trace( "Running after:* step {} for cleanup but marking it as SKIPPED because a predecessor failed", step); executor.execute(() -> { @@ -405,7 +405,7 @@ private void processStep(BuildStep step) { step.status.compareAndSet(SKIPPED, FAILED); // Store the exception in the step for handling in the TEARDOWN phase step.exception = e; - logger.debug("Stored exception for step {} to be handled in TEARDOWN phase", step, e); + logger.trace("Stored exception for step {} to be handled in TEARDOWN phase", step, e); // Let the scheduler handle after:* phases and TEARDOWN in the next cycle executePlan(); } @@ -443,7 +443,7 @@ private void processStep(BuildStep step) { // Store the exception in the step for handling in the TEARDOWN phase step.exception = e; - logger.debug("Stored exception for step {} to be handled in TEARDOWN phase", step, e); + logger.trace("Stored exception for step {} to be handled in TEARDOWN phase", step, e); // Let the scheduler handle after:* phases and TEARDOWN in the next cycle executePlan(); @@ -453,18 +453,18 @@ private void processStep(BuildStep step) { // Skip the step and provide a specific reason if (!shouldExecute) { if (status.isHalted()) { - logger.debug("Skipping step {} because the build is halted", step); + logger.trace("Skipping step {} because the build is halted", step); } else if (status.isBlackListed(step.project)) { - logger.debug("Skipping step {} because the project is blacklisted", step); + logger.trace("Skipping step {} because the project is blacklisted", step); } else if (TEARDOWN.equals(step.name)) { // This should never happen given we always process TEARDOWN steps logger.warn("Unexpected skipping of TEARDOWN step {}", step); } else { - logger.debug("Skipping step {} because a dependency has failed", step); + logger.trace("Skipping step {} because a dependency has failed", step); } } else { // Skip because predecessors failed or were skipped - logger.debug( + logger.trace( "Skipping step {} because one or more predecessors did not execute successfully", step); } // Recursively call executePlan to process steps that depend on this one diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java index 4bd4f51379a2..389a077a6582 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java @@ -88,7 +88,7 @@ public DefaultPluginPrefixResolver( @Override public PluginPrefixResult resolve(PluginPrefixRequest request) throws NoPluginFoundForPrefixException { - logger.debug("Resolving plugin prefix {} from {}", request.getPrefix(), request.getPluginGroups()); + logger.trace("Resolving plugin prefix {} from {}", request.getPrefix(), request.getPluginGroups()); Model pom = request.getPom(); Build build = pom != null ? pom.getBuild() : null; @@ -132,7 +132,7 @@ public PluginPrefixResult resolve(PluginPrefixRequest request) throws NoPluginFo request.getRepositorySession().getLocalRepository(), request.getRepositories()); } else { - logger.debug( + logger.trace( "Resolved plugin prefix {} to {}:{} from repository {}", request.getPrefix(), result.getGroupId(), diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java index b2afbb073efb..7d1f6be264e4 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java @@ -106,7 +106,7 @@ public PluginVersionResult resolve(PluginVersionRequest request) throws PluginVe if (result == null) { result = resolveFromRepository(request); - logger.debug( + logger.trace( "Resolved plugin version for {}:{} to {} from repository {}", request.getGroupId(), request.getArtifactId(), @@ -115,7 +115,7 @@ public PluginVersionResult resolve(PluginVersionRequest request) throws PluginVe cache.putIfAbsent(key, result); } else { - logger.debug( + logger.trace( "Reusing cached resolved plugin version for {}:{} to {} from POM {}", request.getGroupId(), request.getArtifactId(), @@ -123,7 +123,7 @@ public PluginVersionResult resolve(PluginVersionRequest request) throws PluginVe request.getPom()); } } else { - logger.debug( + logger.trace( "Reusing cached resolved plugin version for {}:{} to {} from POM {}", request.getGroupId(), request.getArtifactId(), @@ -282,7 +282,7 @@ private boolean isCompatible(PluginVersionRequest request, String version) { pluginDescriptor = pluginManager.getPluginDescriptor( plugin, request.getRepositories(), request.getRepositorySession()); } catch (PluginResolutionException e) { - logger.debug("Ignoring unresolvable plugin version {}", version, e); + logger.trace("Ignoring unresolvable plugin version {}", version, e); return false; } catch (Exception e) { // ignore for now and delay failure to higher level processing diff --git a/impl/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/impl/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java index 411a483b224a..36eefd5eebbe 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java @@ -95,9 +95,9 @@ private Model newTestModel() { } @Test - void testDebugEnabled() throws PlexusContainerException { + void testTraceEnabled() throws PlexusContainerException { Logger logger = mock(Logger.class); - when(logger.isDebugEnabled()).thenReturn(true); + when(logger.isTraceEnabled()).thenReturn(true); DefaultClassRealmManager classRealmManager; ClassRealm classRealm; @@ -122,18 +122,18 @@ void testDebugEnabled() throws PlexusContainerException { classRealm.getURLs()[0].getPath().endsWith("local/repository/some/path"), "ClassRealm URL should end with local repository path"); - verifier.verify(logger, calls(1)).debug("Importing foreign packages into class realm {}", "maven.api"); - verifier.verify(logger, calls(1)).debug(" Imported: {} < {}", "group1:artifact1", "test"); - verifier.verify(logger, calls(1)).debug(" Excluded: {}", "group1:artifact2:ext:classifier1:null"); + verifier.verify(logger, calls(1)).trace("Importing foreign packages into class realm {}", "maven.api"); + verifier.verify(logger, calls(1)).trace(" Imported: {} < {}", "group1:artifact1", "test"); + verifier.verify(logger, calls(1)).trace(" Excluded: {}", "group1:artifact2:ext:classifier1:null"); verifier.verify(logger, calls(1)) - .debug("Populating class realm {}", "project>modelGroup1:modelArtifact1:modelVersion1"); - verifier.verify(logger, calls(1)).debug(" Included: {}", "group1:artifact1:ext:classifier1:null"); + .trace("Populating class realm {}", "project>modelGroup1:modelArtifact1:modelVersion1"); + verifier.verify(logger, calls(1)).trace(" Included: {}", "group1:artifact1:ext:classifier1:null"); } @Test - void testDebugDisabled() throws PlexusContainerException { + void testTraceDisabled() throws PlexusContainerException { Logger logger = mock(Logger.class); - when(logger.isDebugEnabled()).thenReturn(false); + when(logger.isTraceEnabled()).thenReturn(false); DefaultClassRealmManager classRealmManager; ClassRealm classRealm; @@ -158,11 +158,11 @@ void testDebugDisabled() throws PlexusContainerException { classRealm.getURLs()[0].getPath().endsWith("local/repository/some/path"), "ClassRealm URL should end with local repository path"); - verifier.verify(logger, calls(1)).debug("Importing foreign packages into class realm {}", "maven.api"); - verifier.verify(logger, calls(1)).debug(" Imported: {} < {}", "group1:artifact1", "test"); + verifier.verify(logger, calls(1)).trace("Importing foreign packages into class realm {}", "maven.api"); + verifier.verify(logger, calls(1)).trace(" Imported: {} < {}", "group1:artifact1", "test"); verifier.verify(logger, calls(1)) - .debug("Populating class realm {}", "project>modelGroup1:modelArtifact1:modelVersion1"); - verifier.verify(logger, never()).debug(" Included: {}", "group1:artifact1:ext:classifier1:null"); - verifier.verify(logger, never()).debug(" Excluded: {}", "group1:artifact2:ext:classifier1:null"); + .trace("Populating class realm {}", "project>modelGroup1:modelArtifact1:modelVersion1"); + verifier.verify(logger, never()).trace(" Included: {}", "group1:artifact1:ext:classifier1:null"); + verifier.verify(logger, never()).trace(" Excluded: {}", "group1:artifact2:ext:classifier1:null"); } } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/cache/CacheConfigurationResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/cache/CacheConfigurationResolver.java index d0b162ba0fbe..eaaf1f857c55 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/cache/CacheConfigurationResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/cache/CacheConfigurationResolver.java @@ -103,7 +103,7 @@ public static CacheConfig resolveConfig(Request req, Session session) { if (selector.matches(req)) { if (mergedConfig == null) { mergedConfig = selector.config(); - LOGGER.debug( + LOGGER.trace( "Cache config for {}: matched selector '{}' with config {}", req.getClass().getSimpleName(), selector, @@ -111,7 +111,7 @@ public static CacheConfig resolveConfig(Request req, Session session) { } else { PartialCacheConfig previousConfig = mergedConfig; mergedConfig = mergedConfig.mergeWith(selector.config()); - LOGGER.debug( + LOGGER.trace( "Cache config for {}: merged selector '{}' with previous config {} -> {}", req.getClass().getSimpleName(), selector, @@ -134,7 +134,7 @@ public static CacheConfig resolveConfig(Request req, Session session) { finalConfig = new CacheConfig(finalConfig.scope(), finalConfig.referenceType(), keyRefType, valueRefType); } - LOGGER.debug("Final cache config for {}: {}", req.getClass().getSimpleName(), finalConfig); + LOGGER.trace("Final cache config for {}: {}", req.getClass().getSimpleName(), finalConfig); return finalConfig; } @@ -142,7 +142,7 @@ public static CacheConfig resolveConfig(Request req, Session session) { if (legacyRetention != null) { CacheConfig config = new CacheConfig( legacyRetention, getDefaultReferenceType(legacyRetention), keyRefType, valueRefType); - LOGGER.debug( + LOGGER.trace( "Cache config for {}: {} (legacy CacheMetadata)", req.getClass().getSimpleName(), config); @@ -152,14 +152,14 @@ public static CacheConfig resolveConfig(Request req, Session session) { if (keyRefType != null && valueRefType != null) { CacheConfig config = new CacheConfig( CacheConfig.DEFAULT.scope(), CacheConfig.DEFAULT.referenceType(), keyRefType, valueRefType); - LOGGER.debug( + LOGGER.trace( "Cache config for {}: {} (with key/value refs)", req.getClass().getSimpleName(), config); return config; } - LOGGER.debug("Cache config for {}: {} (default)", req.getClass().getSimpleName(), CacheConfig.DEFAULT); + LOGGER.trace("Cache config for {}: {} (default)", req.getClass().getSimpleName(), CacheConfig.DEFAULT); return CacheConfig.DEFAULT; } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/cache/DefaultRequestCache.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/cache/DefaultRequestCache.java index 79a7e73a2129..d463703d8bda 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/cache/DefaultRequestCache.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/cache/DefaultRequestCache.java @@ -215,8 +215,8 @@ protected , REP extends Result> CachingSupplier, REP extends Result> CachingSupplier>> caches = session.getData() .computeIfAbsent(KEY, () -> { if (config.hasSeparateKeyValueReferenceTypes()) { - LOGGER.debug( + LOGGER.trace( "Creating SESSION_SCOPED parent cache with key={}, value={}", keyReferenceType, valueReferenceType); @@ -253,7 +253,7 @@ protected , REP extends Result> CachingSupplier { - LOGGER.debug( + LOGGER.trace( "Creating SESSION_SCOPED cache with key={}, value={}", keyReferenceType, valueReferenceType); @@ -283,8 +283,8 @@ protected , REP extends Result> CachingSupplier, REP extends Result> CachingSupplier>> caches = session.getData() .computeIfAbsent(KEY, () -> { if (config.hasSeparateKeyValueReferenceTypes()) { - LOGGER.debug( + LOGGER.trace( "Creating REQUEST_SCOPED parent cache with key={}, value={}", keyReferenceType, valueReferenceType); @@ -310,7 +310,7 @@ protected , REP extends Result> CachingSupplier { - LOGGER.debug( + LOGGER.trace( "Creating REQUEST_SCOPED cache with key={}, value={}", keyReferenceType, valueReferenceType); @@ -333,8 +333,8 @@ protected , REP extends Result> CachingSupplier, REP extends Result> CachingSupplier>> caches = session.getData() .computeIfAbsent(KEY, () -> { if (config.hasSeparateKeyValueReferenceTypes()) { - LOGGER.debug( + LOGGER.trace( "Creating PERSISTENT parent cache with key={}, value={}", keyReferenceType, valueReferenceType); @@ -361,7 +361,7 @@ protected , REP extends Result> CachingSupplier { - LOGGER.debug( + LOGGER.trace( "Creating PERSISTENT cache with key={}, value={}", keyReferenceType, valueReferenceType); Cache> newCache = Cache.newCache(keyReferenceType, valueReferenceType, "RequestCache-PERSISTENT"); @@ -381,8 +381,8 @@ protected , REP extends Result> CachingSupplier getPropertiesWithProfiles(Model model, Map newRepos = repositories.stream().map(Object::toString).toList(); if (!Objects.equals(oldRepos, newRepos)) { - logger.debug("Replacing repositories from " + resultModel.getId() + "\n" + logger.trace("Replacing repositories from " + resultModel.getId() + "\n" + newRepos.stream().map(s -> " " + s).collect(Collectors.joining("\n"))); } } @@ -1580,7 +1580,7 @@ Model doReadFileModel(Set activeModelReads) throws ModelBuilderException { Path rootDirectory; boolean rootDirectoryFromSession = false; setSource(modelSource.getLocation()); - logger.debug("Reading file model from " + modelSource.getLocation()); + logger.trace("Reading file model from " + modelSource.getLocation()); Path sourcePath = modelSource.getPath(); Path normalizedPath = sourcePath != null ? sourcePath.normalize() : null; boolean trackRead = normalizedPath != null && activeModelReads.add(normalizedPath); @@ -1792,7 +1792,7 @@ Model doReadFileModel(Set activeModelReads) throws ModelBuilderException { : null) .build(); } catch (ModelBuilderException e) { - logger.debug( + logger.trace( "Could not read root model properties for CI-friendly version interpolation", e); } } @@ -2365,7 +2365,7 @@ public Model buildRawModel(ModelBuilderRequest request) throws ModelBuilderExcep clearRequestScopedCache(request); } catch (Exception e) { // Log but don't fail the build due to cache cleanup issues - logger.debug("Failed to clear REQUEST_SCOPED cache for raw model request: {}", request, e); + logger.trace("Failed to clear REQUEST_SCOPED cache for raw model request: {}", request, e); } RequestTraceHelper.exit(trace); } @@ -2715,8 +2715,8 @@ private > void clearRequestScopedCache(REQ req) { int beforeSize = map.size(); map.removeIf((k, v) -> !(k instanceof RgavCacheKey) && !(k instanceof SourceCacheKey)); int afterSize = map.size(); - if (logger.isDebugEnabled()) { - logger.debug( + if (logger.isTraceEnabled()) { + logger.trace( "Cleared REQUEST_SCOPED cache for request: {}, removed {} entries, remaining entries: {}", outerRequestKey.getClass().getSimpleName(), afterSize - beforeSize, diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java index 4283cfceaec2..24c993d63857 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java @@ -352,7 +352,7 @@ private void populateResult(InternalSession session, ArtifactDescriptorResult re for (org.apache.maven.api.model.Dependency dependency : model.getDependencies()) { if (hasUninterpolatedExpression(dependency)) { - logger.debug("Filtered dependency with uninterpolated expression: {}", dependency); + logger.trace("Filtered dependency with uninterpolated expression: {}", dependency); continue; } result.addDependency(convert(dependency, stereotypes)); @@ -362,7 +362,7 @@ private void populateResult(InternalSession session, ArtifactDescriptorResult re if (dependencyManagement != null) { for (org.apache.maven.api.model.Dependency dependency : dependencyManagement.getDependencies()) { if (hasUninterpolatedExpression(dependency)) { - logger.debug("Filtered managed dependency with uninterpolated expression: {}", dependency); + logger.trace("Filtered managed dependency with uninterpolated expression: {}", dependency); continue; } result.addManagedDependency(convert(dependency, stereotypes)); @@ -440,21 +440,21 @@ private static boolean hasUninterpolatedExpression(org.apache.maven.api.model.De private void filterUninterpolated(ArtifactDescriptorResult result) { result.getRepositories().removeIf(repo -> { if (containsPlaceholder(repo.getId()) || containsPlaceholder(repo.getUrl())) { - logger.debug("Filtered repository with uninterpolated expression: {}", repo); + logger.trace("Filtered repository with uninterpolated expression: {}", repo); return true; } return false; }); result.getDependencies().removeIf(dep -> { if (hasUninterpolatedExpression(dep.getArtifact())) { - logger.debug("Filtered dependency with uninterpolated expression: {}", dep); + logger.trace("Filtered dependency with uninterpolated expression: {}", dep); return true; } return false; }); result.getManagedDependencies().removeIf(dep -> { if (hasUninterpolatedExpression(dep.getArtifact())) { - logger.debug("Filtered managed dependency with uninterpolated expression: {}", dep); + logger.trace("Filtered managed dependency with uninterpolated expression: {}", dep); return true; } return false; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java index 2549b4f653eb..c8bab2c3f7bf 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java @@ -62,7 +62,7 @@ public Artifact relocatedTarget( null, relocation.getVersion(), relocation.getMessage()); - LOGGER.debug( + LOGGER.trace( "The artifact {} has been relocated to {}: {}", artifactDescriptorResult.getRequest().getArtifact(), result, diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java index a667b2a2864d..e48130de5b9a 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java @@ -69,7 +69,7 @@ public Artifact relocatedTarget( if (relocation.target == SENTINEL) { String message = "The artifact " + original + " has been banned from resolution: " + (relocation.global ? "User global ban" : "User project ban"); - LOGGER.debug(message); + LOGGER.trace(message); throw new ArtifactDescriptorException(artifactDescriptorResult, message); } Artifact result = new RelocatedArtifact( @@ -80,7 +80,7 @@ public Artifact relocatedTarget( isAny(relocation.target.getExtension()) ? null : relocation.target.getExtension(), isAny(relocation.target.getVersion()) ? null : relocation.target.getVersion(), relocation.global ? "User global relocation" : "User project relocation"); - LOGGER.debug( + LOGGER.trace( "The artifact {} has been relocated to {}: {}", original, result, diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/TypeDeriver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/TypeDeriver.java index 6343cd2cbfa7..e099fb7d6fc6 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/TypeDeriver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/TypeDeriver.java @@ -60,13 +60,13 @@ public class TypeDeriver implements DependencyGraphTransformer { @Override public DependencyNode transformGraph(DependencyNode root, DependencyGraphTransformationContext context) { ArtifactTypeRegistry registry = context.getSession().getArtifactTypeRegistry(); - if (logger.isDebugEnabled()) { + if (logger.isTraceEnabled()) { StringBuilder sb = new StringBuilder(); root.accept(new DependencyGraphDumper( l -> sb.append(l).append("\n"), DependencyGraphDumper.defaultsWith( List.of(DependencyGraphDumper.artifactProperties(List.of(ArtifactProperties.TYPE)))))); - logger.debug("TYPES: Before transform:\n {}", sb); + logger.trace("TYPES: Before transform:\n {}", sb); } root.accept(new TypeDeriverVisitor(registry)); // Apply processor type info collected by TypeCollector before conflict resolution. @@ -78,13 +78,13 @@ public DependencyNode transformGraph(DependencyNode root, DependencyGraphTransfo if (collectedProcessorTypes != null) { root.accept(new ProcessorTypeMerger(collectedProcessorTypes)); } - if (logger.isDebugEnabled()) { + if (logger.isTraceEnabled()) { StringBuilder sb = new StringBuilder(); root.accept(new DependencyGraphDumper( l -> sb.append(l).append("\n"), DependencyGraphDumper.defaultsWith( List.of(DependencyGraphDumper.artifactProperties(List.of(ArtifactProperties.TYPE)))))); - logger.debug("TYPES: After transform:\n {}", sb); + logger.trace("TYPES: After transform:\n {}", sb); } return root; }