From a52ba6651bb36f92e24db9ef7f204d7076708516 Mon Sep 17 00:00:00 2001 From: Tiago Bento Date: Thu, 26 Sep 2024 13:10:01 -0400 Subject: [PATCH] Maven local Rename Fix build reproducibility v2 Oops Fix DashBuilder configuration of maven-deploy-plugin Oops Fix maven-m2-repo-via-http-image configuration . Fix config --- devbox.lock | 2 +- .../{install.js => mvn.bootstrap.js} | 5 +- .../mvn.tail.js | 25 +++ .../package.json | 2 +- .../pom.xml | 50 ++++-- .../{install.js => mvn.bootstrap.js} | 5 +- .../mvn.tail.js | 25 +++ .../package.json | 2 +- .../jbpm-compact-architecture-example/pom.xml | 41 +++-- .../{install.js => mvn.bootstrap.js} | 5 +- .../mvn.tail.js | 25 +++ .../package.json | 2 +- .../pom.xml | 48 ++--- .../{install.js => mvn.bootstrap.js} | 5 +- .../install.js => dashbuilder/mvn.tail.js} | 7 +- packages/dashbuilder/package.json | 2 +- packages/dashbuilder/pom.xml | 7 - .../{install.js => mvn.bootstrap.js} | 7 +- .../dev-deployment-base-image/mvn.tail.js | 22 +++ .../dev-deployment-base-image/package.json | 5 +- .../dev-webapp/quarkus-app/pom.xml | 39 +++-- .../env/index.js | 8 +- .../install.js | 4 +- .../package.json | 8 +- .../{install.js => mvn.bootstrap.js} | 14 +- .../mvn.tail.js} | 7 +- .../package.json | 9 +- .../pom.xml | 59 +++++-- .../{install.js => mvn.bootstrap.js} | 5 +- packages/dmn-testing-models/mvn.tail.js | 22 +++ packages/dmn-testing-models/package.json | 2 +- .../{install.js => mvn.bootstrap.js} | 5 +- packages/extended-services-java/mvn.tail.js | 22 +++ packages/extended-services-java/package.json | 2 +- packages/extended-services-java/pom.xml | 3 - packages/jbpm-quarkus-devui/dev/pom.xml | 16 -- .../{install.js => mvn.bootstrap.js} | 5 +- packages/jbpm-quarkus-devui/mvn.tail.js | 22 +++ packages/jbpm-quarkus-devui/package.json | 10 +- .../{install.js => mvn.bootstrap.js} | 22 ++- .../index.js => maven-base/mvn.tail.js} | 4 +- packages/maven-base/package.json | 18 +- packages/maven-base/pom.xml | 165 +++++++++++++++--- .../bootstrap-settings.xml | 104 +++++++++++ .../build-settings.xml | 107 ++++++++++++ .../maven-config-setup-helper/empty-pom.xml | 31 ++++ packages/maven-config-setup-helper/index.js | 142 +++++++++++++-- .../{install.js => mvn.bootstrap.js} | 12 +- .../mvn.tail.js} | 7 +- .../package.json | 2 +- .../pom.xml | 64 +++++-- .../env/index.js | 8 +- .../install.js | 4 +- .../package.json | 5 +- .../mvn.bootstrap.js | 31 ++++ .../mvn.tail.js | 24 +++ .../package.json | 2 +- .../pom.xml | 10 ++ .../e2e-tests/resources/greeting-flow/pom.xml | 14 +- .../sonataflow-builder-image/package.json | 4 +- .../sonataflow-devmode-image/package.json | 4 +- .../sonataflow/devmode/build-config/configure | 14 +- .../{install.js => mvn.bootstrap.js} | 5 +- packages/sonataflow-quarkus-devui/mvn.tail.js | 22 +++ .../sonataflow-quarkus-devui/package.json | 6 +- .../pom.xml | 2 - .../sonataflow-quarkus-devui/pom.xml | 1 - .../{install.js => mvn.bootstrap.js} | 12 +- packages/stunner-editors/mvn.tail.js | 24 +++ packages/stunner-editors/package.json | 2 +- packages/stunner-editors/pom.xml | 10 ++ .../{install.js => mvn.bootstrap.js} | 21 ++- .../mvn.tail.js | 22 +++ .../package.json | 3 +- .../pom.xml | 1 - packages/yard-model/mvn.bootstrap.js | 28 +++ packages/yard-model/mvn.tail.js | 22 +++ packages/yard-model/package.json | 5 +- .../yard-validator-worker/mvn.bootstrap.js | 27 +++ packages/yard-validator-worker/mvn.tail.js | 26 +++ packages/yard-validator-worker/package.json | 5 +- packages/yard-validator-worker/pom.xml | 50 ++++-- pnpm-lock.yaml | 13 ++ repo/graph.dot | 6 +- repo/graph.json | 12 +- 85 files changed, 1352 insertions(+), 325 deletions(-) rename examples/drools-process-usertasks-quarkus-example/{install.js => mvn.bootstrap.js} (84%) create mode 100644 examples/drools-process-usertasks-quarkus-example/mvn.tail.js rename examples/jbpm-compact-architecture-example/{install.js => mvn.bootstrap.js} (86%) create mode 100644 examples/jbpm-compact-architecture-example/mvn.tail.js rename examples/sonataflow-greeting-quarkus-example/{install.js => mvn.bootstrap.js} (84%) create mode 100644 examples/sonataflow-greeting-quarkus-example/mvn.tail.js rename packages/dashbuilder/{install.js => mvn.bootstrap.js} (84%) rename packages/{serverless-workflow-diagram-editor/install.js => dashbuilder/mvn.tail.js} (82%) rename packages/dev-deployment-base-image/{install.js => mvn.bootstrap.js} (82%) create mode 100644 packages/dev-deployment-base-image/mvn.tail.js rename packages/dev-deployment-kogito-quarkus-blank-app/{install.js => mvn.bootstrap.js} (74%) rename packages/{yard-model/install.js => dev-deployment-kogito-quarkus-blank-app/mvn.tail.js} (83%) rename packages/dmn-testing-models/{install.js => mvn.bootstrap.js} (84%) create mode 100644 packages/dmn-testing-models/mvn.tail.js rename packages/extended-services-java/{install.js => mvn.bootstrap.js} (86%) create mode 100644 packages/extended-services-java/mvn.tail.js rename packages/jbpm-quarkus-devui/{install.js => mvn.bootstrap.js} (84%) create mode 100644 packages/jbpm-quarkus-devui/mvn.tail.js rename packages/maven-base/{install.js => mvn.bootstrap.js} (66%) rename packages/{dmn-testing-models/index.js => maven-base/mvn.tail.js} (86%) create mode 100644 packages/maven-config-setup-helper/bootstrap-settings.xml create mode 100644 packages/maven-config-setup-helper/build-settings.xml create mode 100644 packages/maven-config-setup-helper/empty-pom.xml rename packages/serverless-logic-web-tools-swf-deployment-quarkus-app/{install.js => mvn.bootstrap.js} (76%) rename packages/{yard-validator-worker/install.js => serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.tail.js} (82%) create mode 100644 packages/serverless-workflow-diagram-editor/mvn.bootstrap.js create mode 100644 packages/serverless-workflow-diagram-editor/mvn.tail.js rename packages/sonataflow-quarkus-devui/{install.js => mvn.bootstrap.js} (84%) create mode 100644 packages/sonataflow-quarkus-devui/mvn.tail.js rename packages/stunner-editors/{install.js => mvn.bootstrap.js} (70%) create mode 100644 packages/stunner-editors/mvn.tail.js rename packages/vscode-java-code-completion-extension-plugin/{install.js => mvn.bootstrap.js} (86%) create mode 100644 packages/vscode-java-code-completion-extension-plugin/mvn.tail.js create mode 100644 packages/yard-model/mvn.bootstrap.js create mode 100644 packages/yard-model/mvn.tail.js create mode 100644 packages/yard-validator-worker/mvn.bootstrap.js create mode 100644 packages/yard-validator-worker/mvn.tail.js diff --git a/devbox.lock b/devbox.lock index e44362293a1..d947b47e1cf 100644 --- a/devbox.lock +++ b/devbox.lock @@ -408,7 +408,7 @@ }, "python@3.12.2": { "last_modified": "2024-03-22T11:26:23Z", - "plugin_version": "0.0.4", + "plugin_version": "0.0.3", "resolved": "github:NixOS/nixpkgs/a3ed7406349a9335cb4c2a71369b697cecd9d351#python312", "source": "devbox-search", "version": "3.12.2", diff --git a/examples/drools-process-usertasks-quarkus-example/install.js b/examples/drools-process-usertasks-quarkus-example/mvn.bootstrap.js similarity index 84% rename from examples/drools-process-usertasks-quarkus-example/install.js rename to examples/drools-process-usertasks-quarkus-example/mvn.bootstrap.js index 9102bb3b499..9377fd60cf8 100644 --- a/examples/drools-process-usertasks-quarkus-example/install.js +++ b/examples/drools-process-usertasks-quarkus-example/mvn.bootstrap.js @@ -18,8 +18,9 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.droolsProcessUsertasksQuarkusExample.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); diff --git a/examples/drools-process-usertasks-quarkus-example/mvn.tail.js b/examples/drools-process-usertasks-quarkus-example/mvn.tail.js new file mode 100644 index 00000000000..60c1f4da864 --- /dev/null +++ b/examples/drools-process-usertasks-quarkus-example/mvn.tail.js @@ -0,0 +1,25 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [ + require("@kie-tools/maven-base/mvn.tail"), + require("@kie-tools/jbpm-quarkus-devui/mvn.tail"), +]); diff --git a/examples/drools-process-usertasks-quarkus-example/package.json b/examples/drools-process-usertasks-quarkus-example/package.json index 15f3d1c84c3..ce1dcd4e1aa 100644 --- a/examples/drools-process-usertasks-quarkus-example/package.json +++ b/examples/drools-process-usertasks-quarkus-example/package.json @@ -19,7 +19,7 @@ "build:prod": "pnpm lint && run-script-if --bool \"$(build-env examples.build)\" --then run-script-os", "build:prod:darwin:linux": "mvn clean compile -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", "build:prod:win32": "pnpm powershell \"mvn clean compile `-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", - "install": "node install.js", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", "quarkus:dev": "run-script-os", diff --git a/examples/drools-process-usertasks-quarkus-example/pom.xml b/examples/drools-process-usertasks-quarkus-example/pom.xml index 3ab00e2fc76..580a1a03ca8 100644 --- a/examples/drools-process-usertasks-quarkus-example/pom.xml +++ b/examples/drools-process-usertasks-quarkus-example/pom.xml @@ -33,18 +33,6 @@ Kie-Tools Example :: Process with Usertasks Quarkus Kogito user tasks orchestration - Quarkus - - - - org.jbpm - jbpm-quarkus-devui-bom - ${project.version} - pom - import - - - - io.quarkus @@ -58,10 +46,6 @@ org.jbpm jbpm-with-drools-quarkus - - org.jbpm - jbpm-quarkus-devui - io.quarkus quarkus-smallrye-openapi @@ -89,13 +73,43 @@ kie-addons-quarkus-process-svg + + + + kie-tools--maven-profile--1st-party-dependencies + + + ignore--kie-tools--maven-profile--1st-party-dependencies + !true + + + + + + org.jbpm + jbpm-quarkus-devui-bom + ${project.version} + pom + import + + + + + + org.jbpm + jbpm-quarkus-devui + + + + + ${project.artifactId} - ${quarkus.platform.group-id} + io.quarkus quarkus-maven-plugin - ${quarkus-plugin.version} + ${quarkus.platform.version} diff --git a/examples/jbpm-compact-architecture-example/install.js b/examples/jbpm-compact-architecture-example/mvn.bootstrap.js similarity index 86% rename from examples/jbpm-compact-architecture-example/install.js rename to examples/jbpm-compact-architecture-example/mvn.bootstrap.js index 47e591480b5..d32535ff741 100644 --- a/examples/jbpm-compact-architecture-example/install.js +++ b/examples/jbpm-compact-architecture-example/mvn.bootstrap.js @@ -18,10 +18,11 @@ */ const buildEnv = require("./env"); -const { setup, setPomProperty } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, setPomProperty } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.jbpmCompactArchitectureExample.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); setPomProperty({ diff --git a/examples/jbpm-compact-architecture-example/mvn.tail.js b/examples/jbpm-compact-architecture-example/mvn.tail.js new file mode 100644 index 00000000000..60c1f4da864 --- /dev/null +++ b/examples/jbpm-compact-architecture-example/mvn.tail.js @@ -0,0 +1,25 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [ + require("@kie-tools/maven-base/mvn.tail"), + require("@kie-tools/jbpm-quarkus-devui/mvn.tail"), +]); diff --git a/examples/jbpm-compact-architecture-example/package.json b/examples/jbpm-compact-architecture-example/package.json index c343328e50e..e85748bb880 100644 --- a/examples/jbpm-compact-architecture-example/package.json +++ b/examples/jbpm-compact-architecture-example/package.json @@ -21,7 +21,7 @@ "build:prod": "pnpm lint && run-script-if --bool \"$(build-env examples.build)\" --then run-script-os", "build:prod:darwin:linux": "mvn clean compile -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -Pcontainer", "build:prod:win32": "pnpm powershell \"mvn clean compile `-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-Pcontainer \"", - "install": "node install.js", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", "quarkus:dev": "run-script-os", diff --git a/examples/jbpm-compact-architecture-example/pom.xml b/examples/jbpm-compact-architecture-example/pom.xml index 10fb11ac96b..909b5cac664 100644 --- a/examples/jbpm-compact-architecture-example/pom.xml +++ b/examples/jbpm-compact-architecture-example/pom.xml @@ -121,6 +121,32 @@ + + kie-tools--maven-profile--1st-party-dependencies + + + ignore--kie-tools--maven-profile--1st-party-dependencies + !true + + + + + + org.jbpm + jbpm-quarkus-devui-bom + ${project.version} + pom + import + + + + + + org.jbpm + jbpm-quarkus-devui + + + container @@ -138,17 +164,6 @@ dev - - - - org.jbpm - jbpm-quarkus-devui-bom - ${project.version} - pom - import - - - org.jbpm @@ -162,9 +177,9 @@ ${project.artifactId} - ${quarkus.platform.group-id} + io.quarkus quarkus-maven-plugin - ${quarkus-plugin.version} + ${quarkus.platform.version} diff --git a/examples/sonataflow-greeting-quarkus-example/install.js b/examples/sonataflow-greeting-quarkus-example/mvn.bootstrap.js similarity index 84% rename from examples/sonataflow-greeting-quarkus-example/install.js rename to examples/sonataflow-greeting-quarkus-example/mvn.bootstrap.js index 7230ea08fa9..e06bc898cf0 100644 --- a/examples/sonataflow-greeting-quarkus-example/install.js +++ b/examples/sonataflow-greeting-quarkus-example/mvn.bootstrap.js @@ -18,8 +18,9 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.sonataflowGreetingQuarkus.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); diff --git a/examples/sonataflow-greeting-quarkus-example/mvn.tail.js b/examples/sonataflow-greeting-quarkus-example/mvn.tail.js new file mode 100644 index 00000000000..4cc096e0341 --- /dev/null +++ b/examples/sonataflow-greeting-quarkus-example/mvn.tail.js @@ -0,0 +1,25 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [ + require("@kie-tools/maven-base/mvn.tail"), + require("@kie-tools/sonataflow-quarkus-devui/mvn.tail"), +]); diff --git a/examples/sonataflow-greeting-quarkus-example/package.json b/examples/sonataflow-greeting-quarkus-example/package.json index 425d90edd4c..f5e408ebfca 100644 --- a/examples/sonataflow-greeting-quarkus-example/package.json +++ b/examples/sonataflow-greeting-quarkus-example/package.json @@ -19,7 +19,7 @@ "build:prod": "pnpm lint && run-script-if --bool \"$(build-env examples.build)\" --then run-script-os", "build:prod:darwin:linux": "mvn clean package -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", "build:prod:win32": "pnpm powershell \"mvn clean package `-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", - "install": "node install.js", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", "quarkus:dev": "run-script-os", diff --git a/examples/sonataflow-greeting-quarkus-example/pom.xml b/examples/sonataflow-greeting-quarkus-example/pom.xml index 8b500cfc5a3..01422e126c2 100644 --- a/examples/sonataflow-greeting-quarkus-example/pom.xml +++ b/examples/sonataflow-greeting-quarkus-example/pom.xml @@ -38,18 +38,6 @@ KIE Tools Example :: SonataFlow Greeting :: Quarkus SonataFlow Example - Quarkus - - - - org.apache.kie.sonataflow - sonataflow-quarkus-devui-bom - ${project.version} - pom - import - - - - org.apache.kie.sonataflow @@ -67,10 +55,6 @@ io.quarkus quarkus-jsonp - - org.apache.kie.sonataflow - sonataflow-quarkus-devui - org.kie kie-addons-quarkus-source-files @@ -95,15 +79,14 @@ maven-compiler-plugin - ${compiler-plugin.version} ${maven.compiler.release} - ${quarkus.platform.group-id} + io.quarkus quarkus-maven-plugin - ${quarkus-plugin.version} + ${quarkus.platform.version} @@ -114,7 +97,6 @@ maven-failsafe-plugin - ${version.failsafe.plugin} org.jboss.logmanager.LogManager @@ -133,6 +115,32 @@ + + kie-tools--maven-profile--1st-party-dependencies + + + ignore--kie-tools--maven-profile--1st-party-dependencies + !true + + + + + + org.apache.kie.sonataflow + sonataflow-quarkus-devui-bom + ${project.version} + pom + import + + + + + + org.apache.kie.sonataflow + sonataflow-quarkus-devui + + + container diff --git a/packages/dashbuilder/install.js b/packages/dashbuilder/mvn.bootstrap.js similarity index 84% rename from packages/dashbuilder/install.js rename to packages/dashbuilder/mvn.bootstrap.js index d21b9e3744c..ff6d56463a4 100644 --- a/packages/dashbuilder/install.js +++ b/packages/dashbuilder/mvn.bootstrap.js @@ -18,8 +18,9 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.dashbuilder.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); diff --git a/packages/serverless-workflow-diagram-editor/install.js b/packages/dashbuilder/mvn.tail.js similarity index 82% rename from packages/serverless-workflow-diagram-editor/install.js rename to packages/dashbuilder/mvn.tail.js index 3f2131f2de3..b201d465aec 100644 --- a/packages/serverless-workflow-diagram-editor/install.js +++ b/packages/dashbuilder/mvn.tail.js @@ -17,9 +17,6 @@ * under the License. */ -const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); -setup(` - -Drevision=${buildEnv.env.swfDiagramEditor.version} -`); +module.exports = tailIncludingSelf(__dirname, [require("@kie-tools/maven-base/mvn.tail")]); diff --git a/packages/dashbuilder/package.json b/packages/dashbuilder/package.json index cbae8ac612e..2bb21151a72 100644 --- a/packages/dashbuilder/package.json +++ b/packages/dashbuilder/package.json @@ -32,7 +32,7 @@ "build:prod:win32": "pnpm powershell \"mvn clean install `-Dgwt.compiler.skip=true `-DskipTests\"", "copy:components": "pnpm delete:components && copyfiles -u 3 \"../dashbuilder-component-assembler/dist/**/*\" ./dashbuilder-runtime-parent/dashbuilder-runtime-client/src/main/webapp/dashbuilder/component", "delete:components": "rimraf ./dashbuilder-runtime-parent/dashbuilder-runtime-client/src/main/webapp/dashbuilder/component", - "install": "node install.js", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, diff --git a/packages/dashbuilder/pom.xml b/packages/dashbuilder/pom.xml index fa92a1e0b90..dd4079be1e4 100644 --- a/packages/dashbuilder/pom.xml +++ b/packages/dashbuilder/pom.xml @@ -111,7 +111,6 @@ 3.2.0 3.2.3 3.1.1 - 2.8.2 2.5.2 3.8.2 1.8 @@ -1136,11 +1135,6 @@ maven-checkstyle-plugin ${version.checkstyle.plugin} - - org.apache.maven.plugins - maven-deploy-plugin - ${version.deploy.plugin} - org.apache.maven.plugins maven-install-plugin @@ -1304,7 +1298,6 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 true resolveCiFriendliesOnly diff --git a/packages/dev-deployment-base-image/install.js b/packages/dev-deployment-base-image/mvn.bootstrap.js similarity index 82% rename from packages/dev-deployment-base-image/install.js rename to packages/dev-deployment-base-image/mvn.bootstrap.js index 5c348fae2e2..d1e1e147aa7 100644 --- a/packages/dev-deployment-base-image/install.js +++ b/packages/dev-deployment-base-image/mvn.bootstrap.js @@ -18,8 +18,11 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, installMvnw } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.devDeploymentBaseImage.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); + +installMvnw(); diff --git a/packages/dev-deployment-base-image/mvn.tail.js b/packages/dev-deployment-base-image/mvn.tail.js new file mode 100644 index 00000000000..b201d465aec --- /dev/null +++ b/packages/dev-deployment-base-image/mvn.tail.js @@ -0,0 +1,22 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [require("@kie-tools/maven-base/mvn.tail")]); diff --git a/packages/dev-deployment-base-image/package.json b/packages/dev-deployment-base-image/package.json index 56b915c3594..436374b1094 100644 --- a/packages/dev-deployment-base-image/package.json +++ b/packages/dev-deployment-base-image/package.json @@ -24,10 +24,7 @@ "create-test-image:minikube": "kie-tools--image-builder minikube -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.buildTag)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\"", "create-test-image:openshift": "kie-tools--image-builder openshift -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.buildTag)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\"", "image:docker:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.buildTag)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\" --build-arg USER_ID_ARG=\"$(build-env devDeploymentBaseImage.userId)\" --build-arg HOME_PATH_ARG=\"$(build-env devDeploymentBaseImage.homePath)\"", - "install": "node install.js && pnpm install:mvnw", - "install:mvnw": "run-script-os", - "install:mvnw:darwin:linux": "mvn -e org.apache.maven.plugins:maven-wrapper-plugin:3.3.0:wrapper", - "install:mvnw:win32": "pnpm powershell \"mvn -e org.apache.maven.plugins:maven-wrapper-plugin:3.3.0:wrapper\"", + "install": "node mvn.bootstrap.js", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, "dependencies": { diff --git a/packages/dev-deployment-dmn-form-webapp/dev-webapp/quarkus-app/pom.xml b/packages/dev-deployment-dmn-form-webapp/dev-webapp/quarkus-app/pom.xml index a96b5f74450..42c29d66c4d 100644 --- a/packages/dev-deployment-dmn-form-webapp/dev-webapp/quarkus-app/pom.xml +++ b/packages/dev-deployment-dmn-form-webapp/dev-webapp/quarkus-app/pom.xml @@ -37,16 +37,29 @@ 0.0.0 - 3.13.0 - true 17 17 UTF-8 UTF-8 - 3.5.0 - 3.12.1 - 3.2.0 - 3.4.1 + + + 3.4.1 + 3.13.0 + 3.2.0 + 3.0.0-M7 + 3.5.0 + 3.1.2 + 3.12.1 + 3.6.1 + 3.4.1 + 3.2.0 + 3.4.0 + 1.6.0 + + + true + + 4.13.2 true 1.26.1 @@ -146,7 +159,7 @@ org.apache.maven.plugins maven-site-plugin - ${maven.site.plugin.version} + ${version.maven.site.plugin} org.apache.commons @@ -163,7 +176,7 @@ org.apache.maven.plugins maven-remote-resources-plugin - ${maven.remote.resources.plugin.version} + ${version.maven.remote.resources.plugin} org.apache.commons @@ -180,7 +193,7 @@ org.apache.maven.plugins maven-jar-plugin - ${maven.jar.plugin.version} + ${version.maven.jar.plugin} org.iq80.snappy @@ -192,7 +205,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire-plugin.version} + ${maven.surefire.plugin.version} org.iq80.snappy @@ -224,14 +237,14 @@ maven-compiler-plugin - ${compiler-plugin.version} + ${maven.compiler.plugin.version} ${maven.compiler.parameters} maven-surefire-plugin - ${surefire-plugin.version} + ${maven.surefire.plugin.version} org.jboss.logmanager.LogManager @@ -242,7 +255,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 + ${version.codehaus.flatten.plugin} true resolveCiFriendliesOnly diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js b/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js index 7087fb761c4..62353539324 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js @@ -51,10 +51,6 @@ module.exports = composeEnv([rootEnv], { default: rootEnv.env.root.streamName, description: "Tag version of this image. E.g., `main` or `10.0.x` or `10.0.0", }, - DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__mavenM2RepoViaHttpImage: { - default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`, - description: "The image tag for the Maven M2 Repo via HTTP. Used during the build only.", - }, }), get env() { return { @@ -66,9 +62,7 @@ module.exports = composeEnv([rootEnv], { buildTag: getOrDefault(this.vars.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag), version: require("../package.json").version, dev: { - mavenM2RepoViaHttpImage: getOrDefault( - this.vars.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__mavenM2RepoViaHttpImage - ), + mavenM2RepoViaHttpImage: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`, }, }, }; diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/install.js b/packages/dev-deployment-kogito-quarkus-blank-app-image/install.js index ef3dc831446..11c6476e41a 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/install.js +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/install.js @@ -18,8 +18,8 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.devDeploymentKogitoQuarkusBlankAppImage.version} `); diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json index 9ef24001763..b193fbb79a5 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json @@ -13,7 +13,7 @@ "url": "https://github.com/apache/incubator-kie-tools/issues" }, "scripts": { - "build": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm m2-repo-via-http:container:run\" \"pnpm copy:assets\" \"pnpm image:docker:build\" --finally \"pnpm m2-repo-via-http:container:kill\"", + "build": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm m2-repo-via-http:container:run\" \"pnpm copy:assets\" \"pnpm image:docker:build\" --finally \"pnpm m2-repo-via-http:container:kill\" \"rimraf ./dist/tmp-m2\"", "build:dev": "pnpm build", "build:prod": "pnpm build", "copy:assets": "rimraf dist-dev && mkdir -p ./dist-dev && pnpm copy:quarkus-app && pnpm copy:maven-m2-repo-via-http-image--settings-xml", @@ -30,12 +30,14 @@ "image:docker:build": "kie-tools--image-builder build --allowHostNetworkAccess -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.buildTag)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/", "install": "node install.js", "m2-repo-via-http:container:kill": "(docker container kill m2-repo-via-http || true) && (docker container rm m2-repo-via-http || true)", - "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && docker run --name m2-repo-via-http -v \"$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout):/var/www/html\" -dit $(build-env devDeploymentKogitoQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImage)", + "m2-repo-via-http:container:prepare-m2-repo-volume": "node -e 'require(`@kie-tools/maven-config-setup-helper`).prepareHardLinkedM2FromTail(`./dist/tmp-m2/repository`, require(`@kie-tools/dev-deployment-kogito-quarkus-blank-app/mvn.tail`))'", + "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && pnpm m2-repo-via-http:container:prepare-m2-repo-volume && docker run -p 8888:80 --name m2-repo-via-http -v \"./dist/tmp-m2/repository:/var/www/html\" -dit $(build-env devDeploymentKogitoQuarkusBlankAppImage.dev.mavenM2RepoViaHttpImage)", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, "dependencies": { "@kie-tools/dev-deployment-base-image": "workspace:*", - "@kie-tools/dev-deployment-kogito-quarkus-blank-app": "workspace:*" + "@kie-tools/dev-deployment-kogito-quarkus-blank-app": "workspace:*", + "@kie-tools/jbpm-quarkus-devui": "workspace:*" }, "devDependencies": { "@kie-tools/image-builder": "workspace:*", diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/install.js b/packages/dev-deployment-kogito-quarkus-blank-app/mvn.bootstrap.js similarity index 74% rename from packages/dev-deployment-kogito-quarkus-blank-app/install.js rename to packages/dev-deployment-kogito-quarkus-blank-app/mvn.bootstrap.js index 8484cdd6bfa..32785ac8eaa 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/install.js +++ b/packages/dev-deployment-kogito-quarkus-blank-app/mvn.bootstrap.js @@ -18,10 +18,18 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, installMvnw } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile( + ` + --batch-mode + -Dstyle.color=always -Drevision=${buildEnv.env.devDeploymentQuarkusApp.version} -Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version} -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version} -`); + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} +`, + { ignoreDefault: true } // Can't have special configuration that only works inside this repo. +); + +installMvnw(); diff --git a/packages/yard-model/install.js b/packages/dev-deployment-kogito-quarkus-blank-app/mvn.tail.js similarity index 83% rename from packages/yard-model/install.js rename to packages/dev-deployment-kogito-quarkus-blank-app/mvn.tail.js index aa46eae8f39..8fa91d71b38 100644 --- a/packages/yard-model/install.js +++ b/packages/dev-deployment-kogito-quarkus-blank-app/mvn.tail.js @@ -17,9 +17,6 @@ * under the License. */ -const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { tail } = require("@kie-tools/maven-config-setup-helper"); -setup(` - -Drevision=${buildEnv.env.yardModel.version} -`); +module.exports = tail([require("@kie-tools/jbpm-quarkus-devui/mvn.tail")]); diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/package.json b/packages/dev-deployment-kogito-quarkus-blank-app/package.json index 358afb27bc7..892d631f19b 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/package.json +++ b/packages/dev-deployment-kogito-quarkus-blank-app/package.json @@ -19,17 +19,16 @@ "build:prod": "pnpm lint && run-script-os", "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", - "install": "node install.js && pnpm install:mvnw", - "install:mvnw": "run-script-os", - "install:mvnw:darwin:linux": "mvn -e org.apache.maven.plugins:maven-wrapper-plugin:3.3.0:wrapper", - "install:mvnw:win32": "pnpm powershell \"mvn -e org.apache.maven.plugins:maven-wrapper-plugin:3.3.0:wrapper\"", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", "quarkus:dev": "run-script-os", "quarkus:dev:darwin:linux": "mvn clean package quarkus:dev -DskipTests", "quarkus:dev:win32": "mvn clean package quarkus:dev `-DskipTests" }, - "dependencies": {}, + "dependencies": { + "@kie-tools/jbpm-quarkus-devui": "workspace:*" + }, "devDependencies": { "@kie-tools/maven-config-setup-helper": "workspace:*", "@kie-tools/root-env": "workspace:*", diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml index 259bc458762..bca2a37a20c 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml +++ b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml @@ -37,18 +37,31 @@ ${revision} - 3.13.0 - true 17 17 UTF-8 UTF-8 - 3.5.0 - 3.12.1 - 3.2.0 - 3.4.1 - 4.13.2 + + + 3.4.1 + 3.13.0 + 3.2.0 + 3.0.0-M7 + 3.5.0 + 3.1.2 + 3.12.1 + 3.6.1 + 3.4.1 + 3.2.0 + 3.4.0 + 1.6.0 + + + true true + + + 4.13.2 1.26.1 0.5 @@ -117,13 +130,11 @@ - - - + io.quarkus quarkus-junit5 @@ -150,10 +161,22 @@ + + + org.apache.maven.plugins + maven-install-plugin + + + default-install + none + + + + org.apache.maven.plugins maven-site-plugin - ${maven.site.plugin.version} + ${version.maven.site.plugin} org.apache.commons @@ -170,7 +193,7 @@ org.apache.maven.plugins maven-remote-resources-plugin - ${maven.remote.resources.plugin.version} + ${version.maven.remote.resources.plugin} org.apache.commons @@ -187,7 +210,7 @@ org.apache.maven.plugins maven-jar-plugin - ${maven.jar.plugin.version} + ${version.maven.jar.plugin} org.iq80.snappy @@ -199,7 +222,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire-plugin.version} + ${version.maven.surefire.plugin} org.iq80.snappy @@ -231,14 +254,14 @@ maven-compiler-plugin - ${compiler-plugin.version} + ${version.maven.compiler.plugin} ${maven.compiler.parameters} maven-surefire-plugin - ${surefire-plugin.version} + ${version.maven.surefire.plugin} org.jboss.logmanager.LogManager @@ -249,7 +272,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 + ${version.codehaus.flatten.plugin} true resolveCiFriendliesOnly diff --git a/packages/dmn-testing-models/install.js b/packages/dmn-testing-models/mvn.bootstrap.js similarity index 84% rename from packages/dmn-testing-models/install.js rename to packages/dmn-testing-models/mvn.bootstrap.js index 1e1c38e2b32..a1b46f4f52a 100644 --- a/packages/dmn-testing-models/install.js +++ b/packages/dmn-testing-models/mvn.bootstrap.js @@ -18,8 +18,9 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.dmnTestingModels.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); diff --git a/packages/dmn-testing-models/mvn.tail.js b/packages/dmn-testing-models/mvn.tail.js new file mode 100644 index 00000000000..b201d465aec --- /dev/null +++ b/packages/dmn-testing-models/mvn.tail.js @@ -0,0 +1,22 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [require("@kie-tools/maven-base/mvn.tail")]); diff --git a/packages/dmn-testing-models/package.json b/packages/dmn-testing-models/package.json index 99540911e69..67ec3ec3e25 100644 --- a/packages/dmn-testing-models/package.json +++ b/packages/dmn-testing-models/package.json @@ -20,7 +20,7 @@ "build:dev:linux:darwin": "mvn clean verify", "build:dev:win32": "pnpm powershell \"mvn clean verify\"", "build:prod": "pnpm build:dev", - "install": "node install.js", + "install": "node mvn.bootstrap.js", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, "dependencies": { diff --git a/packages/extended-services-java/install.js b/packages/extended-services-java/mvn.bootstrap.js similarity index 86% rename from packages/extended-services-java/install.js rename to packages/extended-services-java/mvn.bootstrap.js index 35b3e03912e..39de26515ed 100644 --- a/packages/extended-services-java/install.js +++ b/packages/extended-services-java/mvn.bootstrap.js @@ -18,10 +18,11 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.extendedServicesJava.version} -Dquarkus.http.port=${buildEnv.env.extendedServicesJava.port} -Dquarkus.http.host=${buildEnv.env.extendedServicesJava.host} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); diff --git a/packages/extended-services-java/mvn.tail.js b/packages/extended-services-java/mvn.tail.js new file mode 100644 index 00000000000..b201d465aec --- /dev/null +++ b/packages/extended-services-java/mvn.tail.js @@ -0,0 +1,22 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [require("@kie-tools/maven-base/mvn.tail")]); diff --git a/packages/extended-services-java/package.json b/packages/extended-services-java/package.json index eb924c5c1b2..ffd30318c3d 100644 --- a/packages/extended-services-java/package.json +++ b/packages/extended-services-java/package.json @@ -27,7 +27,7 @@ "copy:app:linux:darwin": "copyfiles -u 1 \"target/quarkus-app/**/*\" dist/", "copy:app:win32": "copyfiles -u 1 \"target/quarkus-app/**\" dist/", "dist": "rimraf dist && mkdir dist && pnpm copy:app && pnpm rename:app", - "install": "node install.js", + "install": "node mvn.bootstrap.js", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", "rename:app": "run-script-os", "rename:app:linux:darwin": "mv dist/quarkus-app dist/extended-services-java", diff --git a/packages/extended-services-java/pom.xml b/packages/extended-services-java/pom.xml index 7eb6467d1da..476fed47aff 100644 --- a/packages/extended-services-java/pom.xml +++ b/packages/extended-services-java/pom.xml @@ -100,14 +100,12 @@ maven-compiler-plugin - ${compiler-plugin.version} ${maven.compiler.parameters} maven-surefire-plugin - ${surefire-plugin.version} org.jboss.logmanager.LogManager @@ -116,7 +114,6 @@ maven-failsafe-plugin - ${surefire-plugin.version} diff --git a/packages/jbpm-quarkus-devui/dev/pom.xml b/packages/jbpm-quarkus-devui/dev/pom.xml index 66c31c82286..6b714728ca9 100644 --- a/packages/jbpm-quarkus-devui/dev/pom.xml +++ b/packages/jbpm-quarkus-devui/dev/pom.xml @@ -35,16 +35,7 @@ ${revision} - 3.13.0 true - 17 - 17 - UTF-8 - UTF-8 - 3.5.0 - 3.12.1 - 3.2.0 - 3.4.1 4.13.2 true 1.26.1 @@ -214,7 +205,6 @@ org.apache.maven.plugins maven-site-plugin - ${maven.site.plugin.version} org.apache.commons @@ -231,7 +221,6 @@ org.apache.maven.plugins maven-remote-resources-plugin - ${maven.remote.resources.plugin.version} org.apache.commons @@ -248,7 +237,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven.jar.plugin.version} org.iq80.snappy @@ -260,7 +248,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire-plugin.version} org.iq80.snappy @@ -292,14 +279,12 @@ maven-compiler-plugin - ${compiler-plugin.version} ${maven.compiler.parameters} maven-surefire-plugin - ${surefire-plugin.version} org.jboss.logmanager.LogManager @@ -310,7 +295,6 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 true resolveCiFriendliesOnly diff --git a/packages/jbpm-quarkus-devui/install.js b/packages/jbpm-quarkus-devui/mvn.bootstrap.js similarity index 84% rename from packages/jbpm-quarkus-devui/install.js rename to packages/jbpm-quarkus-devui/mvn.bootstrap.js index fbc73cb1c4c..7d6e40f7fa9 100644 --- a/packages/jbpm-quarkus-devui/install.js +++ b/packages/jbpm-quarkus-devui/mvn.bootstrap.js @@ -18,8 +18,9 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.jbpmQuarkusDevuiExtension.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); diff --git a/packages/jbpm-quarkus-devui/mvn.tail.js b/packages/jbpm-quarkus-devui/mvn.tail.js new file mode 100644 index 00000000000..b201d465aec --- /dev/null +++ b/packages/jbpm-quarkus-devui/mvn.tail.js @@ -0,0 +1,22 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [require("@kie-tools/maven-base/mvn.tail")]); diff --git a/packages/jbpm-quarkus-devui/package.json b/packages/jbpm-quarkus-devui/package.json index d832c918046..92aaefe6f43 100644 --- a/packages/jbpm-quarkus-devui/package.json +++ b/packages/jbpm-quarkus-devui/package.json @@ -15,16 +15,16 @@ "scripts": { "build:dev": "run-script-os", "build:dev:darwin:linux": "mvn clean install -DskipTests", - "build:dev:win32": "pnpm powershell \"mvn clean install -DskipTests \"", + "build:dev:win32": "pnpm powershell \"mvn clean install `-DskipTests\"", "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) -Dreproducible", - "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) `-Dreproducible\"", - "install": "node install.js", + "build:prod:darwin:linux": "mvn clean deploy -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -Dmaven.deploy.skip=$(build-env maven.deploy.skip) -Dreproducible", + "build:prod:win32": "pnpm powershell \"mvn clean deploy `-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-Dmaven.deploy.skip=$(build-env maven.deploy.skip) `-Dreproducible\"", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", "quarkus:dev": "run-script-os", "quarkus:dev:darwin:linux": "mvn clean package quarkus:dev -DskipTests", - "quarkus:dev:win32": "mvn clean package quarkus:dev -DskipTests", + "quarkus:dev:win32": "mvn clean package quarkus:dev `-DskipTests", "start": "pnpm build:dev && mvn -f ./dev/pom.xml quarkus:dev" }, "dependencies": { diff --git a/packages/maven-base/install.js b/packages/maven-base/mvn.bootstrap.js similarity index 66% rename from packages/maven-base/install.js rename to packages/maven-base/mvn.bootstrap.js index a34033bc954..346e745b89a 100644 --- a/packages/maven-base/install.js +++ b/packages/maven-base/mvn.bootstrap.js @@ -18,8 +18,24 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile, setPomProperty } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile( + ` + --batch-mode + -Dstyle.color=always -Drevision=${buildEnv.env.mavenBase.version} -`); + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} +`, + { ignoreDefault: true } +); + +setPomProperty({ + key: "version.org.kie.kogito", + value: buildEnv.env.kogitoRuntime.version, +}); + +setPomProperty({ + key: "quarkus.platform.version", + value: buildEnv.env.quarkusPlatform.version, +}); diff --git a/packages/dmn-testing-models/index.js b/packages/maven-base/mvn.tail.js similarity index 86% rename from packages/dmn-testing-models/index.js rename to packages/maven-base/mvn.tail.js index e3745dd42a2..a608445c8c9 100644 --- a/packages/dmn-testing-models/index.js +++ b/packages/maven-base/mvn.tail.js @@ -17,4 +17,6 @@ * under the License. */ -/** Empty Entrypoint of this module - No TS/JS code here, it just holds DMN files for testing purposes */ +const { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, []); diff --git a/packages/maven-base/package.json b/packages/maven-base/package.json index 8af3e3cbf2f..28314131aab 100644 --- a/packages/maven-base/package.json +++ b/packages/maven-base/package.json @@ -14,20 +14,14 @@ }, "scripts": { "build:dev": "run-script-os", - "build:dev:darwin:linux": "mvn clean install -DskipTests", - "build:dev:win32": "pnpm powershell \"mvn clean install -DskipTests \"", + "build:dev:darwin:linux": "mvn clean install -DskipTests -P'!kie-tools--maven-profile--1st-party-dependencies' --settings=node_modules/@kie-tools/maven-config-setup-helper/bootstrap-settings.xml", + "build:dev:win32": "pnpm powershell \"mvn clean install `-DskipTests `-P'!kie-tools--maven-profile--1st-party-dependencies' `--settings=node_modules/@kie-tools/maven-config-setup-helper/bootstrap-settings.xml\"", "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) -Dreproducible", - "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) `-Dreproducible\"", - "install": "pnpm set-quarkus-version && pnpm set-kogito-version && node install.js", + "build:prod:darwin:linux": "mvn clean deploy -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -Dmaven.deploy.skip=$(build-env maven.deploy.skip) -P'!kie-tools--maven-profile--1st-party-dependencies' --settings=node_modules/@kie-tools/maven-config-setup-helper/bootstrap-settings.xml -Dreproducible", + "build:prod:win32": "pnpm powershell \"mvn clean deploy `-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-Dmaven.deploy.skip=$(build-env maven.deploy.skip) `-P'!kie-tools--maven-profile--1st-party-dependencies' `--settings=node_modules/@kie-tools/maven-config-setup-helper/bootstrap-settings.xml `-Dreproducible\"", + "install": "node mvn.bootstrap.js && pnpm build:dev", "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:*", diff --git a/packages/maven-base/pom.xml b/packages/maven-base/pom.xml index 39104bcd1bb..0ebc7139172 100644 --- a/packages/maven-base/pom.xml +++ b/packages/maven-base/pom.xml @@ -96,23 +96,34 @@ - 2024-01-12T00:00:00Z - 3.4.1 17 17 - true UTF-8 UTF-8 - 3.13.0 - 3.2.0 - 1.6.0 + + + 2024-01-12T00:00:00Z + true + + + 3.4.1 + 3.13.0 + 3.2.0 + 3.0.0-M7 + 3.5.0 + 3.1.2 + 3.12.1 + 3.6.1 + 3.4.1 + 3.2.0 + 3.4.0 + 1.6.0 + + 4.13.2 - 3.5.0 3.8.6 + 999-20240912-SNAPSHOT - ${quarkus.platform.version} - io.quarkus - 3.0.0-M7 @@ -163,27 +174,131 @@ + org.apache.maven.plugins maven-artifact-plugin ${version.maven.artifact.plugin} ${project.build.outputTimestamp} - ${session.executionRootDirectory}/node_modules/@kie-tools/maven-base/not-reproducible-plugins.properties + + + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.maven.deploy.plugin} + + + org.apache.maven.plugins + maven-dependency-plugin + ${version.maven.dependency.plugin} + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.maven.compiler.plugin} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${version.maven.failsafe.plugin} + + + org.apache.maven.plugins + maven-clean-plugin + ${version.maven.clean.plugin} + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.maven.surefire.plugin} + + + org.apache.maven.plugins + maven-jar-plugin + ${version.maven.jar.plugin} + + + org.apache.maven.plugins + maven-remote-resources-plugin + ${version.maven.remote.resources.plugin} + + + org.codehaus.mojo + flatten-maven-plugin + ${version.codehaus.flatten.plugin} + + + + + + + maven-clean-plugin + + + + ${basedir}/dist/1st-party-m2 + + **/* + + false + + + + + + clean + + clean + + + + + + + + + maven-deploy-plugin + + + deploy-to-local-dist-1st-party-m2 + install + + deploy + + + false + kie-tools--local-dist-1st-party-m2::file://${maven.multiModuleProjectDirectory}/dist/1st-party-m2/repository + + + + + + + org.codehaus.mojo flatten-maven-plugin - ${version.flatten.plugin} true resolveCiFriendliesOnly @@ -205,8 +320,10 @@ + + + - org.apache.maven.plugins maven-source-plugin @@ -227,6 +344,7 @@ + reproducible-build @@ -238,7 +356,6 @@ - org.apache.maven.plugins maven-artifact-plugin @@ -247,8 +364,11 @@ check-buildplan - + validate @@ -256,8 +376,11 @@ compare - + install diff --git a/packages/maven-config-setup-helper/bootstrap-settings.xml b/packages/maven-config-setup-helper/bootstrap-settings.xml new file mode 100644 index 00000000000..ca6fef10280 --- /dev/null +++ b/packages/maven-config-setup-helper/bootstrap-settings.xml @@ -0,0 +1,104 @@ + + + false + + + + apache-public-repository-group-mirror-to-central + apache-public-repository-group + https://repo.maven.apache.org/maven2 + + + jboss-public-repository-group-mirror-to-central + jboss-public-repository-group + https://repo.maven.apache.org/maven2 + + + jboss-enterprise-maven-repository-mirror-to-central + jboss-enterprise-maven-repository + https://repo.maven.apache.org/maven2 + + + + + + kie-tools--default-repos + + + ignore--kie-tools--default-repos + !true + + + + + apache.snapshots + Apache Snapshot Repository + https://repository.apache.org/snapshots + + false + + + true + never + + + + central + Central Repository + https://repo.maven.apache.org/maven2 + + false + + + + apache-public-repository-group + Apache Public Repository Group + https://repo.maven.apache.org/maven2 + default + + false + never + + + false + never + + + + jboss-public-repository-group + JBOSS Public Repository Group + https://repo.maven.apache.org/maven2 + default + + false + never + + + false + never + + + + + + apache-public-repository-group + Apache Public Repository Group + https://repository.apache.org/content/groups/public/ + default + + false + never + + + false + never + + + + + + diff --git a/packages/maven-config-setup-helper/build-settings.xml b/packages/maven-config-setup-helper/build-settings.xml new file mode 100644 index 00000000000..b98e82e4046 --- /dev/null +++ b/packages/maven-config-setup-helper/build-settings.xml @@ -0,0 +1,107 @@ + + + + + + false + + + + apache-public-repository-group-mirror-to-central + apache-public-repository-group + https://repo.maven.apache.org/maven2 + + + jboss-public-repository-group-mirror-to-central + jboss-public-repository-group + https://repo.maven.apache.org/maven2 + + + jboss-enterprise-maven-repository-mirror-to-central + jboss-enterprise-maven-repository + https://repo.maven.apache.org/maven2 + + + + + + kie-tools--default-repos + + + ignore--kie-tools--default-repos + !true + + + + + apache.snapshots + Apache Snapshot Repository + https://repository.apache.org/snapshots + + false + + + true + never + + + + central + Central Repository + https://repo.maven.apache.org/maven2 + + false + + + + apache-public-repository-group + Apache Public Repository Group + https://repo.maven.apache.org/maven2 + default + + false + never + + + false + never + + + + jboss-public-repository-group + JBOSS Public Repository Group + https://repo.maven.apache.org/maven2 + default + + false + never + + + false + never + + + + + + apache-public-repository-group + Apache Public Repository Group + https://repository.apache.org/content/groups/public/ + default + + false + never + + + false + never + + + + + + diff --git a/packages/maven-config-setup-helper/empty-pom.xml b/packages/maven-config-setup-helper/empty-pom.xml new file mode 100644 index 00000000000..983183206e5 --- /dev/null +++ b/packages/maven-config-setup-helper/empty-pom.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + + org.apache.kie + kie-tools-maven-config-setup-helper-empty-pom + 0.0.0-SNAPSHOT + diff --git a/packages/maven-config-setup-helper/index.js b/packages/maven-config-setup-helper/index.js index 8612c0ce73e..9051f2363f9 100755 --- a/packages/maven-config-setup-helper/index.js +++ b/packages/maven-config-setup-helper/index.js @@ -21,28 +21,137 @@ const { execSync } = require("child_process"); const fs = require("fs"); const path = require("path"); +// Constants relative to consumer packages. const MVN_CONFIG_ORIGINAL_FILE_PATH = path.join(".mvn", "maven.config.original"); const MVN_CONFIG_FILE_PATH = path.join(".mvn", "maven.config"); +// This package's constants. +const MVNW_VERSION = "3.3.0"; +const EMPTY_POM_XML_PATH = path.join(__dirname, "empty-pom.xml"); +const BUILD_SETTINGS_XML_PATH = path.join(__dirname, "build-settings.xml"); +const BOOTSTRAP_SETTINGS_XML_PATH = path.join(__dirname, "bootstrap-settings.xml"); + +const DEFAULT_MAVEN_CONFIG = ` +-Dstyle.color=always +--batch-mode +--settings=${BUILD_SETTINGS_XML_PATH} +`.trim(); + +const DEFAULT_LOCAL_REPO = String( + execSync(`mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout -f ${EMPTY_POM_XML_PATH}`, [], { + stdio: "pipe", + }) +).trim(); + +const BOOTSTRAP_CLI_ARGS = `-P'!kie-tools--maven-profile--1st-party-dependencies' --settings=${BOOTSTRAP_SETTINGS_XML_PATH}`; + module.exports = { + /** + * Evaluation of ${settings.localRepository}. + */ + DEFAULT_LOCAL_REPO, + + /** + * Maven CLI arguments to be passed for `mvn` commands running during `bootstrap` phase. + */ + BOOTSTRAP_CLI_ARGS, + + /** + * An absolute path for an empty POM, in case someone needs to run `mvn` scripts without having a pom.xml file. + */ + EMPTY_POM_XML_PATH, + + /** + * Installs `mvnw` on the same directory of invocation. + * */ + installMvnw: () => { + console.info(`[maven-config-setup-helper] Installing mvnw...`); + console.time(`[maven-config-setup-helper] Installing mvnw...`); + execSync(`mvn -e org.apache.maven.plugins:maven-wrapper-plugin:${MVNW_VERSION}:wrapper ${BOOTSTRAP_CLI_ARGS}`, { + stdio: "inherit", + }); + console.timeEnd(`[maven-config-setup-helper] Installing mvnw...`); + }, + + /** + * Helps setting up an array of absolute paths that will be used to configure `-Dmaven.repo.local.tail`. + * + * @param selfDirname The absolute path of a directory that will contain the `dist/1st-party-m2/repository` directory. + * @param tail An array of absolute paths of other local Maven repositories. + * + * @returns A flat list of absolute paths of local Maven repositories. + */ + tailIncludingSelf: (selfDirname, tail) => { + return [path.join(selfDirname, "dist/1st-party-m2/repository"), ...new Set(tail.flatMap((t) => t))]; + }, + + /** + * Helps setting up an array of absolute paths that will be used to configure `-Dmaven.repo.local.tail`. + * + * @param tail An array of absolute paths of other local Maven repositories. + * + * @returns A flat list of absolute paths of local Maven repositories. + */ + tail: (tail) => { + return [...new Set(tail.flatMap((t) => t))]; + }, + + /** + * Builds a single Maven repository directory out of multiple local Maven repositories using hard links. + * + * @param tmpM2Dir Relative path of this new Maven repository directory. It will be deleted and recreated for each invocation. + * @param tail A list of paths representing additional Maven repository directories, to be concatenated the default one (I.e, `maven.repo.local`) + * */ + prepareHardLinkedM2FromTail: (tmpM2Dir, tail) => { + const resolvedTmpM2Dir = path.resolve(tmpM2Dir); + if (fs.existsSync(resolvedTmpM2Dir)) { + fs.rmSync(resolvedTmpM2Dir, { recursive: true, force: true }); + } + fs.mkdirSync(resolvedTmpM2Dir, { recursive: true }); + + // head + execSync(`cp -nal ${DEFAULT_LOCAL_REPO}/* ${resolvedTmpM2Dir}`, { stdio: "inherit" }); + + // tail + for (const t of tail) { + execSync(`cp -nal ${path.resolve(t)}/* ${resolvedTmpM2Dir}`, { stdio: "inherit" }); + } + }, + + /** + * Sets a property on a POM. + * + * @param entry An object with `key` and `value` properties + */ setPomProperty: ({ key, value }) => { if (!key || !value) { console.error("[maven-config-setup-helper] Wrong values provided"); process.exit(1); } + console.info(`[maven-config-setup-helper] Setting property '${key}' with value '${value}'...`); + console.time(`[maven-config-setup-helper] Setting property '${key}' with value '${value}'...`); + + const cmd = `mvn versions:set-property -Dproperty=${key} -DnewVersion=${value} -DgenerateBackupPoms=false ${BOOTSTRAP_CLI_ARGS}`; + if (process.platform === "win32") { - execSync(`mvn versions:set-property \`-Dproperty=${key} \`-DnewVersion=${value} \`-DgenerateBackupPoms=false`, { - stdio: "inherit", - shell: "powershell.exe", - }); + execSync(cmd.replaceAll(" -", " `-"), { stdio: "inherit", shell: "powershell.exe" }); } else { - execSync(`mvn versions:set-property -Dproperty=${key} -DnewVersion=${value} -DgenerateBackupPoms=false`, { - stdio: "inherit", - }); + execSync(cmd, { stdio: "inherit" }); } + + console.timeEnd(`[maven-config-setup-helper] Setting property '${key}' with value '${value}'...`); }, - setup: (mavenConfigString) => { + + /** + * 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 args An object with a `ignoreDefault: boolean` property. + */ + setupMavenConfigFile: (mavenConfigString, args) => { + console.info(`[maven-config-setup-helper] Configuring Maven through .mvn/maven.config...`); + console.time(`[maven-config-setup-helper] Configuring Maven through .mvn/maven.config...`); let originalMvnConfigString; if (fs.existsSync(MVN_CONFIG_ORIGINAL_FILE_PATH)) { console.info(`[maven-config-setup-helper] Found '${MVN_CONFIG_ORIGINAL_FILE_PATH}'.`); @@ -67,11 +176,22 @@ module.exports = { .map((l) => l.trim()) .join("\n"); - const newMavenConfigString = `${originalMvnConfigString.trim()}\n${trimmedMavenConfigString.trim()}`.trim(); + const newMavenConfigString = `### Package-specific configuration${ + originalMvnConfigString ? `\n${originalMvnConfigString}\n` : `` + } +${trimmedMavenConfigString.trim()}`; + console.info(`[maven-config-setup-helper] Writing '${MVN_CONFIG_FILE_PATH}'...`); console.info(newMavenConfigString); - fs.writeFileSync(MVN_CONFIG_FILE_PATH, newMavenConfigString); - console.info(`[maven-config-setup-helper] Done.`); + const defaultMavenConfigString = args?.ignoreDefault + ? "" + : ` + +#### Default configuration +${DEFAULT_MAVEN_CONFIG}`; + + fs.writeFileSync(MVN_CONFIG_FILE_PATH, `${newMavenConfigString}${defaultMavenConfigString}`); + console.timeEnd(`[maven-config-setup-helper] Configuring Maven through .mvn/maven.config...`); }, }; diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/install.js b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.bootstrap.js similarity index 76% rename from packages/serverless-logic-web-tools-swf-deployment-quarkus-app/install.js rename to packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.bootstrap.js index b562eaace2c..1c3c3c278c3 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/install.js +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.bootstrap.js @@ -18,10 +18,16 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile( + ` + --batch-mode + -Dstyle.color=always -Drevision=${buildEnv.env.swfDeploymentQuarkusApp.version} -Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version} -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version} -`); + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} +`, + { ignoreDefault: true } // Can't have special configuration that only works inside this repo. +); diff --git a/packages/yard-validator-worker/install.js b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.tail.js similarity index 82% rename from packages/yard-validator-worker/install.js rename to packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.tail.js index 4247286a3fc..468691f4f22 100644 --- a/packages/yard-validator-worker/install.js +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.tail.js @@ -17,9 +17,6 @@ * under the License. */ -const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { tail } = require("@kie-tools/maven-config-setup-helper"); -setup(` - -Drevision=${buildEnv.env.yardValidator.version} -`); +module.exports = tail([require("@kie-tools/sonataflow-quarkus-devui/mvn.tail")]); diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/package.json b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/package.json index 94f344bb90b..0f14b80ef65 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/package.json +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/package.json @@ -19,7 +19,7 @@ "build:prod": "pnpm lint && run-script-os", "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", - "install": "node install.js", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", "quarkus:dev": "run-script-os", diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml index 40a5864091d..34b1944a549 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml @@ -42,10 +42,6 @@ 17 UTF-8 UTF-8 - quarkus-bom - io.quarkus - org.kie.kogito - kogito-bom 2.1.20 1.26.0 1.14.2 @@ -55,15 +51,15 @@ - ${quarkus.platform.group-id} - ${quarkus.platform.artifact-id} + io.quarkus + quarkus-bom ${quarkus.platform.version} pom import - ${kogito.bom.group-id} - ${kogito.bom.artifact-id} + org.kie.kogito + kogito-bom ${version.org.kie.kogito} pom import @@ -108,11 +104,6 @@ org.kie kie-addons-quarkus-knative-eventing - - org.apache.kie.sonataflow - sonataflow-quarkus-devui - ${project.version} - org.kie kogito-addons-quarkus-data-index-inmemory @@ -147,10 +138,55 @@ + + + kie-tools--maven-profile--1st-party-dependencies + + + ignore--kie-tools--maven-profile--1st-party-dependencies + !true + + + + + + org.apache.kie.sonataflow + sonataflow-quarkus-devui-bom + ${project.version} + pom + import + + + + + + org.apache.kie.sonataflow + sonataflow-quarkus-devui + + + + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + default-install + none + + + + + + - ${quarkus.platform.group-id} + io.quarkus quarkus-maven-plugin ${quarkus.platform.version} true diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js b/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js index 1c29373cc23..7e8dab30e31 100644 --- a/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js +++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js @@ -35,10 +35,6 @@ module.exports = composeEnv([rootEnv, require("@kie-tools/serverless-logic-web-t default: `${kogitoBaseBuilderImageEnv.registry}/${kogitoBaseBuilderImageEnv.account}/${kogitoBaseBuilderImageEnv.name}:${kogitoBaseBuilderImageEnv.buildTag}`, description: "Base image complete tag.", }, - SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__mavenM2RepoViaHttpImage: { - default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`, - description: "The image tag for the Maven M2 Repo via HTTP. Used during the build only.", - }, }), get env() { return { @@ -46,9 +42,7 @@ module.exports = composeEnv([rootEnv, require("@kie-tools/serverless-logic-web-t baseImageTag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__baseImageTag), version: require("../package.json").version, dev: { - mavenM2RepoViaHttpImage: getOrDefault( - this.vars.SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__mavenM2RepoViaHttpImage - ), + mavenM2RepoViaHttpImage: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`, }, }, }; diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js b/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js index 6a812f4a2e6..609c5b2c33c 100644 --- a/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js +++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js @@ -18,8 +18,8 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.slwtDevModeImage.version} `); diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json b/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json index f395d8d6393..0b18d964816 100644 --- a/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json +++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json @@ -13,7 +13,7 @@ "url": "https://github.com/apache/incubator-kie-tools/issues" }, "scripts": { - "build": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm m2-repo-via-http:container:run\" \"pnpm copy:assets\" \"pnpm image:docker:build\" \"pnpm image:docker:squash\" --finally \"pnpm m2-repo-via-http:container:kill\"", + "build": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm m2-repo-via-http:container:run\" \"pnpm copy:assets\" \"pnpm image:docker:build\" \"pnpm image:docker:squash\" --finally \"pnpm m2-repo-via-http:container:kill\" \"rimraf ./dist/tmp-m2\"", "build:dev": "pnpm build", "build:prod": "pnpm build", "copy:assets": "rimraf dist-dev && mkdir -p ./dist-dev && pnpm copy:quarkus-app && pnpm copy:sonataflow-deployment-webapp && pnpm copy:maven-m2-repo-via-http-image--settings-xml", @@ -30,7 +30,8 @@ "image:docker:squash": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && DOCKER_HOST=$(docker context inspect | jq '.[].Endpoints.docker.Host' | tr -d '\"') docker-squash -t $(build-env slwtDevModeImageEnv.registry)/$(build-env slwtDevModeImageEnv.account)/$(build-env slwtDevModeImageEnv.name):$(build-env slwtDevModeImageEnv.buildTag) $(build-env slwtDevModeImageEnv.registry)/$(build-env slwtDevModeImageEnv.account)/$(build-env slwtDevModeImageEnv.name):$(build-env slwtDevModeImageEnv.buildTag)", "install": "node install.js", "m2-repo-via-http:container:kill": "(docker container kill m2-repo-via-http || true) && (docker container rm m2-repo-via-http || true)", - "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && docker run --name m2-repo-via-http -v \"$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout):/var/www/html\" -dit $(build-env slwtDevModeImage.dev.mavenM2RepoViaHttpImage)", + "m2-repo-via-http:container:prepare-m2-repo-volume": "node -e 'require(`@kie-tools/maven-config-setup-helper`).prepareHardLinkedM2FromTail(`./dist/tmp-m2/repository`, require(`@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app/mvn.tail`))'", + "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && pnpm m2-repo-via-http:container:prepare-m2-repo-volume && docker run --name m2-repo-via-http -v \"./dist/tmp-m2/repository:/var/www/html\" -dit $(build-env slwtDevModeImage.dev.mavenM2RepoViaHttpImage)", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, "devDependencies": { diff --git a/packages/serverless-workflow-diagram-editor/mvn.bootstrap.js b/packages/serverless-workflow-diagram-editor/mvn.bootstrap.js new file mode 100644 index 00000000000..d6bc313e004 --- /dev/null +++ b/packages/serverless-workflow-diagram-editor/mvn.bootstrap.js @@ -0,0 +1,31 @@ +/* + * 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 buildEnv = require("./env"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); + +setupMavenConfigFile( + ` + --batch-mode + -Dstyle.color=always + -Drevision=${buildEnv.env.swfDiagramEditor.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} + `, + { 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/serverless-workflow-diagram-editor/mvn.tail.js b/packages/serverless-workflow-diagram-editor/mvn.tail.js new file mode 100644 index 00000000000..adaec29ae10 --- /dev/null +++ b/packages/serverless-workflow-diagram-editor/mvn.tail.js @@ -0,0 +1,24 @@ +/* + * 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 { tailIncludingSelf, DEFAULT_LOCAL_REPO } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [ + [DEFAULT_LOCAL_REPO], // For some reason, j2cl-maven-plugin needs this here as the last tail. +]); diff --git a/packages/serverless-workflow-diagram-editor/package.json b/packages/serverless-workflow-diagram-editor/package.json index afdb0988436..228822979f5 100644 --- a/packages/serverless-workflow-diagram-editor/package.json +++ b/packages/serverless-workflow-diagram-editor/package.json @@ -23,7 +23,7 @@ "build:prod": "run-script-os", "build:prod:linux:darwin": "pnpm lint && mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -DskipITs=$(build-env endToEndTests.run --not) -Pno-showcase", "build:prod:win32": "pnpm lint && pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-DskipITs=$(build-env endToEndTests.run --not) `-Pno-showcase\"", - "install": "node install.js", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, diff --git a/packages/serverless-workflow-diagram-editor/pom.xml b/packages/serverless-workflow-diagram-editor/pom.xml index 91080e2cd77..f57e41035e7 100644 --- a/packages/serverless-workflow-diagram-editor/pom.xml +++ b/packages/serverless-workflow-diagram-editor/pom.xml @@ -712,6 +712,16 @@ + + org.apache.maven.plugins + maven-install-plugin + + + default-install + none + + + org.kie.j2cl.tools j2cl-maven-plugin diff --git a/packages/serverless-workflow-vscode-extension/e2e-tests/resources/greeting-flow/pom.xml b/packages/serverless-workflow-vscode-extension/e2e-tests/resources/greeting-flow/pom.xml index 17ee5c338aa..7886ca166fe 100644 --- a/packages/serverless-workflow-vscode-extension/e2e-tests/resources/greeting-flow/pom.xml +++ b/packages/serverless-workflow-vscode-extension/e2e-tests/resources/greeting-flow/pom.xml @@ -32,7 +32,6 @@ UTF-8 UTF-8 quarkus-bom - io.quarkus.platform 2.13.1.Final true 3.0.0-M7 @@ -40,15 +39,8 @@ - ${quarkus.platform.group-id} - ${quarkus.platform.artifact-id} - ${quarkus.platform.version} - pom - import - - - ${quarkus.platform.group-id} - quarkus-kogito-bom + io.quarkus + quarkus-bom ${quarkus.platform.version} pom import @@ -94,7 +86,7 @@ - ${quarkus.platform.group-id} + io.quarkus quarkus-maven-plugin ${quarkus.platform.version} true diff --git a/packages/sonataflow-builder-image/package.json b/packages/sonataflow-builder-image/package.json index d3913462f33..b3fa8e47428 100644 --- a/packages/sonataflow-builder-image/package.json +++ b/packages/sonataflow-builder-image/package.json @@ -32,7 +32,8 @@ "image:test:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image", "install": "node install.js && pnpm format", "m2-repo-via-http:container:kill": "(docker container kill m2-repo-via-http || true) && (docker container rm m2-repo-via-http || true)", - "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && docker run --name m2-repo-via-http -v \"$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout):/var/www/html\" -dit $(build-env sonataflowBuilderImage.dev.mavenM2RepoViaHttpImage)", + "m2-repo-via-http:container:prepare-m2-repo-volume": "node -e 'require(`@kie-tools/maven-config-setup-helper`).prepareHardLinkedM2FromTail(`./dist/tmp-m2/repository`, require(`@kie-tools/sonataflow-quarkus-devui/mvn.tail`))'", + "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && pnpm m2-repo-via-http:container:prepare-m2-repo-volume && docker run --name m2-repo-via-http -v \"./dist/tmp-m2/repository:/var/www/html\" -dit $(build-env sonataflowBuilderImage.dev.mavenM2RepoViaHttpImage)", "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowBuilderImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)", "test": "run-script-os", "test:cleanup": "mv dist-tests/report.xml dist-tests/junit-report.xml || true", @@ -43,6 +44,7 @@ }, "devDependencies": { "@kie-tools/image-builder": "workspace:*", + "@kie-tools/maven-config-setup-helper": "workspace:*", "@kie-tools/maven-m2-repo-via-http-image": "workspace:*", "@kie-tools/python-venv": "workspace:*", "@kie-tools/root-env": "workspace:*", diff --git a/packages/sonataflow-devmode-image/package.json b/packages/sonataflow-devmode-image/package.json index 32c092fa850..423e9ba9fcf 100644 --- a/packages/sonataflow-devmode-image/package.json +++ b/packages/sonataflow-devmode-image/package.json @@ -33,11 +33,13 @@ "image:test:win32": "echo \"Tests skipped on Windows\"", "install": "node install.js && pnpm format", "m2-repo-via-http:container:kill": "(docker container kill m2-repo-via-http || true) && (docker container rm m2-repo-via-http || true)", - "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && docker run --name m2-repo-via-http -v \"$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout):/var/www/html\" -dit $(build-env sonataflowDevModeImage.dev.mavenM2RepoViaHttpImage)", + "m2-repo-via-http:container:prepare-m2-repo-volume": "node -e 'require(`@kie-tools/maven-config-setup-helper`).prepareHardLinkedM2FromTail(`./dist/tmp-m2/repository`, require(`@kie-tools/sonataflow-quarkus-devui/mvn.tail`))'", + "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && pnpm m2-repo-via-http:container:prepare-m2-repo-volume && docker run --name m2-repo-via-http -v \"./dist/tmp-m2/repository:/var/www/html\" -dit $(build-env sonataflowDevModeImage.dev.mavenM2RepoViaHttpImage)", "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowDevModeImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowDevModeImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowDevModeImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowDevModeImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version) SONATAFLOW_QUARKUS_DEVUI_VERSION=$(build-env sonataflowDevModeImage.sonataflowQuarkusDevUiVersion)" }, "devDependencies": { "@kie-tools/image-builder": "workspace:*", + "@kie-tools/maven-config-setup-helper": "workspace:*", "@kie-tools/maven-m2-repo-via-http-image": "workspace:*", "@kie-tools/python-venv": "workspace:*", "@kie-tools/root-env": "workspace:*", diff --git a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure index 8c27f782926..fa1f6e30291 100644 --- a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure +++ b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure @@ -27,12 +27,14 @@ set -e # -Dpackaging=jar \ # -DgeneratePom=true -ls -la /tmp/artifacts +# ls -la /tmp/artifacts -mkdir -p "${KOGITO_HOME}"/.m2/repository/org/apache/kie/ -mkdir -p "${KOGITO_HOME}"/.m2/repository/org/kie/ -tar xf /tmp/artifacts/sonataflow-quarkus-devui-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository/org/apache/kie/ -tar xf /tmp/artifacts/kie-tools-maven-base-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository/org/kie/ +# mkdir -p "${KOGITO_HOME}"/.m2/repository/org/apache/kie/ +# mkdir -p "${KOGITO_HOME}"/.m2/repository/org/kie/ +# tar xf /tmp/artifacts/sonataflow-quarkus-devui-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository/org/apache/kie/ +# tar xf /tmp/artifacts/kie-tools-maven-base-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository/org/kie/ -find "${KOGITO_HOME}"/.m2/repository -name _remote.repositories | xargs rm +# find "${KOGITO_HOME}"/.m2/repository -name _remote.repositories | xargs rm + +echo "ok" diff --git a/packages/sonataflow-quarkus-devui/install.js b/packages/sonataflow-quarkus-devui/mvn.bootstrap.js similarity index 84% rename from packages/sonataflow-quarkus-devui/install.js rename to packages/sonataflow-quarkus-devui/mvn.bootstrap.js index 99bfadb8cf8..905462c239e 100644 --- a/packages/sonataflow-quarkus-devui/install.js +++ b/packages/sonataflow-quarkus-devui/mvn.bootstrap.js @@ -18,8 +18,9 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile(` -Drevision=${buildEnv.env.sonataflowQuarkusDevuiExtension.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); diff --git a/packages/sonataflow-quarkus-devui/mvn.tail.js b/packages/sonataflow-quarkus-devui/mvn.tail.js new file mode 100644 index 00000000000..b201d465aec --- /dev/null +++ b/packages/sonataflow-quarkus-devui/mvn.tail.js @@ -0,0 +1,22 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [require("@kie-tools/maven-base/mvn.tail")]); diff --git a/packages/sonataflow-quarkus-devui/package.json b/packages/sonataflow-quarkus-devui/package.json index 0e505282968..a33adbadea5 100644 --- a/packages/sonataflow-quarkus-devui/package.json +++ b/packages/sonataflow-quarkus-devui/package.json @@ -17,9 +17,9 @@ "build:dev:darwin:linux": "mvn clean install -DskipTests", "build:dev:win32": "pnpm powershell \"mvn clean install -DskipTests \"", "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) -Dreproducible", - "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) `-Dreproducible\"", - "install": "node install.js", + "build:prod:darwin:linux": "mvn clean deploy -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -Dmaven.deploy.skip=$(build-env maven.deploy.skip) -Dreproducible", + "build:prod:win32": "pnpm powershell \"mvn clean deploy `-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-Dmaven.deploy.skip=$(build-env maven.deploy.skip) `-Dreproducible\"", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", "quarkus:dev": "run-script-os", diff --git a/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui-deployment/pom.xml b/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui-deployment/pom.xml index b9d9eaa5486..644c1093286 100644 --- a/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui-deployment/pom.xml +++ b/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui-deployment/pom.xml @@ -116,7 +116,6 @@ maven-compiler-plugin - ${compiler-plugin.version} @@ -129,7 +128,6 @@ maven-resources-plugin - ${version.resources.plugin} copy-webapp diff --git a/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui/pom.xml b/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui/pom.xml index d2af94d419f..00917e62ed4 100644 --- a/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui/pom.xml +++ b/packages/sonataflow-quarkus-devui/sonataflow-quarkus-devui/pom.xml @@ -145,7 +145,6 @@ maven-compiler-plugin - ${compiler-plugin.version} diff --git a/packages/stunner-editors/install.js b/packages/stunner-editors/mvn.bootstrap.js similarity index 70% rename from packages/stunner-editors/install.js rename to packages/stunner-editors/mvn.bootstrap.js index a9c7ff06ea9..de88df80e05 100644 --- a/packages/stunner-editors/install.js +++ b/packages/stunner-editors/mvn.bootstrap.js @@ -18,9 +18,15 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); +const { setupMavenConfigFile } = require("@kie-tools/maven-config-setup-helper"); -setup(` +setupMavenConfigFile( + ` + --batch-mode + -Dstyle.color=always -Drevision=${buildEnv.env.stunnerEditors.version} -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version} -`); + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} +`, + { 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/stunner-editors/mvn.tail.js b/packages/stunner-editors/mvn.tail.js new file mode 100644 index 00000000000..af6d7c38ac4 --- /dev/null +++ b/packages/stunner-editors/mvn.tail.js @@ -0,0 +1,24 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [ + // empty on purpose. this package doesn't rely on `maven-base`. +]); diff --git a/packages/stunner-editors/package.json b/packages/stunner-editors/package.json index b18d4273885..9194e79aaae 100644 --- a/packages/stunner-editors/package.json +++ b/packages/stunner-editors/package.json @@ -28,7 +28,7 @@ "dist:bpmn": "symlink-dir kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-kogito-runtime/target/kie-wb-common-stunner-bpmn-kogito-runtime ./dist/bpmn", "dist:dmn": "symlink-dir kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/target/kie-wb-common-dmn-webapp-kogito-runtime ./dist/dmn", "dist:scesim": "symlink-dir drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-runtime/target/drools-wb-scenario-simulation-editor-kogito-runtime ./dist/scesim", - "install": "node install.js", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index bcf725aad35..0f834ca54f5 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -837,6 +837,16 @@ + + org.apache.maven.plugins + maven-install-plugin + + + default-install + none + + + org.codehaus.mojo build-helper-maven-plugin diff --git a/packages/vscode-java-code-completion-extension-plugin/install.js b/packages/vscode-java-code-completion-extension-plugin/mvn.bootstrap.js similarity index 86% rename from packages/vscode-java-code-completion-extension-plugin/install.js rename to packages/vscode-java-code-completion-extension-plugin/mvn.bootstrap.js index 3fcd2b81a0f..13ca8d15d44 100644 --- a/packages/vscode-java-code-completion-extension-plugin/install.js +++ b/packages/vscode-java-code-completion-extension-plugin/mvn.bootstrap.js @@ -18,19 +18,24 @@ */ const buildEnv = require("./env"); -const { setup } = require("@kie-tools/maven-config-setup-helper"); -const fs = require("fs"); -const path = require("path"); - -const MANIFEST_FILE = path.resolve("vscode-java-code-completion-extension-plugin-core/META-INF/MANIFEST.MF"); +const { setupMavenConfigFile, installMvnw } = require("@kie-tools/maven-config-setup-helper"); -console.info("[vscode-java-code-completion-extension-plugin-install] Updating '.mvn/maven.config'..."); const version = buildEnv.env.vscodeJavaCodeCompletionExtensionPlugin.version; -setup(` - -Drevision=${version} +setupMavenConfigFile(` + -Drevision=${version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} `); +installMvnw(); + +// Manifest file + +const fs = require("fs"); +const path = require("path"); + +const MANIFEST_FILE = path.resolve("vscode-java-code-completion-extension-plugin-core/META-INF/MANIFEST.MF"); + console.info("[vscode-java-code-completion-extension-plugin-install] Updating manifest file..."); const manifestFile = fs.readFileSync(MANIFEST_FILE, "utf-8"); diff --git a/packages/vscode-java-code-completion-extension-plugin/mvn.tail.js b/packages/vscode-java-code-completion-extension-plugin/mvn.tail.js new file mode 100644 index 00000000000..b201d465aec --- /dev/null +++ b/packages/vscode-java-code-completion-extension-plugin/mvn.tail.js @@ -0,0 +1,22 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [require("@kie-tools/maven-base/mvn.tail")]); diff --git a/packages/vscode-java-code-completion-extension-plugin/package.json b/packages/vscode-java-code-completion-extension-plugin/package.json index 1a16d3f4065..674ed0cbe99 100644 --- a/packages/vscode-java-code-completion-extension-plugin/package.json +++ b/packages/vscode-java-code-completion-extension-plugin/package.json @@ -24,8 +24,7 @@ "build:prod": "pnpm lint && run-script-os", "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -Dreproducible", "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-Dreproducible\"", - "install": "node install.js && pnpm install:mvnw", - "install:mvnw": "mvn -e org.apache.maven.plugins:maven-wrapper-plugin:3.3.0:wrapper -f ./", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, diff --git a/packages/vscode-java-code-completion-extension-plugin/pom.xml b/packages/vscode-java-code-completion-extension-plugin/pom.xml index 556e46a65cf..ae69b9f4599 100644 --- a/packages/vscode-java-code-completion-extension-plugin/pom.xml +++ b/packages/vscode-java-code-completion-extension-plugin/pom.xml @@ -112,7 +112,6 @@ org.codehaus.mojo flatten-maven-plugin - ${version.flatten.plugin} true resolveCiFriendliesOnly diff --git a/packages/yard-model/mvn.bootstrap.js b/packages/yard-model/mvn.bootstrap.js new file mode 100644 index 00000000000..63f19a556aa --- /dev/null +++ b/packages/yard-model/mvn.bootstrap.js @@ -0,0 +1,28 @@ +/* + * 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 buildEnv = require("./env"); +const { setupMavenConfigFile, installMvnw } = require("@kie-tools/maven-config-setup-helper"); + +setupMavenConfigFile(` + -Drevision=${buildEnv.env.yardModel.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")} +`); + +installMvnw(); diff --git a/packages/yard-model/mvn.tail.js b/packages/yard-model/mvn.tail.js new file mode 100644 index 00000000000..b201d465aec --- /dev/null +++ b/packages/yard-model/mvn.tail.js @@ -0,0 +1,22 @@ +/* + * 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 { tailIncludingSelf } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [require("@kie-tools/maven-base/mvn.tail")]); diff --git a/packages/yard-model/package.json b/packages/yard-model/package.json index 2d2dda942f5..19365689ec6 100644 --- a/packages/yard-model/package.json +++ b/packages/yard-model/package.json @@ -20,10 +20,7 @@ "build:prod": "pnpm lint && run-script-os", "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -Dreproducible", "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-Dreproducible\"", - "install": "node install.js && pnpm install:mvnw", - "install:mvnw": "run-script-os", - "install:mvnw:darwin:linux": "mvn -e org.apache.maven.plugins:maven-wrapper-plugin:3.3.0:wrapper", - "install:mvnw:win32": "pnpm powershell \"mvn -e org.apache.maven.plugins:maven-wrapper-plugin:3.3.0:wrapper\"", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, diff --git a/packages/yard-validator-worker/mvn.bootstrap.js b/packages/yard-validator-worker/mvn.bootstrap.js new file mode 100644 index 00000000000..7bb6d6262af --- /dev/null +++ b/packages/yard-validator-worker/mvn.bootstrap.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 buildEnv = require("./env"); +const { setupMavenConfigFile, installMvnw } = require("@kie-tools/maven-config-setup-helper"); + +setupMavenConfigFile(` + -Drevision=${buildEnv.env.yardValidator.version} + -Dmaven.repo.local.tail=${require("./mvn.tail").join(",")}`); + +installMvnw(); diff --git a/packages/yard-validator-worker/mvn.tail.js b/packages/yard-validator-worker/mvn.tail.js new file mode 100644 index 00000000000..c65da1e5e5c --- /dev/null +++ b/packages/yard-validator-worker/mvn.tail.js @@ -0,0 +1,26 @@ +/* + * 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 { tailIncludingSelf, DEFAULT_LOCAL_REPO } = require("@kie-tools/maven-config-setup-helper"); + +module.exports = tailIncludingSelf(__dirname, [ + require("@kie-tools/maven-base/mvn.tail"), + require("@kie-tools/yard-model/mvn.tail"), + [DEFAULT_LOCAL_REPO], // For some reason, j2cl-maven-plugin needs this here as the last tail. +]); diff --git a/packages/yard-validator-worker/package.json b/packages/yard-validator-worker/package.json index 21edd51a301..20d7ce24ffe 100644 --- a/packages/yard-validator-worker/package.json +++ b/packages/yard-validator-worker/package.json @@ -21,10 +21,7 @@ "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) -Dreproducible", "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `-Dreproducible\"", "copy:webworker": "copyfiles -f target/worker/yard-validator-worker/yard-validator-worker.js dist", - "install": "node install.js && pnpm install:mvnw", - "install:mvnw": "run-script-os", - "install:mvnw:darwin:linux": "mvn -e org.apache.maven.plugins:maven-wrapper-plugin:3.3.0:wrapper", - "install:mvnw:win32": "pnpm powershell \"mvn -e org.apache.maven.plugins:maven-wrapper-plugin:3.3.0:wrapper\"", + "install": "node mvn.bootstrap.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, diff --git a/packages/yard-validator-worker/pom.xml b/packages/yard-validator-worker/pom.xml index 3b48a8bd075..ecafaa7e272 100644 --- a/packages/yard-validator-worker/pom.xml +++ b/packages/yard-validator-worker/pom.xml @@ -45,7 +45,6 @@ 2024-01-12T00:00:00Z 0.4 2.0.10 - 3.13.0 11 11 0.23.0 @@ -58,18 +57,6 @@ 0.4 - - org.kie.kogito - yard-model - ${project.version} - - - org.kie.kogito - yard-model - ${project.version} - sources - - junit junit @@ -78,6 +65,43 @@ + + + kie-tools--maven-profile--1st-party-dependencies + + + ignore--kie-tools--maven-profile--1st-party-dependencies + !true + + + + + + + org.kie.kogito + yard-model + ${project.version} + + + org.kie.kogito + yard-model + ${project.version} + sources + + + + + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ff06cf04da9..486c3cb10ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3193,6 +3193,10 @@ importers: version: 1.1.2 packages/dev-deployment-kogito-quarkus-blank-app: + dependencies: + '@kie-tools/jbpm-quarkus-devui': + specifier: workspace:* + version: link:../jbpm-quarkus-devui devDependencies: '@kie-tools/maven-config-setup-helper': specifier: workspace:* @@ -3212,6 +3216,9 @@ importers: '@kie-tools/dev-deployment-kogito-quarkus-blank-app': specifier: workspace:* version: link:../dev-deployment-kogito-quarkus-blank-app + '@kie-tools/jbpm-quarkus-devui': + specifier: workspace:* + version: link:../jbpm-quarkus-devui devDependencies: '@kie-tools/image-builder': specifier: workspace:* @@ -10861,6 +10868,9 @@ importers: '@kie-tools/image-builder': specifier: workspace:* version: link:../image-builder + '@kie-tools/maven-config-setup-helper': + specifier: workspace:* + version: link:../maven-config-setup-helper '@kie-tools/maven-m2-repo-via-http-image': specifier: workspace:* version: link:../maven-m2-repo-via-http-image @@ -11111,6 +11121,9 @@ importers: '@kie-tools/image-builder': specifier: workspace:* version: link:../image-builder + '@kie-tools/maven-config-setup-helper': + specifier: workspace:* + version: link:../maven-config-setup-helper '@kie-tools/maven-m2-repo-via-http-image': specifier: workspace:* version: link:../maven-m2-repo-via-http-image diff --git a/repo/graph.dot b/repo/graph.dot index 9f5337da9e1..e5e2098a135 100644 --- a/repo/graph.dot +++ b/repo/graph.dot @@ -96,7 +96,6 @@ digraph G { "@kie-tools/dev-deployment-dmn-form-webapp-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/image-env-to-json" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/dev-deployment-kogito-quarkus-blank-app" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; - "@kie-tools/maven-config-setup-helper" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/maven-m2-repo-via-http-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/dmn-editor" [ color = "blue", fontcolor = "blue", style = "rounded" ]; @@ -151,6 +150,7 @@ digraph G { "@kie-tools/runtime-tools-management-console-webapp" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/runtime-tools-task-console-webapp" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools-core/kubernetes-bridge" [ color = "purple", fontcolor = "purple", style = "rounded" ]; + "@kie-tools/maven-config-setup-helper" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools-core/workspace" [ color = "purple", fontcolor = "purple", style = "rounded" ]; "@kie-tools/unitables-dmn" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "pmml-vscode-extension" [ color = "blue", fontcolor = "blue", style = "rounded" ]; @@ -335,8 +335,7 @@ digraph G { "@kie-tools/dev-deployment-dmn-form-webapp-image" -> "@kie-tools/dev-deployment-dmn-form-webapp" [ style = "solid", color = "black" ]; "@kie-tools/dev-deployment-dmn-form-webapp-image" -> "@kie-tools/image-env-to-json" [ style = "solid", color = "black" ]; "@kie-tools/dev-deployment-dmn-form-webapp-image" -> "@kie-tools/image-builder" [ style = "dashed", color = "black" ]; - "@kie-tools/dev-deployment-kogito-quarkus-blank-app" -> "@kie-tools/maven-config-setup-helper" [ style = "dashed", color = "black" ]; - "@kie-tools/dev-deployment-kogito-quarkus-blank-app" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ]; + "@kie-tools/dev-deployment-kogito-quarkus-blank-app" -> "@kie-tools/jbpm-quarkus-devui" [ style = "solid", color = "black" ]; "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" -> "@kie-tools/dev-deployment-base-image" [ style = "solid", color = "black" ]; "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" -> "@kie-tools/dev-deployment-kogito-quarkus-blank-app" [ style = "solid", color = "black" ]; "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" -> "@kie-tools/maven-m2-repo-via-http-image" [ style = "dashed", color = "black" ]; @@ -576,6 +575,7 @@ digraph G { "swf-vscode-extension" -> "@kie-tools-core/webpack-base" [ style = "dashed", color = "blue" ]; "swf-vscode-extension" -> "@kie-tools/serverless-workflow-diagram-editor-assets" [ style = "dashed", color = "blue" ]; "swf-vscode-extension" -> "@kie-tools/vscode-extension-common-test-helpers" [ style = "dashed", color = "blue" ]; + "@kie-tools/sonataflow-builder-image" -> "@kie-tools/maven-config-setup-helper" [ style = "dashed", color = "black" ]; "@kie-tools/sonataflow-builder-image" -> "@kie-tools/maven-m2-repo-via-http-image" [ style = "dashed", color = "black" ]; "@kie-tools/sonataflow-builder-image" -> "@kie-tools/sonataflow-image-common" [ style = "dashed", color = "black" ]; "sonataflow-deployment-webapp" -> "@kie-tools-core/react-hooks" [ style = "solid", color = "blue" ]; diff --git a/repo/graph.json b/repo/graph.json index fef9a5e3db9..845ea514a86 100644 --- a/repo/graph.json +++ b/repo/graph.json @@ -1457,12 +1457,7 @@ }, { "source": "@kie-tools/dev-deployment-kogito-quarkus-blank-app", - "target": "@kie-tools/maven-config-setup-helper", - "weight": 1 - }, - { - "source": "@kie-tools/dev-deployment-kogito-quarkus-blank-app", - "target": "@kie-tools/root-env", + "target": "@kie-tools/jbpm-quarkus-devui", "weight": 1 }, { @@ -1940,6 +1935,11 @@ "target": "@kie/kogito-jobs-service-postgresql-image", "weight": 1 }, + { + "source": "@kie-tools/sonataflow-builder-image", + "target": "@kie-tools/maven-config-setup-helper", + "weight": 1 + }, { "source": "@kie-tools/sonataflow-builder-image", "target": "@kie-tools/maven-m2-repo-via-http-image",