Skip to content

Commit bddc190

Browse files
committed
Suppress "resolving dependencies" when --quiet
Update Spring CLI so that the "resolving dependencies" message is suppressed when `run --quiet` is used. Fixes gh-8946
1 parent cde5793 commit bddc190

File tree

8 files changed

+34
-16
lines changed

8 files changed

+34
-16
lines changed

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,9 @@ public List<RepositoryConfiguration> getRepositoryConfiguration() {
9292
return this.repositoryConfiguration;
9393
}
9494

95+
@Override
96+
public boolean isQuiet() {
97+
return false;
98+
}
99+
95100
}

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public boolean isWatchForFileChanges() {
140140

141141
@Override
142142
public Level getLogLevel() {
143-
if (getOptions().has(RunOptionHandler.this.quietOption)) {
143+
if (isQuiet()) {
144144
return Level.OFF;
145145
}
146146
if (getOptions().has(RunOptionHandler.this.verboseOption)) {
@@ -149,6 +149,11 @@ public Level getLogLevel() {
149149
return Level.INFO;
150150
}
151151

152+
@Override
153+
public boolean isQuiet() {
154+
return getOptions().has(RunOptionHandler.this.quietOption);
155+
}
156+
152157
}
153158

154159
}

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ public GroovyCompiler(final GroovyCompilerConfiguration configuration) {
9595
new SpringBootDependenciesDependencyManagement());
9696

9797
AetherGrapeEngine grapeEngine = AetherGrapeEngineFactory.create(this.loader,
98-
configuration.getRepositoryConfiguration(), resolutionContext);
98+
configuration.getRepositoryConfiguration(), resolutionContext,
99+
configuration.isQuiet());
99100

100101
GrapeEngineInstaller.install(grapeEngine);
101102

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerConfiguration.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,10 @@ public interface GroovyCompilerConfiguration {
7171
*/
7272
List<RepositoryConfiguration> getRepositoryConfiguration();
7373

74+
/**
75+
* Returns if running in quiet mode.
76+
* @return {@code true} if running in quiet mode
77+
*/
78+
boolean isQuiet();
79+
7480
}

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public AetherGrapeEngine(GroovyClassLoader classLoader,
7777
RepositorySystem repositorySystem,
7878
DefaultRepositorySystemSession repositorySystemSession,
7979
List<RemoteRepository> remoteRepositories,
80-
DependencyResolutionContext resolutionContext) {
80+
DependencyResolutionContext resolutionContext, boolean quiet) {
8181
this.classLoader = classLoader;
8282
this.repositorySystem = repositorySystem;
8383
this.session = repositorySystemSession;
@@ -89,12 +89,14 @@ public AetherGrapeEngine(GroovyClassLoader classLoader,
8989
for (RemoteRepository repository : remotes) {
9090
addRepository(repository);
9191
}
92-
this.progressReporter = getProgressReporter(this.session);
92+
this.progressReporter = getProgressReporter(this.session, quiet);
9393
}
9494

95-
private ProgressReporter getProgressReporter(DefaultRepositorySystemSession session) {
96-
String progressReporter = System.getProperty(
97-
"org.springframework.boot.cli.compiler.grape.ProgressReporter");
95+
private ProgressReporter getProgressReporter(DefaultRepositorySystemSession session,
96+
boolean quiet) {
97+
String progressReporter = (quiet ? "none"
98+
: System.getProperty(
99+
"org.springframework.boot.cli.compiler.grape.ProgressReporter"));
98100
if ("detail".equals(progressReporter)
99101
|| Boolean.getBoolean("groovy.grape.report.downloads")) {
100102
return new DetailedProgressReporter(session, System.out);

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,21 @@ public abstract class AetherGrapeEngineFactory {
4444

4545
public static AetherGrapeEngine create(GroovyClassLoader classLoader,
4646
List<RepositoryConfiguration> repositoryConfigurations,
47-
DependencyResolutionContext dependencyResolutionContext) {
48-
47+
DependencyResolutionContext dependencyResolutionContext, boolean quiet) {
4948
RepositorySystem repositorySystem = createServiceLocator()
5049
.getService(RepositorySystem.class);
51-
5250
DefaultRepositorySystemSession repositorySystemSession = MavenRepositorySystemUtils
5351
.newSession();
54-
5552
ServiceLoader<RepositorySystemSessionAutoConfiguration> autoConfigurations = ServiceLoader
5653
.load(RepositorySystemSessionAutoConfiguration.class);
57-
5854
for (RepositorySystemSessionAutoConfiguration autoConfiguration : autoConfigurations) {
5955
autoConfiguration.apply(repositorySystemSession, repositorySystem);
6056
}
61-
6257
new DefaultRepositorySystemSessionAutoConfiguration()
6358
.apply(repositorySystemSession, repositorySystem);
64-
6559
return new AetherGrapeEngine(classLoader, repositorySystem,
6660
repositorySystemSession, createRepositories(repositoryConfigurations),
67-
dependencyResolutionContext);
61+
dependencyResolutionContext, quiet);
6862
}
6963

7064
private static ServiceLocator createServiceLocator() {

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolverTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ public String[] getClasspath() {
8181
return new String[] { "." };
8282
}
8383

84+
@Override
85+
public boolean isQuiet() {
86+
return false;
87+
}
88+
8489
};
8590
this.resolver = new GroovyGrabDependencyResolver(configuration);
8691
}

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private AetherGrapeEngine createGrapeEngine(
5959
dependencyResolutionContext.addDependencyManagement(
6060
new SpringBootDependenciesDependencyManagement());
6161
return AetherGrapeEngineFactory.create(this.groovyClassLoader,
62-
repositoryConfigurations, dependencyResolutionContext);
62+
repositoryConfigurations, dependencyResolutionContext, false);
6363
}
6464

6565
@Test

0 commit comments

Comments
 (0)