From f759e7fa27e7e4f6b51f9d6f7be5416888a43965 Mon Sep 17 00:00:00 2001 From: Tiago Bento Date: Tue, 1 Oct 2024 00:27:52 -0400 Subject: [PATCH] Rename method --- .../mvn.bootstrap.js | 4 ++-- .../jbpm-compact-architecture-example/mvn.bootstrap.js | 4 ++-- .../sonataflow-greeting-quarkus-example/mvn.bootstrap.js | 4 ++-- packages/dashbuilder/mvn.bootstrap.js | 4 ++-- packages/dev-deployment-base-image/mvn.bootstrap.js | 8 ++++++-- .../mvn.bootstrap.js | 8 ++++++-- packages/dmn-testing-models/mvn.bootstrap.js | 4 ++-- packages/extended-services-java/mvn.bootstrap.js | 4 ++-- packages/jbpm-quarkus-devui/mvn.bootstrap.js | 4 ++-- packages/maven-base/mvn.bootstrap.js | 4 ++-- packages/maven-config-setup-helper/index.js | 2 +- .../mvn.bootstrap.js | 4 ++-- .../serverless-workflow-diagram-editor/mvn.bootstrap.js | 4 ++-- packages/sonataflow-quarkus-devui/mvn.bootstrap.js | 4 ++-- packages/stunner-editors/mvn.bootstrap.js | 4 ++-- .../mvn.bootstrap.js | 8 ++++++-- packages/yard-model/mvn.bootstrap.js | 8 ++++++-- packages/yard-validator-worker/mvn.bootstrap.js | 4 ++-- 18 files changed, 51 insertions(+), 35 deletions(-) diff --git a/examples/drools-process-usertasks-quarkus-example/mvn.bootstrap.js b/examples/drools-process-usertasks-quarkus-example/mvn.bootstrap.js index 33fc0a164d5..840be7b2607 100644 --- a/examples/drools-process-usertasks-quarkus-example/mvn.bootstrap.js +++ b/examples/drools-process-usertasks-quarkus-example/mvn.bootstrap.js @@ -18,9 +18,9 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.droolsProcessUsertasksQuarkusExample.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); diff --git a/examples/jbpm-compact-architecture-example/mvn.bootstrap.js b/examples/jbpm-compact-architecture-example/mvn.bootstrap.js index 4830c993bbc..87ac8b50bab 100644 --- a/examples/jbpm-compact-architecture-example/mvn.bootstrap.js +++ b/examples/jbpm-compact-architecture-example/mvn.bootstrap.js @@ -21,12 +21,12 @@ const buildEnv = require("./env"); const { setupMavenConfigFile, setPomProperty, - buildTailFromPackageJson, + buildTailFromPackageJsonDependencies, } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.jbpmCompactArchitectureExample.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); setPomProperty({ diff --git a/examples/sonataflow-greeting-quarkus-example/mvn.bootstrap.js b/examples/sonataflow-greeting-quarkus-example/mvn.bootstrap.js index 4eda90a3942..4f49c780642 100644 --- a/examples/sonataflow-greeting-quarkus-example/mvn.bootstrap.js +++ b/examples/sonataflow-greeting-quarkus-example/mvn.bootstrap.js @@ -18,9 +18,9 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.sonataflowGreetingQuarkus.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); diff --git a/packages/dashbuilder/mvn.bootstrap.js b/packages/dashbuilder/mvn.bootstrap.js index 5ec33167bc9..05bac2ff3c5 100644 --- a/packages/dashbuilder/mvn.bootstrap.js +++ b/packages/dashbuilder/mvn.bootstrap.js @@ -18,9 +18,9 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.dashbuilder.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); diff --git a/packages/dev-deployment-base-image/mvn.bootstrap.js b/packages/dev-deployment-base-image/mvn.bootstrap.js index 13b93aea8e8..d3533888306 100644 --- a/packages/dev-deployment-base-image/mvn.bootstrap.js +++ b/packages/dev-deployment-base-image/mvn.bootstrap.js @@ -18,11 +18,15 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, installMvnw, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { + setupMavenConfigFile, + installMvnw, + buildTailFromPackageJsonDependencies, +} = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.devDeploymentBaseImage.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); installMvnw(); diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/mvn.bootstrap.js b/packages/dev-deployment-kogito-quarkus-blank-app/mvn.bootstrap.js index bd6462ad484..f0df02ddbe8 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/mvn.bootstrap.js +++ b/packages/dev-deployment-kogito-quarkus-blank-app/mvn.bootstrap.js @@ -18,7 +18,11 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, installMvnw, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { + setupMavenConfigFile, + installMvnw, + buildTailFromPackageJsonDependencies, +} = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile( ` @@ -27,7 +31,7 @@ setupMavenConfigFile( -Drevision=${buildEnv.env.devDeploymentQuarkusApp.version} -Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version} -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `, { ignoreDefault: true } // Can't have special configuration that only works inside this repo. ); diff --git a/packages/dmn-testing-models/mvn.bootstrap.js b/packages/dmn-testing-models/mvn.bootstrap.js index e9fbe56da10..d8ba03f907e 100644 --- a/packages/dmn-testing-models/mvn.bootstrap.js +++ b/packages/dmn-testing-models/mvn.bootstrap.js @@ -18,9 +18,9 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.dmnTestingModels.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); diff --git a/packages/extended-services-java/mvn.bootstrap.js b/packages/extended-services-java/mvn.bootstrap.js index 85957f8bdd9..830a227f77b 100644 --- a/packages/extended-services-java/mvn.bootstrap.js +++ b/packages/extended-services-java/mvn.bootstrap.js @@ -18,11 +18,11 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.extendedServicesJava.version} -Dquarkus.http.port=${buildEnv.env.extendedServicesJava.port} -Dquarkus.http.host=${buildEnv.env.extendedServicesJava.host} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); diff --git a/packages/jbpm-quarkus-devui/mvn.bootstrap.js b/packages/jbpm-quarkus-devui/mvn.bootstrap.js index da87d1b8cf0..eb7c141120c 100644 --- a/packages/jbpm-quarkus-devui/mvn.bootstrap.js +++ b/packages/jbpm-quarkus-devui/mvn.bootstrap.js @@ -18,9 +18,9 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.jbpmQuarkusDevuiExtension.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); diff --git a/packages/maven-base/mvn.bootstrap.js b/packages/maven-base/mvn.bootstrap.js index c50f507bf3c..e1dd9285912 100644 --- a/packages/maven-base/mvn.bootstrap.js +++ b/packages/maven-base/mvn.bootstrap.js @@ -21,7 +21,7 @@ const buildEnv = require("./env"); const { setupMavenConfigFile, setPomProperty, - buildTailFromPackageJson, + buildTailFromPackageJsonDependencies, } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile( @@ -29,7 +29,7 @@ setupMavenConfigFile( --batch-mode -Dstyle.color=always -Drevision=${buildEnv.env.mavenBase.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `, { ignoreDefault: true } ); diff --git a/packages/maven-config-setup-helper/index.js b/packages/maven-config-setup-helper/index.js index 844f4092371..f5b87f3597a 100755 --- a/packages/maven-config-setup-helper/index.js +++ b/packages/maven-config-setup-helper/index.js @@ -81,7 +81,7 @@ module.exports = { * * @returns A comma-separated string containing a flat list of absolute paths of local Maven repositories. */ - buildTailFromPackageJson: (dirname) => { + buildTailFromPackageJsonDependencies: (dirname) => { return deepResolveMavenLocalRepoTail(path.resolve(dirname ?? ".")).join(","); }, diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.bootstrap.js b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.bootstrap.js index 98bbe2d754c..104cb06e0b9 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.bootstrap.js +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.bootstrap.js @@ -18,7 +18,7 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile( ` @@ -27,7 +27,7 @@ setupMavenConfigFile( -Drevision=${buildEnv.env.swfDeploymentQuarkusApp.version} -Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version} -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `, { ignoreDefault: true } // Can't have special configuration that only works inside this repo. ); diff --git a/packages/serverless-workflow-diagram-editor/mvn.bootstrap.js b/packages/serverless-workflow-diagram-editor/mvn.bootstrap.js index 2b37af4472b..b6b96399fd5 100644 --- a/packages/serverless-workflow-diagram-editor/mvn.bootstrap.js +++ b/packages/serverless-workflow-diagram-editor/mvn.bootstrap.js @@ -20,7 +20,7 @@ const buildEnv = require("./env"); const { setupMavenConfigFile, - buildTailFromPackageJson, + buildTailFromPackageJsonDependencies, DEFAULT_LOCAL_REPO, } = require("@kie-tools/maven-config-setup-helper"); @@ -29,7 +29,7 @@ setupMavenConfigFile( --batch-mode -Dstyle.color=always -Drevision=${buildEnv.env.swfDiagramEditor.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()},${DEFAULT_LOCAL_REPO} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()},${DEFAULT_LOCAL_REPO} `, // For some reason, j2cl-maven-plugin needs the DEFAULT_LOCAL_REPO here as the last tail too. { ignoreDefault: true } // Default configuration doesn't work for this module. Since this module is not going to last long, we rely on this workaround for a while. ); diff --git a/packages/sonataflow-quarkus-devui/mvn.bootstrap.js b/packages/sonataflow-quarkus-devui/mvn.bootstrap.js index 47b536b0d8c..2617e4a44ba 100644 --- a/packages/sonataflow-quarkus-devui/mvn.bootstrap.js +++ b/packages/sonataflow-quarkus-devui/mvn.bootstrap.js @@ -18,9 +18,9 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.sonataflowQuarkusDevuiExtension.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); diff --git a/packages/stunner-editors/mvn.bootstrap.js b/packages/stunner-editors/mvn.bootstrap.js index f8fd526ac17..b0b919d95b8 100644 --- a/packages/stunner-editors/mvn.bootstrap.js +++ b/packages/stunner-editors/mvn.bootstrap.js @@ -18,7 +18,7 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, buildTailFromPackageJsonDependencies } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile( ` @@ -26,7 +26,7 @@ setupMavenConfigFile( -Dstyle.color=always -Drevision=${buildEnv.env.stunnerEditors.version} -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `, { ignoreDefault: true } // Default configuration doesn't work for this module. Since this module is not going to last long, we rely on this workaround for a while. ); diff --git a/packages/vscode-java-code-completion-extension-plugin/mvn.bootstrap.js b/packages/vscode-java-code-completion-extension-plugin/mvn.bootstrap.js index bc38c1fcd6e..79c2cc770fb 100644 --- a/packages/vscode-java-code-completion-extension-plugin/mvn.bootstrap.js +++ b/packages/vscode-java-code-completion-extension-plugin/mvn.bootstrap.js @@ -18,13 +18,17 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, installMvnw, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { + setupMavenConfigFile, + installMvnw, + buildTailFromPackageJsonDependencies, +} = require("@kie-tools/maven-config-setup-helper"); const version = buildEnv.env.vscodeJavaCodeCompletionExtensionPlugin.version; setupMavenConfigFile(` -Drevision=${version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); installMvnw(); diff --git a/packages/yard-model/mvn.bootstrap.js b/packages/yard-model/mvn.bootstrap.js index 11a8429b699..ed22ac9c2e8 100644 --- a/packages/yard-model/mvn.bootstrap.js +++ b/packages/yard-model/mvn.bootstrap.js @@ -18,11 +18,15 @@ */ const buildEnv = require("./env"); -const { setupMavenConfigFile, installMvnw, buildTailFromPackageJson } = require("@kie-tools/maven-config-setup-helper"); +const { + setupMavenConfigFile, + installMvnw, + buildTailFromPackageJsonDependencies, +} = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.yardModel.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()} `); installMvnw(); diff --git a/packages/yard-validator-worker/mvn.bootstrap.js b/packages/yard-validator-worker/mvn.bootstrap.js index 5e4e66d9769..6398c0dbf60 100644 --- a/packages/yard-validator-worker/mvn.bootstrap.js +++ b/packages/yard-validator-worker/mvn.bootstrap.js @@ -21,13 +21,13 @@ const buildEnv = require("./env"); const { setupMavenConfigFile, installMvnw, - buildTailFromPackageJson, + buildTailFromPackageJsonDependencies, DEFAULT_LOCAL_REPO, } = require("@kie-tools/maven-config-setup-helper"); setupMavenConfigFile(` -Drevision=${buildEnv.env.yardValidator.version} - -Dmaven.repo.local.tail=${buildTailFromPackageJson()},${DEFAULT_LOCAL_REPO} + -Dmaven.repo.local.tail=${buildTailFromPackageJsonDependencies()},${DEFAULT_LOCAL_REPO} `); // For some reason, j2cl-maven-plugin needs the DEFAULT_LOCAL_REPO here as the last tail too. installMvnw();