You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by tz...@apache.org on 2024/10/22 06:28:00 UTC

(incubator-kie-tools) branch main updated: NO-ISSUE: Change `maven-base` to let pre-existing `.mvn/maven.config` files take precedence over default and package-specific configs (#2691)

This is an automated email from the ASF dual-hosted git repository.

tzimanyi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git


The following commit(s) were added to refs/heads/main by this push:
     new f75af6afab1 NO-ISSUE: Change `maven-base` to let pre-existing `.mvn/maven.config` files take precedence over default and package-specific configs (#2691)
f75af6afab1 is described below

commit f75af6afab19bf36cdf8ae7e072f9429773fdc02
Author: Tiago Bento <15...@users.noreply.github.com>
AuthorDate: Tue Oct 22 02:27:54 2024 -0400

    NO-ISSUE: Change `maven-base` to let pre-existing `.mvn/maven.config` files take precedence over default and package-specific configs (#2691)
---
 packages/maven-base/index.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/maven-base/index.js b/packages/maven-base/index.js
index 54fa2ee5da0..5860a133b9e 100755
--- a/packages/maven-base/index.js
+++ b/packages/maven-base/index.js
@@ -146,10 +146,10 @@ module.exports = {
   /**
    * Writes to `.mvn/maven.config` idempotently, preserving what was there before this function was called.
    *
-   * @param mavenConfigString New-line-separated string containing arguments to the `mvn` command.
+   * @param pkgSpecificMvnConfigString New-line-separated string containing arguments to the `mvn` command.
    * @param args An object with a `ignoreDefault: boolean` property.
    */
-  setupMavenConfigFile: (mavenConfigString, args) => {
+  setupMavenConfigFile: (pkgSpecificMvnConfigString, args) => {
     console.info(`[maven-base] Configuring Maven through .mvn/maven.config...`);
     console.time(`[maven-base] Configuring Maven through .mvn/maven.config...`);
 
@@ -171,25 +171,21 @@ module.exports = {
     console.info(`${originalMvnConfigString}` || "<empty>");
     fs.writeFileSync(MVN_CONFIG_ORIGINAL_FILE_PATH, originalMvnConfigString);
 
-    const trimmedMavenConfigString = mavenConfigString
+    const sanitizedPkgSpecificMvnConfigString = pkgSpecificMvnConfigString
       .trim()
       .split("\n")
-      .map((l) => l.trim())
+      .map((line) => line.trim())
       .join("\n");
 
-    const newMavenConfigString = `${originalMvnConfigString ? `\n${originalMvnConfigString}\n` : ``}
-${trimmedMavenConfigString.trim()}`;
+    const newMvnConfigString =
+      (args?.ignoreDefault ? "" : `${DEFAULT_MAVEN_CONFIG}\n`) +
+      (sanitizedPkgSpecificMvnConfigString ? `${sanitizedPkgSpecificMvnConfigString}\n` : "") +
+      (originalMvnConfigString ? `${originalMvnConfigString}\n` : "");
 
     console.info(`[maven-base] Writing '${MVN_CONFIG_FILE_PATH}'...`);
-    console.info(newMavenConfigString);
+    console.info(newMvnConfigString);
 
-    const defaultMavenConfigString = args?.ignoreDefault
-      ? ""
-      : `
-
-${DEFAULT_MAVEN_CONFIG}`;
-
-    fs.writeFileSync(MVN_CONFIG_FILE_PATH, `${newMavenConfigString}${defaultMavenConfigString}`);
+    fs.writeFileSync(MVN_CONFIG_FILE_PATH, newMvnConfigString);
     console.timeEnd(`[maven-base] Configuring Maven through .mvn/maven.config...`);
   },
 };


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org