Skip to content

JENKINS-72386: replace --no-transfer-progress option #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

JENKINS-72386: replace --no-transfer-progress option #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ https://github.com/jenkinsci/configuration-as-code-plugin/tree/master/demos/pipe
[#feature-sensible-default-maven-settings]
=== Sensible default Maven parameters

The Maven parameters that are useful on a build server, `--batch-mode` (`-B`) and `--no-transfer-progress` (`-ntp`) are enable by default, no need to add them in your mvn invocations.
The Maven parameters that are useful on a build server, `--batch-mode` (`-B`) is enable by default and transfer output is suppressed, no need to add them in your mvn invocations.

if **<<feature-traceability>>** is enabled, `--no-transfer-progress` (`-ntp`) option is removed, and `--show-version` (`-V`) is added.
if **<<feature-traceability>>** is enabled, `--show-version` (`-V`) is added and transfer output is enabled.

[#feature-maven-integration-global-settings]
=== Maven Settings Support
Expand Down
8 changes: 7 additions & 1 deletion ...ine-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepExecution2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,13 @@ private void setupMaven(@NonNull Collection<Credentials> credentials) throws IOE
boolean isUnix = Boolean.TRUE.equals(getComputer().isUnix());
StringBuilder mavenConfig = new StringBuilder();
mavenConfig.append("--batch-mode ");
ifTraceabilityDisabled(() -> mavenConfig.append("--no-transfer-progress "));
ifTraceabilityDisabled(() -> {
// In batch-mode transfer output is sent through Slf4jMavenTransferListener
// Not using -ntp because it breaks maven <=3.6 which does not support the option
// Maven 4.0 supports CI=true to quite transfer output
mavenConfig.append(
"-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn ");
});
ifTraceabilityEnabled(() -> mavenConfig.append("--show-version "));
if (StringUtils.isNotEmpty(settingsFilePath)) {
// JENKINS-57324 escape '%' as '%%'. See
Expand Down