This is an automated email from the ASF dual-hosted git repository.
tiagobento 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 805e053be93 NO-ISSUE: Fix dev webapps for Management Console (#3224)
805e053be93 is described below
commit 805e053be931add6d7e36fbe7fc87809e3b78675
Author: Luiz João Motta <[email protected]>
AuthorDate: Mon Aug 11 10:52:01 2025 -0300
NO-ISSUE: Fix dev webapps for Management Console (#3224)
---
packages/maven-base/index.js | 22 +++++++++++++-----
.../dev-webapp/unsecured-runtime/pom.xml | 2 +-
.../install.js | 27 ++++++++++++++++++++++
.../package.json | 6 +++--
pnpm-lock.yaml | 3 +++
5 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/packages/maven-base/index.js b/packages/maven-base/index.js
index 615e4f0f9c1..9c8ad5358ea 100755
--- a/packages/maven-base/index.js
+++ b/packages/maven-base/index.js
@@ -87,7 +87,18 @@ module.exports = {
* @returns A comma-separated string containing a flat list of absolute
paths of local Maven repositories.
*/
buildTailFromPackageJsonDependencies: (dirname) => {
- return deepResolveMavenLocalRepoTail(path.resolve(dirname ??
".")).join(",");
+ return deepResolveMavenLocalRepoTail(path.resolve(dirname ?? "."),
"dependencies").join(",");
+ },
+
+ /**
+ * Helps setting up an array of absolute paths that will be used to
configure `-Dmaven.repo.local.tail`.
+ *
+ * @param dirname Where to locate the first package.json.
+ *
+ * @returns A comma-separated string containing a flat list of absolute
paths of local Maven repositories.
+ */
+ buildTailFromPackageJsonDevDependencies: (dirname) => {
+ return deepResolveMavenLocalRepoTail(path.resolve(dirname ?? "."),
"devDependencies").join(",");
},
/**
@@ -107,8 +118,7 @@ module.exports = {
cp.execSync(`cp -nal ${DEFAULT_LOCAL_REPO}/* ${resolvedTmpM2Dir}`, {
stdio: "inherit" });
const cwd = path.resolve(".", relativePackagePath);
- const packageName = require(path.resolve(cwd, "package.json")).name;
- const tail = deepResolveMavenLocalRepoTail(cwd, packageName);
+ const tail = deepResolveMavenLocalRepoTail(cwd, "dependencies");
// tail
for (const t of tail) {
@@ -192,14 +202,14 @@ module.exports = {
// private functions
-function deepResolveMavenLocalRepoTail(cwd) {
- const packageJsonDependencies = require(path.resolve(cwd,
"package.json")).dependencies ?? {};
+function deepResolveMavenLocalRepoTail(cwd, dependenciesProp) {
+ const packageJsonDependencies = require(path.resolve(cwd,
"package.json"))[dependenciesProp] ?? {};
return [
...new Set([
path.resolve(fs.realpathSync(cwd), "dist/1st-party-m2/repository"),
...Object.entries(packageJsonDependencies).flatMap(([depName,
depVersion]) =>
depVersion === "workspace:*" // It's an internal package.
- ? deepResolveMavenLocalRepoTail(cwd + "/node_modules/" + depName)
+ ? deepResolveMavenLocalRepoTail(cwd + "/node_modules/" + depName,
dependenciesProp)
: []
),
]),
diff --git
a/packages/runtime-tools-management-console-webapp/dev-webapp/unsecured-runtime/pom.xml
b/packages/runtime-tools-management-console-webapp/dev-webapp/unsecured-runtime/pom.xml
index d043a4aef09..b78d74a85c0 100644
---
a/packages/runtime-tools-management-console-webapp/dev-webapp/unsecured-runtime/pom.xml
+++
b/packages/runtime-tools-management-console-webapp/dev-webapp/unsecured-runtime/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-quarkus-devui-bom</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/packages/runtime-tools-management-console-webapp/install.js
b/packages/runtime-tools-management-console-webapp/install.js
new file mode 100644
index 00000000000..88fbf3bb128
--- /dev/null
+++ b/packages/runtime-tools-management-console-webapp/install.js
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const { env } = require("./env");
+const { setupMavenConfigFile, buildTailFromPackageJsonDevDependencies } =
require("@kie-tools/maven-base");
+
+// Used for development webapp Maven projects
+setupMavenConfigFile(`
+ -Drevision=${env.runtimeToolsManagementConsoleWebapp.version}
+ -Dmaven.repo.local.tail=${buildTailFromPackageJsonDevDependencies()}
+`);
diff --git a/packages/runtime-tools-management-console-webapp/package.json
b/packages/runtime-tools-management-console-webapp/package.json
index 88c5277f7d2..c01329e2ffe 100644
--- a/packages/runtime-tools-management-console-webapp/package.json
+++ b/packages/runtime-tools-management-console-webapp/package.json
@@ -16,13 +16,14 @@
"scripts": {
"build:dev": "rimraf dist && webpack --env dev",
"build:prod": "pnpm lint && rimraf dist && webpack",
+ "install": "node install.js",
"lint": "run-script-if --bool \"$(build-env linters.run)\" --then
\"kie-tools--eslint ./src\"",
"start": "webpack serve --host 0.0.0.0 --env dev",
"start:all": "concurrently -c red,white,blue,green --names
IDP,webapp,secured-runtime,unsecured-runtime 'pnpm start:idp' 'pnpm start'
'pnpm start:secured-runtime' 'pnpm start:unsecured-runtime'",
"start:idp": "docker run --rm -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e
KC_BOOTSTRAP_ADMIN_PASSWORD=admin -v
./dev-webapp/keycloak:/opt/keycloak/data/import -p \"$(build-env
runtimeToolsManagementConsoleWebapp.dev.idp.port)\":8080
quay.io/keycloak/keycloak:26.0.5 start-dev --import-realm",
"start:idp-mock": "pnpm exec oauth2-mock-server -p \"$(build-env
runtimeToolsManagementConsoleWebapp.dev.idp.port)\"",
- "start:secured-runtime": "mvn -nsu -f dev-webapp/secured-runtime
quarkus:dev -Dquarkus.http.port=\"$(build-env
runtimeToolsManagementConsoleWebapp.dev.securedRuntime.port)\"
-Ddev-webapp.idp.port=\"$(build-env
runtimeToolsManagementConsoleWebapp.dev.idp.port)\" -Drevision=\"$(build-env
runtimeToolsManagementConsoleWebapp.version)\" -Ddebug=6005",
- "start:unsecured-runtime": "mvn -nsu -f dev-webapp/unsecured-runtime
quarkus:dev -Dquarkus.http.port=\"$(build-env
runtimeToolsManagementConsoleWebapp.dev.unsecuredRuntime.port)\"
-Ddev-webapp.idp.port=\"$(build-env
runtimeToolsManagementConsoleWebapp.dev.idp.port)\" -Drevision=\"$(build-env
runtimeToolsManagementConsoleWebapp.version)\" -Ddebug=6006"
+ "start:secured-runtime": "mvn -nsu -f dev-webapp/secured-runtime
quarkus:dev -Dquarkus.http.port=\"$(build-env
runtimeToolsManagementConsoleWebapp.dev.securedRuntime.port)\"
-Ddev-webapp.idp.port=\"$(build-env
runtimeToolsManagementConsoleWebapp.dev.idp.port)\" -Ddebug=6005",
+ "start:unsecured-runtime": "mvn -nsu -f dev-webapp/unsecured-runtime
quarkus:dev -Dquarkus.http.port=\"$(build-env
runtimeToolsManagementConsoleWebapp.dev.unsecuredRuntime.port)\"
-Ddev-webapp.idp.port=\"$(build-env
runtimeToolsManagementConsoleWebapp.dev.idp.port)\" -Ddebug=6006"
},
"dependencies": {
"@kie-tools-core/react-hooks": "workspace:*",
@@ -61,6 +62,7 @@
"@graphql-codegen/typescript": "^2.8.8",
"@graphql-codegen/typescript-operations": "^2.5.13",
"@graphql-codegen/typescript-react-apollo": "^3.3.7",
+ "@kie-tools-core/drools-and-kogito": "workspace:*",
"@kie-tools-core/envelope": "workspace:*",
"@kie-tools-core/envelope-bus": "workspace:*",
"@kie-tools-core/patternfly-base": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5bb0cf5ae3e..029762f693a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8823,6 +8823,9 @@ importers:
'@graphql-codegen/typescript-react-apollo':
specifier: ^3.3.7
version:
3.3.7([email protected])([email protected]([email protected]))([email protected])
+ '@kie-tools-core/drools-and-kogito':
+ specifier: workspace:*
+ version: link:../drools-and-kogito
'@kie-tools-core/envelope':
specifier: workspace:*
version: link:../envelope
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
