From f062735ae3db9bb1194fb89f25eb13b1d60f0364 Mon Sep 17 00:00:00 2001
From: fantonangeli <fabrizio.antonangeli@gmail.com>
Date: Thu, 16 May 2024 13:15:28 +0200
Subject: [PATCH] Fix maven-base issues on bootstrap

---
 packages/maven-base/install.js   |  2 ++
 packages/maven-base/package.json | 10 ++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/maven-base/install.js b/packages/maven-base/install.js
index a34033bc954..84abd5b5001 100644
--- a/packages/maven-base/install.js
+++ b/packages/maven-base/install.js
@@ -22,4 +22,6 @@ const { setup } = require("@kie-tools/maven-config-setup-helper");
 
 setup(`
     -Drevision=${buildEnv.env.mavenBase.version}
+    -Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version}
+    -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version}
 `);
diff --git a/packages/maven-base/package.json b/packages/maven-base/package.json
index a55001d910e..439371a2348 100644
--- a/packages/maven-base/package.json
+++ b/packages/maven-base/package.json
@@ -19,15 +19,9 @@
     "build:prod": "pnpm lint && run-script-os",
     "build:prod:darwin:linux": "mvn clean deploy -DdeployAtEnd -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -Dmaven.deploy.skip=$(build-env maven.deploy.skip)",
     "build:prod:win32": "pnpm powershell \"mvn clean deploy `-DdeployAtEnd `-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-Dmaven.deploy.skip=$(build-env maven.deploy.skip)\"",
-    "install": "pnpm set-quarkus-version && pnpm set-kogito-version && node install.js",
+    "install": "node install.js",
     "lint": "echo 'Linting'",
-    "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command",
-    "set-kogito-version": "run-script-os",
-    "set-kogito-version:darwin:linux": "mvn versions:set-property -Dproperty=version.org.kie.kogito -DnewVersion=$(build-env kogitoRuntime.version)",
-    "set-kogito-version:win32": "pnpm powershell \"mvn versions:set-property `-Dproperty=version.org.kie.kogito `-DnewVersion=$(build-env kogitoRuntime.version)\"",
-    "set-quarkus-version": "run-script-os",
-    "set-quarkus-version:darwin:linux": "mvn versions:set-property -Dproperty=quarkus.platform.version -DnewVersion=$(build-env quarkusPlatform.version)",
-    "set-quarkus-version:win32": "pnpm powershell \"mvn versions:set-property `-Dproperty=quarkus.platform.version `-DnewVersion=$(build-env quarkusPlatform.version)\""
+    "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command"
   },
   "devDependencies": {
     "@kie-tools/maven-config-setup-helper": "workspace:*",