Merge branch 'refs/heads/main' into kie-issues#1694

# Conflicts:
#	packages/extended-services-vscode-extension/src/configurations/Configuration.ts

.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions

@@ -45,7 +45,7 @@ pipeline {
         CHROME_EXTENSION__manifestFile = 'manifest.prod.json'
         CHROME_EXTENSION__onlineEditorUrl = 'https://apache.github.io/incubator-kie-kogito-online'
         SWF_CHROME_EXTENSION__routerTargetOrigin = 'https://apache.github.io'
-        SWF_CHROME_EXTENSION__routerRelativePath = "kogito-online/swf-chrome-extension/${params.RELEASE_VERSION}"
+        SWF_CHROME_EXTENSION__routerRelativePath = "incubator-kie-kogito-online/swf-chrome-extension/${params.RELEASE_VERSION}"
         SWF_CHROME_EXTENSION__manifestFile = 'manifest.prod.json'
 
         RELEASE_ARTIFACTS_DIR = "${WORKSPACE}/release-artifacts"

.github/actions/setup-env/action.yml

@@ -246,6 +246,11 @@ runs:
           libxml2-utils > /dev/null 2>&1
         fi
 
+    - name: "Allow unprivileged user namespace (Ubuntu Only)"
+      if: runner.os == 'Linux'
+      shell: bash
+      run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+
     - name: "Update bash for macOS (macOS Only)"
       shell: bash
       if: runner.os == 'macOS'

.rat-excludes

@@ -1022,8 +1022,6 @@ Base64Util.java
 TimeUnit.java
 # packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/README.eclipse
 README.eclipse
-# packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java
-Generated.java
 # packages/stunner-editors/errai-common/src/main/resources/META-INF/ErraiApp.properties
 ErraiApp.properties
 # packages/stunner-editors/errai-common/src/test/resources/ErraiApp.properties

LICENSE

@@ -663,45 +663,6 @@ for packages/stunner-editors/errai-javax-enterprise/src/main/java/javax/enterpri
 Copyright 2010, Red Hat, Inc., and individual contributors
 Licensed under the Apache License, Version 2.0
 
-----------------------------------------------------------------------------------------------------------------------------------
-for packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java
-
-Copyright (c) 2005-2013 Oracle and/or its affiliates. All rights reserved.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common Development
-and Distribution License("CDDL") (collectively, the "License").  You
-may not use this file except in compliance with the License.  You can
-obtain a copy of the License at
-https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-or packager/legal/LICENSE.txt.  See the License for the specific
-language governing permissions and limitations under the License.
-
-When distributing the software, include this License Header Notice in each
-file and include the License file at packager/legal/LICENSE.txt.
-
-GPL Classpath Exception:
-Oracle designates this particular file as subject to the "Classpath"
-exception as provided by Oracle in the GPL Version 2 section of the License
-file that accompanied this code.
-
-Modifications:
-If applicable, add the following below the License Header, with the fields
-enclosed by brackets [] replaced by your own identifying information:
-"Portions Copyright [year] [name of copyright owner]"
-
-Contributor(s):
-If you wish your version of this file to be governed by only the CDDL or
-only the GPL Version 2, indicate your decision by adding "[Contributor]
-elects to include this software in this distribution under the [CDDL or GPL
-Version 2] license."  If you don't indicate a single choice of license, a
-recipient has the option to distribute your version of this file under
-either the CDDL, the GPL Version 2 or to extend the choice of license to
-its licensees as provided above.  However, if you add GPL Version 2 code
-and therefore, elected the GPL Version 2 license, then the option applies
-only if the new code is made subject to such option by the copyright
-holder.
-
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 for packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/main/resources/org/uberfire/client/views/static/jquery-ui/jquery-ui.min.js
     packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/main/resources/org/uberfire/client/views/static/jquery-ui/jquery-ui.min.css

packages/chrome-extension-pack-kogito-kie-editors/package.json

@@ -44,7 +44,7 @@
     "@types/chrome": "^0.0.193",
     "@types/jest": "^29.5.12",
     "@types/jest-when": "^3.5.5",
-    "@types/selenium-webdriver": "^4.1.20",
+    "@types/selenium-webdriver": "^4.1.27",
     "chai": "^4.3.10",
     "copy-webpack-plugin": "^11.0.0",
     "jest": "^29.7.0",
@@ -53,7 +53,7 @@
     "jest-when": "^3.6.0",
     "process": "^0.11.10",
     "rimraf": "^3.0.2",
-    "selenium-webdriver": "^4.15.0",
+    "selenium-webdriver": "^4.27.0",
     "start-server-and-test": "^2.0.3",
     "ts-jest": "^29.1.5",
     "typescript": "^5.5.3",

packages/chrome-extension-test-helper/package.json

@@ -20,10 +20,10 @@
   "devDependencies": {
     "@kie-tools/tsconfig": "workspace:*",
     "@types/chai": "^4.3.6",
-    "@types/selenium-webdriver": "^4.1.20",
+    "@types/selenium-webdriver": "^4.1.27",
     "chai": "^4.3.10",
     "rimraf": "^3.0.2",
-    "selenium-webdriver": "^4.15.0",
+    "selenium-webdriver": "^4.27.0",
     "typescript": "^5.5.3"
   }
 }

packages/extended-services-java/pom.xml

@@ -33,7 +33,7 @@
   <groupId>org.kie.tools</groupId>
   <artifactId>extended-services-java</artifactId>
 
-  <name>KIE Tools :: KIE Sandbox :: Extended Services Quarkus app</name>
+  <name>KIE Tools :: Extended Services Quarkus app</name>
   <description
   >Quarkus-based application that wraps Kogito JIT Executor for consumption as a KIE Sandbox backend.</description>
 

packages/extended-services-vscode-extension/package.json

@@ -53,7 +53,7 @@
   "engines": {
     "vscode": "^1.67.0"
   },
-  "displayName": "Apache KIE Extended Services",
+  "displayName": "Apache KIE™ Extended Services",
   "categories": [
     "Other"
   ],
@@ -62,13 +62,13 @@
       {
         "category": "Extended-Services",
         "command": "extended-services-vscode-extension.startExtendedServices",
-        "title": "Connect Apache KIE Extended-Services",
+        "title": "Connect Apache KIE™ Extended Services",
         "when": "extended-services-vscode-extension.connected"
       },
       {
         "category": "Extended-Services",
         "command": "extended-services-vscode-extension.stopExtendedServices",
-        "title": "Disconnect Apache KIE Extended-Services"
+        "title": "Disconnect Apache KIE™ Extended Services"
       }
     ],
     "configuration": {
@@ -95,22 +95,22 @@
           "type": "string"
         }
       },
-      "title": "Apache KIE Extended Services"
+      "title": "Apache KIE™ Extended Services"
     },
     "icons": {
       "extended-services-connected": {
         "default": {
           "fontCharacter": "\\E000",
           "fontPath": "./static/extended-services-font.woff"
         },
-        "description": "Connected to the Apache KIE Extended-Services"
+        "description": "Connected to the Apache KIE™ Extended Services"
       },
       "extended-services-disconnected": {
         "default": {
           "fontCharacter": "\\E001",
           "fontPath": "./static/extended-services-font.woff"
         },
-        "description": "Apache KIE Extended-Services are Disconnected"
+        "description": "Apache KIE™ Extended Services are Disconnected"
       }
     },
     "languages": [

packages/extended-services-vscode-extension/src/Validator.ts

@@ -22,7 +22,7 @@ import * as validationRequests from "./requests/ValidationRequests";
 import * as validationResponse from "./requests/ValidationResponse";
 import * as vscode from "vscode";
 
-const source: string = "Apache KIE Extended Services";
+const source: string = "Apache KIE™ Extended Services";
 
 function createBPMNDiagnostics(validationResponses: validationResponse.BPMNValidationResponse[]): vscode.Diagnostic[] {
   return validationResponses.map((validationResponse) => {

packages/extended-services-vscode-extension/src/configurations/Configuration.ts

@@ -41,7 +41,7 @@ function fetchExtendedServicesURL(): URL {
   try {
     return new URL(extendedServicesURL);
   } catch (error) {
-    throw new Error("The provided Extended Services URL " + extendedServicesURL + " is invalid: " + error.message);
+    throw new Error("URL configuration " + extendedServicesURL + " is invalid: " + error.message);
   }
 }
 

packages/extended-services-vscode-extension/src/extension/extension-browser.ts

@@ -62,7 +62,7 @@ function initializeVSCodeElements() {
 
   statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 100);
   statusBarItem.text = "$(extended-services-disconnected)";
-  statusBarItem.tooltip = "Apache KIE Extended Services are not connected. \n" + "Click to connect.";
+  statusBarItem.tooltip = "Apache KIE™ Extended Services is not connected. \n" + "Click to connect.";
   statusBarItem.command = startExtendedServicesCommandUID;
   statusBarItem.hide();
 
@@ -193,7 +193,7 @@ export function activate(context: vscode.ExtensionContext) {
     if (configuration) {
       validate(configuration.extendedServicesURL);
       statusBarItem.text = "$(extended-services-connected)";
-      statusBarItem.tooltip = "Apache KIE Extended Services are connected. Click to disconnect.";
+      statusBarItem.tooltip = "Apache KIE™ Extended Services is connected. Click to disconnect.";
       statusBarItem.command = stopExtendedServicesCommandUID;
     }
   });
@@ -211,7 +211,7 @@ export function activate(context: vscode.ExtensionContext) {
     isConnected = false;
     vscode.commands.executeCommand("setContext", connectedEnablementUID, false);
     statusBarItem.text = "$(extended-services-disconnected)";
-    statusBarItem.tooltip = "Apache KIE Extended Services are not connected. Click to connect.";
+    statusBarItem.tooltip = "Apache KIE™ Extended Services is not connected. Click to connect.";
     statusBarItem.command = startExtendedServicesCommandUID;
     diagnosticCollection.clear();
   });

packages/extended-services-vscode-extension/src/extension/extension-main.ts

@@ -251,7 +251,7 @@ export function activate(context: vscode.ExtensionContext) {
     if (configuration) {
       validate(configuration.extendedServicesURL);
       statusBarItem.text = "$(extended-services-connected)";
-      statusBarItem.tooltip = "Apache KIE Extended Services are connected. Click to disconnect.";
+      statusBarItem.tooltip = "Apache KIE™ Extended Services are connected. Click to disconnect.";
       statusBarItem.command = stopExtendedServicesCommandUID;
     }
   });
@@ -269,7 +269,7 @@ export function activate(context: vscode.ExtensionContext) {
     isConnected = false;
     vscode.commands.executeCommand("setContext", connectedEnablementUID, false);
     statusBarItem.text = "$(extended-services-disconnected)";
-    statusBarItem.tooltip = "Apache KIE Extended Services are not connected. Click to connect.";
+    statusBarItem.tooltip = "Apache KIE™ Extended Services are not connected. Click to connect.";
     statusBarItem.command = startExtendedServicesCommandUID;
     diagnosticCollection.clear();
   });

packages/form-code-generator-vscode-command/src/generateFormCodeCommand.ts

@@ -28,7 +28,7 @@ import { FormSchema } from "@kie-tools/form-code-generator/dist/types";
 import { PATTERNFLY_FILE_EXT } from "@kie-tools/form-code-generator-patternfly-theme/dist/theme";
 import { BOOTSTRAP4_FILE_EXT } from "@kie-tools/form-code-generator-bootstrap4-theme/dist/theme";
 
-const FORM_CODE_GENERATION_DEST_PATH = "src/main/resources/forms";
+const FORM_CODE_GENERATION_DEST_PATH = "src/main/resources/custom-forms-dev";
 const JSON_SCHEMA_PATH = "target/classes/META-INF/jsonSchema";
 
 export async function generateFormsCommand() {

packages/jbpm-quarkus-devui/jbpm-quarkus-devui-runtime/src/main/java/org/jbpm/quarkus/devui/runtime/forms/impl/FormsStorageImpl.java

@@ -60,7 +60,7 @@ public class FormsStorageImpl implements FormsStorage {
 
     private static final String CONFIG_EXT = ".config";
 
-    private static final String FORMS_STORAGE_PATH = "/forms";
+    private static final String FORMS_STORAGE_PATH = "/custom-forms-dev";
 
     private static final String JAR_FORMS_STORAGE_PATH = "/target/classes" + FORMS_STORAGE_PATH;
     private static final String FS_FORMS_STORAGE_PATH = "/src/main/resources" + FORMS_STORAGE_PATH;

packages/jbpm-quarkus-devui/jbpm-quarkus-devui-runtime/src/test/java/org/jbpm/quarkus/devui/runtime/forms/impl/FormsStorageImplTest.java

@@ -65,7 +65,7 @@ public void init() throws IOException {
         storage.mkdir();
         System.setProperty(PROJECT_FORM_STORAGE_PROP, storage.getAbsolutePath());
 
-        URL formsFolder = Thread.currentThread().getContextClassLoader().getResource("forms");
+        URL formsFolder = Thread.currentThread().getContextClassLoader().getResource("custom-forms-dev");
 
         formsStorage = new FormsStorageImpl(formsFolder);
     }

packages/runtime-tools-process-dev-ui-webapp/server/MockData/controllers.js

@@ -362,11 +362,14 @@ module.exports = controller = {
     }
     let sourceString;
 
-    const configString = fs.readFileSync(path.join(`${__dirname}/forms/examples/${formName}.config`), "utf8");
+    const configString = fs.readFileSync(
+      path.join(`${__dirname}/custom-forms-dev/examples/${formName}.config`),
+      "utf8"
+    );
     if (formInfo[0].type.toLowerCase() === "html") {
-      sourceString = fs.readFileSync(path.join(`${__dirname}/forms/examples/${formName}.html`), "utf8");
+      sourceString = fs.readFileSync(path.join(`${__dirname}/custom-forms-dev/examples/${formName}.html`), "utf8");
     } else if (formInfo[0].type.toLowerCase() === "tsx") {
-      sourceString = fs.readFileSync(path.join(`${__dirname}/forms/examples/${formName}.tsx`), "utf8");
+      sourceString = fs.readFileSync(path.join(`${__dirname}/custom-forms-dev/examples/${formName}.tsx`), "utf8");
     }
     const response = {
       formInfo: formInfo[0],

packages/serverless-workflow-vscode-extension/package.json

@@ -61,7 +61,7 @@
     "@types/chai": "^4.3.6",
     "@types/fs-extra": "^11.0.1",
     "@types/mocha": "^10.0.7",
-    "@types/selenium-webdriver": "^4.1.20",
+    "@types/selenium-webdriver": "^4.1.27",
     "@types/vscode": "1.67.0",
     "@vscode/test-electron": "^2.3.6",
     "@vscode/test-web": "^0.0.30",
@@ -77,7 +77,7 @@
     "process": "^0.11.10",
     "rimraf": "^3.0.2",
     "sanitize-filename-ts": "^1.0.2",
-    "selenium-webdriver": "^4.15.0",
+    "selenium-webdriver": "^4.27.0",
     "typescript": "^5.5.3",
     "vscode-extension-tester": "^8.8.0",
     "webpack": "^5.94.0",
@@ -88,7 +88,7 @@
   "engines": {
     "vscode": "^1.67.0"
   },
-  "displayName": "KIE Serverless Workflow Editor",
+  "displayName": "Apache KIE™ Serverless Workflow Editor",
   "categories": [
     "Other"
   ],

packages/sonataflow-operator/Makefile

@@ -64,13 +64,15 @@ BUILDER ?= docker
 # USE_IMAGE_DIGESTS defines if images are resolved via tags or digests
 # You can enable this value if you would like to use SHA Based Digests
 # To enable set flag to true
+IMG_TAG_SEP = :
 USE_IMAGE_DIGESTS ?= false
 ifeq ($(USE_IMAGE_DIGESTS), true)
 	BUNDLE_GEN_FLAGS += --use-image-digests
+	IMG_TAG_SEP = @
 endif
 
 # Image URL to use all building/pushing image targets
-IMG ?= $(IMAGE_TAG_BASE):$(IMAGE_TAG)
+IMG ?= $(IMAGE_TAG_BASE)$(IMG_TAG_SEP)$(IMAGE_TAG)
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.26
 

packages/sonataflow-operator/internal/controller/platform/services/properties_services_test.go

@@ -104,6 +104,7 @@ func generateJobServiceDeploymentDevProperties() *properties.Properties {
 	p.Set("quarkus.http.port", "8080")
 	p.Set("quarkus.kogito.devservices.enabled", "false")
 	p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`, "false")
+	p.Set(`quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`, "false")
 	p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled`, "true")
 	p.Set("kogito.jobs-service.management.leader-check.expiration-in-seconds", "60")
 	p.Sort()
@@ -130,6 +131,7 @@ func generateJobServiceDeploymentWithPostgreSQLProperties() *properties.Properti
 	p.Set("quarkus.http.port", "8080")
 	p.Set("quarkus.kogito.devservices.enabled", "false")
 	p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`, "false")
+	p.Set(`quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`, "false")
 	p.Set("quarkus.datasource.reactive.url", "postgresql://postgres:5432/sonataflow?search_path=myschema")
 	p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled`, "true")
 	p.Set("kogito.jobs-service.management.leader-check.expiration-in-seconds", "60")
@@ -147,6 +149,7 @@ func generateJobServiceDeploymentWithDataIndexAndEphemeralProperties() *properti
 	p.Set("quarkus.http.port", "8080")
 	p.Set("quarkus.kogito.devservices.enabled", "false")
 	p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`, "false")
+	p.Set(`quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`, "false")
 	p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled`, "true")
 	p.Set("kogito.jobs-service.management.leader-check.expiration-in-seconds", "60")
 	p.Sort()
@@ -163,6 +166,7 @@ func generateJobServiceDeploymentWithDataIndexAndPostgreSQLProperties() *propert
 	p.Set("quarkus.http.port", "8080")
 	p.Set("quarkus.kogito.devservices.enabled", "false")
 	p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`, "false")
+	p.Set(`quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`, "false")
 	p.Set("quarkus.datasource.reactive.url", "postgresql://postgres:5432/sonataflow?search_path=myschema")
 	p.Set(`quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled`, "true")
 	p.Set("kogito.jobs-service.management.leader-check.expiration-in-seconds", "60")

packages/sonataflow-operator/internal/controller/profiles/common/constants/platform_services.go

@@ -67,7 +67,7 @@ const (
 	KogitoServiceURLProperty                       = "kogito.service.url"
 	KogitoServiceURLProtocol                       = "http"
 	DataIndexKafkaSmallRyeHealthProperty           = `quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`
-	JobServiceKafkaSmallRyeHealthProperty          = `quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`
+	JobServiceKafkaSmallRyeHealthProperty          = `quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`
 	JobServiceLeaderLivenessSmallRyeHealthProperty = `quarkus.smallrye-health.check."org.kie.kogito.jobs.service.management.JobServiceLeaderLivenessHealthCheck".enabled`
 	DataIndexKafkaHealthCheck                      = `quarkus.smallrye-health.check."io.quarkus.kafka.client.health.KafkaHealthCheck".enabled`
 	JobServiceKSinkInjectionHealthCheck            = `quarkus.smallrye-health.check."org.kie.kogito.jobs.service.messaging.http.health.knative.KSinkInjectionHealthCheck".enabled`