Merge main-apache and exclude white-listed changes from the merge

kiegroup · Jan 20, 2025 · 0bc67c2 · 0bc67c2
2 parents 8c22f56 + f7beeed
commit 0bc67c2
Show file tree

Hide file tree

Showing 44 changed files with 402 additions and 558 deletions.
diff --git a/examples/commit-message-validation-service/Makefile b/examples/commit-message-validation-service/Makefile
diff --git a/examples/jbpm-compact-architecture-example/src/main/resources/application.properties b/examples/jbpm-compact-architecture-example/src/main/resources/application.properties
diff --git a/...s/micro-frontends-multiplying-architecture-base64png-editor-vscode-extension/package.json b/...s/micro-frontends-multiplying-architecture-base64png-editor-vscode-extension/package.json
@@ -31,7 +31,7 @@
     "@kie-tools/root-env": "workspace:*",
     "@kie-tools/tsconfig": "workspace:*",
     "@types/vscode": "1.67.0",
-    "@vscode/vsce": "^2.22.0",
+    "@vscode/vsce": "^3.2.1",
     "rimraf": "^3.0.2",
     "typescript": "^5.5.3",
     "webpack": "^5.94.0",

diff --git a/...les/micro-frontends-multiplying-architecture-todo-list-view-vscode-extension/package.json b/...les/micro-frontends-multiplying-architecture-todo-list-view-vscode-extension/package.json
@@ -30,7 +30,7 @@
     "@kie-tools/root-env": "workspace:*",
     "@kie-tools/tsconfig": "workspace:*",
     "@types/vscode": "1.67.0",
-    "@vscode/vsce": "^2.22.0",
+    "@vscode/vsce": "^3.2.1",
     "rimraf": "^3.0.2",
     "typescript": "^5.5.3",
     "webpack": "^5.94.0",

diff --git a/packages/bpmn-vscode-extension/package.json b/packages/bpmn-vscode-extension/package.json
@@ -41,7 +41,7 @@
     "@kie-tools/vscode-java-code-completion-extension-plugin": "workspace:*",
     "@types/vscode": "1.67.0",
     "@vscode/test-web": "^0.0.30",
-    "@vscode/vsce": "^2.22.0",
+    "@vscode/vsce": "^3.2.1",
     "copy-webpack-plugin": "^11.0.0",
     "process": "^0.11.10",
     "rimraf": "^3.0.2",

diff --git a/packages/cors-proxy/package.json b/packages/cors-proxy/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "cors": "^2.8.5",
     "express": "^4.21.1",
-    "node-fetch": "^3.3.1"
+    "node-fetch": "^3.3.2"
   },
   "devDependencies": {
     "@babel/core": "^7.16.0",

diff --git a/packages/dashbuilder/pom.xml b/packages/dashbuilder/pom.xml
@@ -100,22 +100,17 @@
 
     <!-- Plugins -->
     <version.jar.plugin>3.1.2</version.jar.plugin>
-    <version.org.apache.maven.plugins.dependency>3.3.0</version.org.apache.maven.plugins.dependency>
-    <version.surefire.plugin>2.22.2</version.surefire.plugin>
+    <version.surefire.plugin>3.5.0</version.surefire.plugin>
     <version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>
     <version.buildhelper.plugin>3.0.0</version.buildhelper.plugin>
-    <version.surefire.plugin>3.2.5</version.surefire.plugin>
-    <version.enforcer.plugin>3.0.0-M3</version.enforcer.plugin>
-    <version.clean.plugin>3.1.0</version.clean.plugin>
-    <version.compiler.plugin>3.12.1</version.compiler.plugin>
-    <version.resources.plugin>3.2.0</version.resources.plugin>
-    <version.war.plugin>3.2.3</version.war.plugin>
-    <version.checkstyle.plugin>3.1.1</version.checkstyle.plugin>
-    <version.install.plugin>2.5.2</version.install.plugin>
-    <version.site.plugin>3.8.2</version.site.plugin>
+    <version.enforcer.plugin>3.5.0</version.enforcer.plugin>
+    <version.clean.plugin>3.4.0</version.clean.plugin>
+    <version.compiler.plugin>3.13.0</version.compiler.plugin>
+    <version.resources.plugin>3.3.1</version.resources.plugin>
+    <version.war.plugin>3.4.0</version.war.plugin>
+    <version.checkstyle.plugin>3.4.0</version.checkstyle.plugin>
     <version.antrun.plugin>1.8</version.antrun.plugin>
     <version.exec-maven-plugin>3.0.0</version.exec-maven-plugin>
-    <version.org.maven.dependency.plugin>3.1.2</version.org.maven.dependency.plugin>
     <!-- Properties from DROOLS-WB parent POM -->
     <!-- TODO: Enable these flags after fixing all checkstyle issues -->
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>

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
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>32</version>
+    <version>33</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -42,19 +42,13 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <!-- Maven versions -->
-    <version.maven.artifact.plugin>3.4.1</version.maven.artifact.plugin>
+    <!-- Plugins version -->
+    <version.codehaus.flatten.plugin>1.6.0</version.codehaus.flatten.plugin>
     <version.maven.compiler.plugin>3.13.0</version.maven.compiler.plugin>
-    <version.maven.resources.plugin>3.2.0</version.maven.resources.plugin>
-    <version.maven.failsafe.plugin>3.0.0-M7</version.maven.failsafe.plugin>
-    <version.maven.surefire.plugin>3.5.0</version.maven.surefire.plugin>
-    <version.maven.deploy.plugin>3.1.2</version.maven.deploy.plugin>
-    <version.maven.site.plugin>3.12.1</version.maven.site.plugin>
-    <version.maven.dependency.plugin>3.6.1</version.maven.dependency.plugin>
-    <version.maven.jar.plugin>3.4.1</version.maven.jar.plugin>
+    <version.maven.jar.plugin>3.4.2</version.maven.jar.plugin>
     <version.maven.remote.resources.plugin>3.2.0</version.maven.remote.resources.plugin>
-    <version.maven.clean.plugin>3.4.0</version.maven.clean.plugin>
-    <version.codehaus.flatten.plugin>1.6.0</version.codehaus.flatten.plugin>
+    <version.maven.site.plugin>3.21.0</version.maven.site.plugin>
+    <version.maven.surefire>3.5.0</version.maven.surefire>
 
     <!-- Config -->
     <maven.compiler.parameters>true</maven.compiler.parameters>

diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml
@@ -41,19 +41,15 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <!-- Maven versions -->
-    <version.maven.artifact.plugin>3.4.1</version.maven.artifact.plugin>
+    <!-- Plugins version -->
+    <version.codehaus.flatten.plugin>1.6.0</version.codehaus.flatten.plugin>
+    <version.maven.clean.plugin>3.4.0</version.maven.clean.plugin>
     <version.maven.compiler.plugin>3.13.0</version.maven.compiler.plugin>
+    <version.maven.failsafe.plugin>${version.maven.surefire.plugin}</version.maven.failsafe.plugin>
+    <version.maven.jar.plugin>3.4.2</version.maven.jar.plugin>
     <version.maven.resources.plugin>3.3.1</version.maven.resources.plugin>
-    <version.maven.failsafe.plugin>3.0.0-M7</version.maven.failsafe.plugin>
-    <version.maven.surefire.plugin>3.5.0</version.maven.surefire.plugin>
-    <version.maven.install.plugin>3.1.3</version.maven.install.plugin>
-    <version.maven.deploy.plugin>3.1.2</version.maven.deploy.plugin>
     <version.maven.site.plugin>3.21.0</version.maven.site.plugin>
-    <version.maven.dependency.plugin>3.6.1</version.maven.dependency.plugin>
-    <version.maven.jar.plugin>3.4.1</version.maven.jar.plugin>
-    <version.maven.clean.plugin>3.4.0</version.maven.clean.plugin>
-    <version.codehaus.flatten.plugin>1.6.0</version.codehaus.flatten.plugin>
+    <version.maven.surefire.plugin>3.5.0</version.maven.surefire.plugin>
     <!-- Temporary declaring xstream dependency, a version (1.4.20) is transitively imported by Quarkus 3.8 affected by CVE
       When upgrading Quarkus (> 3.15.x) to a new version, please evaluate if this exclusion can be removed   -->
     <version.com.thoughtworks.xstream>1.4.21</version.com.thoughtworks.xstream>

diff --git a/packages/dmn-editor/src/includedModels/IncludedModels.css b/packages/dmn-editor/src/includedModels/IncludedModels.css
@@ -20,3 +20,9 @@
 .kie-dmn-editor--selected-model-to-include-error {
   color: var(--pf-global--danger-color--100);
 }
+.kie-dmn-editor--model-card-kebabtoggle-wrapper {
+  color: grey;
+}
+.kie-dmn-editor--model-card-kebabtoggle-wrapper:hover {
+  color: black;
+}
diff --git a/packages/dmn-editor/src/includedModels/IncludedModels.tsx b/packages/dmn-editor/src/includedModels/IncludedModels.tsx
@@ -611,15 +611,15 @@ function IncludedModelCard({
               position={PopoverPosition.bottom}
               shouldOpen={() => setRemovePopoverOpen(true)}
             >
-              <Button
-                variant={"plain"}
+              <div
+                className="kie-dmn-editor--model-card-kebabtoggle-wrapper"
                 onClick={(ev) => {
                   ev.stopPropagation();
                   ev.preventDefault();
                 }}
               >
                 <KebabToggle />
-              </Button>
+              </div>
             </Popover>
           </CardActions>
         )}

diff --git a/packages/dmn-vscode-extension/package.json b/packages/dmn-vscode-extension/package.json
@@ -41,7 +41,7 @@
     "@kie-tools/vscode-java-code-completion-extension-plugin": "workspace:*",
     "@types/vscode": "1.67.0",
     "@vscode/test-web": "^0.0.30",
-    "@vscode/vsce": "^2.22.0",
+    "@vscode/vsce": "^3.2.1",
     "buffer": "^6.0.3",
     "copy-webpack-plugin": "^11.0.0",
     "process": "^0.11.10",

diff --git a/packages/extended-services-vscode-extension/env/index.js b/packages/extended-services-vscode-extension/env/index.js
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-const { varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
+const { composeEnv, varsWithName } = require("@kie-tools-scripts/build-env");
 
-module.exports = composeEnv([require("@kie-tools/root-env/env")], {
+module.exports = composeEnv([require("@kie-tools/root-env/env"), require("@kie-tools/extended-services-java/env")], {
   vars: varsWithName({}),
   get env() {
     return {};

diff --git a/packages/extended-services-vscode-extension/package.json b/packages/extended-services-vscode-extension/package.json
@@ -41,9 +41,9 @@
     "@kie-tools/tsconfig": "workspace:*",
     "@types/vscode": "1.67.0",
     "@vscode/test-web": "^0.0.30",
-    "@vscode/vsce": "^2.22.0",
+    "@vscode/vsce": "^3.2.1",
     "copy-webpack-plugin": "^11.0.0",
-    "node-fetch": "^3.3.1",
+    "node-fetch": "^3.3.2",
     "rimraf": "^3.0.2",
     "webpack": "^5.94.0",
     "webpack-cli": "^4.10.0",
@@ -73,22 +73,23 @@
     ],
     "configuration": {
       "properties": {
-        "extendedServices.connectionHeartbeatIntervalinSecs": {
-          "default": 1,
+        "extendedServices.connectionHeartbeatIntervalInSecs": {
+          "default": 10,
           "description": "Specifies the interval (in seconds) between each connection check.",
           "format": "time",
+          "minimum": 10,
           "order": 2,
           "type": "integer"
         },
         "extendedServices.enableAutorun": {
           "default": true,
-          "description": "Automatically run a local instance of the service.",
+          "description": "Automatically runs a local instance of the Extended Service.",
           "order": 0,
           "type": "boolean"
         },
         "extendedServices.extendedServicesURL": {
           "default": "http://localhost:21345",
-          "description": "Specifies the Exnteded Services URL.",
+          "description": "Specifies the Extended Services URL.",
           "format": "uri",
           "order": 1,
           "type": "string"

diff --git a/packages/extended-services-vscode-extension/src/Connection.ts b/packages/extended-services-vscode-extension/src/Connection.ts
@@ -28,13 +28,14 @@ export class Connection {
   private timeout: NodeJS.Timeout | null = null;
   private connected: boolean = false;
 
-  public async start(extendedServicesURL: URL, connectionHeartbeatIntervalinSecs: number): Promise<void> {
+  public async start(extendedServicesURL: URL, connectionHeartbeatIntervalInSecs: number): Promise<void> {
     this.timeout = setInterval(async () => {
       this.performHeartbeatCheck(extendedServicesURL);
-    }, connectionHeartbeatIntervalinSecs * 1000);
+    }, connectionHeartbeatIntervalInSecs * 1000);
   }
 
   public stop(): void {
+    console.debug("[Extended Services Extension] Disconnecting from Extended Service");
     if (this.timeout) {
       this.fireDisconnectedEvent();
       clearInterval(this.timeout);

diff --git a/packages/extended-services-vscode-extension/src/LocalExtendedServices.ts b/packages/extended-services-vscode-extension/src/LocalExtendedServices.ts
@@ -80,6 +80,7 @@ export class LocalExtendedServices {
   }
 
   public stop(): void {
+    console.debug("[Extended Services Extension] Stopping local instance of Extended Service");
     if (!this.serviceProcess) {
       return;
     }

diff --git a/packages/extended-services-vscode-extension/src/Validator.ts b/packages/extended-services-vscode-extension/src/Validator.ts
@@ -49,26 +49,28 @@ function createDMNDiagnostics(validationResponses: validationResponse.DMNValidat
   });
 }
 
-export async function validateBPMN(serviceURL: URL, kieFile: kieFile.KieFile): Promise<vscode.Diagnostic[]> {
+export async function validateBPMN(serviceURL: URL, bpmnFile: kieFile.KieFile): Promise<vscode.Diagnostic[]> {
   try {
     const validationResponses: validationResponse.BPMNValidationResponse[] = await validationRequests.validateBPMN(
       serviceURL,
-      kieFile
+      bpmnFile
     );
     return createBPMNDiagnostics(validationResponses);
   } catch (error) {
-    throw new Error("VALIDATE BPMN ERROR - " + error.message);
+    console.error(`An error occured while trying to validate BPMN file: ${bpmnFile} with error: ${error.message}`);
+    throw new Error(`An error occured while trying to validate BPMN file: ${bpmnFile} with error: ${error.message}`);
   }
 }
 
-export async function validateDMN(serviceURL: URL, kieFile: kieFile.KieFile): Promise<vscode.Diagnostic[]> {
+export async function validateDMN(serviceURL: URL, dmnFile: kieFile.KieFile): Promise<vscode.Diagnostic[]> {
   try {
     const validationResponses: validationResponse.DMNValidationResponse[] = await validationRequests.validateDMN(
       serviceURL,
-      kieFile
+      dmnFile
     );
     return createDMNDiagnostics(validationResponses);
   } catch (error) {
-    throw new Error("VALIDATE DMN ERROR - " + error.message);
+    console.error(`An error occured while trying to validate DMN file: ${dmnFile} with error: ${error.message}`);
+    throw new Error(`An error occured while trying to validate DMN file: ${dmnFile} with error: ${error.message}`);
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,7 @@ export class LocalExtendedServices { @@
       }
       public stop(): void {
+        console.debug("[Extended Services Extension] Stopping local instance of Extended Service");
         if (!this.serviceProcess) {
           return;
         }
@@ Expand Down @@