From e16e8382347757db2405b6226916ed4a82eddd60 Mon Sep 17 00:00:00 2001 From: Walter Medvedeo Date: Mon, 11 Mar 2024 11:42:30 +0100 Subject: [PATCH 01/15] kie-kogito-runtimes-3388: Improve serverless workflows timeouts duration validation message (#3433) * kie-kogito-runtimes-3388: Improve serverless workflows timeouts duration validation message * Formatting fixes in classes not related to this PR --- .../serverless/workflow/utils/TimeoutsConfigResolver.java | 5 ++++- .../quarkus/common/deployment/KogitoAssetsProcessor.java | 2 +- .../quarkus/common/deployment/KogitoAssetsProcessorTest.java | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-builder/src/main/java/org/kie/kogito/serverless/workflow/utils/TimeoutsConfigResolver.java b/kogito-serverless-workflow/kogito-serverless-workflow-builder/src/main/java/org/kie/kogito/serverless/workflow/utils/TimeoutsConfigResolver.java index 7a8bcb52a21..1e94b74510d 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-builder/src/main/java/org/kie/kogito/serverless/workflow/utils/TimeoutsConfigResolver.java +++ b/kogito-serverless-workflow/kogito-serverless-workflow-builder/src/main/java/org/kie/kogito/serverless/workflow/utils/TimeoutsConfigResolver.java @@ -30,7 +30,10 @@ public class TimeoutsConfigResolver { private static final String NON_NEGATIVE_DURATION_MUST_BE_PROVIDED = - "When configured, it must be set with a greater than zero ISO 8601 time duration. For example PT30S. Or a valid expression, for example $CONST.myDuration, where 'myDuration' is defined in the constant section of the workflow"; + "When configured, it must be set with a greater than zero ISO 8601 time duration. For example PT30S." + + " Or a valid expression, for example $CONST.myDuration, where 'myDuration' is defined in the constant section of the workflow." + + " Note: month based durations like P2M (period of two months) are not valid since the month duration might vary." + + " In that case you can use PT60D instead."; private static final String INVALID_EVENT_TIMEOUT_FOR_STATE_ERROR = "An invalid \"eventTimeout\": \"%s\" configuration was provided for the state \"%s\" in the serverless workflow: \"%s\"." + NON_NEGATIVE_DURATION_MUST_BE_PROVIDED; diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java index 02a70d08d84..ab63a083fdb 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java @@ -107,7 +107,7 @@ public class KogitoAssetsProcessor { @BuildStep public KogitoBuildContextBuildItem generateKogitoBuildContext(List attributes) { // configure the application generator - PathCollection rootPaths = getRootPaths( root.getResolvedPaths()); + PathCollection rootPaths = getRootPaths(root.getResolvedPaths()); KogitoBuildContext context = kogitoBuildContext(outputTargetBuildItem.getOutputDirectory(), rootPaths, diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/test/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessorTest.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/test/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessorTest.java index 1adeac2ce64..9220b7d2c61 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/test/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessorTest.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/test/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessorTest.java @@ -4,9 +4,10 @@ import java.nio.file.Path; import java.util.Arrays; +import org.junit.jupiter.api.Test; + import io.quarkus.bootstrap.model.PathsCollection; import io.quarkus.paths.PathCollection; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,4 +44,4 @@ void getRootPathsWithClasses() { String expectedPath = String.format("%s/%s/generated-resources", projectDirPath, outputTargetPath).replace("/", File.separator); assertTrue(retrieved.contains(Path.of(expectedPath))); } -} \ No newline at end of file +} From aaa628e44bfa8c63424c0b3b20fb679a87fe0e98 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:20:56 +0100 Subject: [PATCH 02/15] [Fix #3390] Do not create container instance, search it (#3432) --- .../org/jbpm/workflow/instance/NodeInstanceContainer.java | 8 +++++++- .../org/kie/kogito/quarkus/workflows/RetriggerIT.java | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/NodeInstanceContainer.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/NodeInstanceContainer.java index ac573322705..471b6a6ff76 100755 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/NodeInstanceContainer.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/NodeInstanceContainer.java @@ -23,6 +23,7 @@ import org.jbpm.workflow.core.node.AsyncEventNode; import org.kie.api.definition.process.Node; import org.kie.api.definition.process.NodeContainer; +import org.kie.kogito.internal.process.runtime.KogitoNodeInstance; import org.kie.kogito.internal.process.runtime.KogitoNodeInstanceContainer; import static org.jbpm.ruleflow.core.Metadata.CUSTOM_ASYNC; @@ -64,7 +65,12 @@ default NodeInstance getByNodeDefinitionId(final String nodeDefinitionId, NodeCo if (nodeDefinitionId.equals(node.getMetaData().get(UNIQUE_ID))) { if (nodeContainer instanceof Node) { - return ((NodeInstanceContainer) getNodeInstance((Node) nodeContainer)).getNodeInstance(node); + Collection nodeInstances = getKogitoNodeInstances(ni -> ni.getNode().getId() == (((Node) nodeContainer).getId()), true); + if (nodeInstances.isEmpty()) { + return ((NodeInstanceContainer) getNodeInstance((Node) nodeContainer)).getNodeInstance(node); + } else { + return ((NodeInstanceContainer) nodeInstances.iterator().next()).getNodeInstance(node); + } } else { return getNodeInstance(node); } diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/RetriggerIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/RetriggerIT.java index db4fad71f2d..749c40c49d7 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/RetriggerIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/RetriggerIT.java @@ -53,6 +53,12 @@ void testRetrigger() { .accept(ContentType.JSON).when() .post("/management/processes/division/instances/{id}/retrigger", id) .then().statusCode(200).body("workflowdata.response", is(2)); + + given() + .contentType(ContentType.JSON) + .accept(ContentType.JSON).when() + .get("/division/{id}", id) + .then().statusCode(404); } } From 1fdf11aecaa5a34cdce1e661c4152097714a67b5 Mon Sep 17 00:00:00 2001 From: Gabriele Cardosi Date: Mon, 11 Mar 2024 14:42:16 +0100 Subject: [PATCH 03/15] [incubator-kie-issues#1003] Fix missing header (#3435) * [[incubator-kie-issues#1003]] Fix missing header * [incubator-kie-issues#1003] Fix formatting --------- Co-authored-by: Gabriele-Cardosi --- .../deployment/KogitoAssetsProcessorTest.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/test/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessorTest.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/test/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessorTest.java index 9220b7d2c61..f641e28af93 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/test/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessorTest.java +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/test/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessorTest.java @@ -1,3 +1,21 @@ +/* + * 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. + */ package org.kie.kogito.quarkus.common.deployment; import java.io.File; From 98c8b7c4d927b20f83b11234ce3b57ea7424830f Mon Sep 17 00:00:00 2001 From: jstastny-cz Date: Tue, 12 Mar 2024 10:56:05 +0100 Subject: [PATCH 04/15] incubator-kie-kogito-runtimes#3438: check if resources folder path exists --- .../deployment/KogitoAddOnSourceFilesProcessor.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/quarkus/addons/source-files/deployment/src/main/java/org/kie/kogito/addon/source/files/deployment/KogitoAddOnSourceFilesProcessor.java b/quarkus/addons/source-files/deployment/src/main/java/org/kie/kogito/addon/source/files/deployment/KogitoAddOnSourceFilesProcessor.java index e3641df6ae1..8ab5587f562 100644 --- a/quarkus/addons/source-files/deployment/src/main/java/org/kie/kogito/addon/source/files/deployment/KogitoAddOnSourceFilesProcessor.java +++ b/quarkus/addons/source-files/deployment/src/main/java/org/kie/kogito/addon/source/files/deployment/KogitoAddOnSourceFilesProcessor.java @@ -87,11 +87,13 @@ private List getSourceFiles(File[] resourcePaths) throws IOException { for (File resourceFile : resourcePaths) { Path resourcePath = resourceFile.toPath(); - try (Stream walkedPaths = Files.walk(resourcePath)) { - walkedPaths.filter(this::isSourceFile) - .map(resourcePath::relativize) - .map(Path::toString) - .forEach(sourceFiles::add); + if (Files.exists(resourcePath)) { + try (Stream walkedPaths = Files.walk(resourcePath)) { + walkedPaths.filter(this::isSourceFile) + .map(resourcePath::relativize) + .map(Path::toString) + .forEach(sourceFiles::add); + } } } From 7c6b3de8b587bde7c5873432eca6e5c7b381e8d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Tue, 12 Mar 2024 15:34:34 +0100 Subject: [PATCH 05/15] incubator-kie-issues#933: Rename `SonataFlow` Quarkus Extensions in `kogito-runtimes` (#3430) * incubator-kie-issues#933: Rename `SonataFlow` Quarkus Extensions in `kogito-runtimes` * change groupId to `org.apache.kie.sonataflow` * Improving `KogitoCapability` verifications to include new extension GAV's --- kogito-bom/pom.xml | 52 +++++++++---------- quarkus/addons/camel/deployment/pom.xml | 18 +++---- .../KogitoAddonsQuarkusCamelProcessor.java | 2 +- .../addons/camel/integration-tests/pom.xml | 26 +++++----- quarkus/addons/camel/pom.xml | 8 +-- quarkus/addons/camel/runtime/pom.xml | 16 +++--- .../AnyEngineKogitoAddOnProcessor.java | 4 +- .../common/deployment/KogitoCapability.java | 18 +++---- .../deployment/KogitoCapabilityExtension.java | 38 ++++++++++++++ .../OneOfCapabilityKogitoAddOnProcessor.java | 4 +- ...RequireCapabilityKogitoAddOnProcessor.java | 4 +- .../eventing/integration-tests/pom.xml | 8 +-- .../knative/serving/integration-tests/pom.xml | 8 +-- .../kubernetes/integration-tests/pom.xml | 4 +- .../messaging/integration-tests/pom.xml | 8 +-- .../integration-tests/pom.xml | 8 +-- .../integration-tests/pom.xml | 8 +-- quarkus/addons/python/deployment/pom.xml | 12 ++--- .../PythonAddonCapabilityProcessor.java | 2 +- .../addons/python/integration-tests/pom.xml | 20 +++---- quarkus/addons/python/pom.xml | 6 +-- quarkus/addons/python/runtime/pom.xml | 8 +-- .../pom.xml | 12 ++--- .../pom.xml | 16 +++--- .../pom.xml | 16 +++--- .../pom.xml | 16 +++--- .../ServerlessWorkflowCodestartTest.java | 2 +- .../pom.xml | 12 ++--- .../base/README.tpl.qute.md | 0 .../META-INF/resources/index.entry.qute.html | 0 .../base/src/main/resources/greet.sw.json | 0 .../codestart.yml | 10 ++-- .../src/test/java/org/acme/GreetTest.java | 0 .../java/src/test/resources/application.yml | 0 .../resources/META-INF/quarkus-extension.yaml | 6 +-- .../pom.xml | 5 +- .../pom.xml | 10 ++-- .../pom.xml | 8 +-- .../META-INF/archetype-post-generate.groovy | 2 +- 39 files changed, 218 insertions(+), 179 deletions(-) create mode 100644 quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapabilityExtension.java rename quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/{kogito-serverless-workflow-codestart => sonataflow-quarkus-codestart}/base/README.tpl.qute.md (100%) rename quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/{kogito-serverless-workflow-codestart => sonataflow-quarkus-codestart}/base/src/main/resources/META-INF/resources/index.entry.qute.html (100%) rename quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/{kogito-serverless-workflow-codestart => sonataflow-quarkus-codestart}/base/src/main/resources/greet.sw.json (100%) rename quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/{kogito-serverless-workflow-codestart => sonataflow-quarkus-codestart}/codestart.yml (59%) rename quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/{kogito-serverless-workflow-codestart => sonataflow-quarkus-codestart}/java/src/test/java/org/acme/GreetTest.java (100%) rename quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/{kogito-serverless-workflow-codestart => sonataflow-quarkus-codestart}/java/src/test/resources/application.yml (100%) diff --git a/kogito-bom/pom.xml b/kogito-bom/pom.xml index 8301f6c4019..1cf4e60c3e8 100755 --- a/kogito-bom/pom.xml +++ b/kogito-bom/pom.xml @@ -269,24 +269,24 @@ sources - org.kie.kogito - kogito-addons-quarkus-camel + org.apache.kie.sonataflow + sonataflow-addons-quarkus-camel ${project.version} - org.kie.kogito - kogito-addons-quarkus-camel + org.apache.kie.sonataflow + sonataflow-addons-quarkus-camel ${project.version} sources - org.kie.kogito - kogito-addons-quarkus-camel-deployment + org.apache.kie.sonataflow + sonataflow-addons-quarkus-camel-deployment ${project.version} - org.kie.kogito - kogito-addons-quarkus-camel-deployment + org.apache.kie.sonataflow + sonataflow-addons-quarkus-camel-deployment ${project.version} sources @@ -1992,24 +1992,24 @@ sources - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python ${project.version} - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python ${project.version} sources - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python-deployment + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python-deployment ${project.version} - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python-deployment + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python-deployment ${project.version} sources @@ -2247,19 +2247,19 @@ ${project.version} - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus ${project.version} - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus ${project.version} sources - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} @@ -2314,23 +2314,23 @@ sources - org.kie.kogito + org.apache.kie.sonataflow sonataflow-quarkus-devui ${project.version} - org.kie.kogito + org.apache.kie.sonataflow sonataflow-quarkus-devui ${project.version} sources - org.kie.kogito + org.apache.kie.sonataflow sonataflow-quarkus-devui-deployment ${project.version} - org.kie.kogito + org.apache.kie.sonataflow sonataflow-quarkus-devui-deployment ${project.version} sources diff --git a/quarkus/addons/camel/deployment/pom.xml b/quarkus/addons/camel/deployment/pom.xml index 1afe2d820a7..a613ae06df0 100644 --- a/quarkus/addons/camel/deployment/pom.xml +++ b/quarkus/addons/camel/deployment/pom.xml @@ -23,8 +23,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-addons-quarkus-camel-parent - org.kie.kogito + sonataflow-addons-quarkus-camel-parent + org.apache.kie.sonataflow 999-SNAPSHOT 4.0.0 @@ -33,21 +33,21 @@ org.kie.kogito.addons.quarkus.camel.deployment - Kogito :: Add-Ons :: Quarkus :: Camel :: Deployment - Kogito Quarkus Camel Integration with Serverless Workflow - kogito-addons-quarkus-camel-deployment + SonataFlow :: Add-Ons :: Quarkus :: Camel :: Deployment + SonataFlow Quarkus Camel Integration with Serverless Workflow + sonataflow-addons-quarkus-camel-deployment io.quarkus quarkus-arc-deployment - org.kie.kogito - kogito-addons-quarkus-camel + org.apache.kie.sonataflow + sonataflow-addons-quarkus-camel - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment org.apache.camel.quarkus diff --git a/quarkus/addons/camel/deployment/src/main/java/org/kie/kogito/addons/quarkus/camel/deployment/KogitoAddonsQuarkusCamelProcessor.java b/quarkus/addons/camel/deployment/src/main/java/org/kie/kogito/addons/quarkus/camel/deployment/KogitoAddonsQuarkusCamelProcessor.java index 3140eba93ea..2a632b2519b 100644 --- a/quarkus/addons/camel/deployment/src/main/java/org/kie/kogito/addons/quarkus/camel/deployment/KogitoAddonsQuarkusCamelProcessor.java +++ b/quarkus/addons/camel/deployment/src/main/java/org/kie/kogito/addons/quarkus/camel/deployment/KogitoAddonsQuarkusCamelProcessor.java @@ -26,7 +26,7 @@ public class KogitoAddonsQuarkusCamelProcessor extends RequireCapabilityKogitoAddOnProcessor { - private static final String FEATURE = "kogito-addons-quarkus-camel"; + private static final String FEATURE = "sonataflow-addons-quarkus-camel"; public KogitoAddonsQuarkusCamelProcessor() { super(KogitoCapability.SERVERLESS_WORKFLOW); diff --git a/quarkus/addons/camel/integration-tests/pom.xml b/quarkus/addons/camel/integration-tests/pom.xml index 5ab376bb8bd..ea873dc7691 100644 --- a/quarkus/addons/camel/integration-tests/pom.xml +++ b/quarkus/addons/camel/integration-tests/pom.xml @@ -23,16 +23,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-addons-quarkus-camel-parent - org.kie.kogito + sonataflow-addons-quarkus-camel-parent + org.apache.kie.sonataflow 999-SNAPSHOT 4.0.0 - Kogito :: Add-Ons :: Quarkus :: Camel :: Integration Tests - Kogito Quarkus Camel Integration with Serverless Workflow - kogito-addons-quarkus-camel-integration-tests + SonataFlow :: Add-Ons :: Quarkus :: Camel :: Integration Tests + SonataFlow Quarkus Camel Integration with Serverless Workflow + sonataflow-addons-quarkus-camel-integration-tests org.kie.kogito.addons.quarkus.camel.integration.test @@ -40,12 +40,12 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus - org.kie.kogito - kogito-addons-quarkus-camel + org.apache.kie.sonataflow + sonataflow-addons-quarkus-camel io.quarkus @@ -83,8 +83,8 @@ - org.kie.kogito - kogito-addons-quarkus-camel-deployment + org.apache.kie.sonataflow + sonataflow-addons-quarkus-camel-deployment ${project.version} pom test @@ -96,8 +96,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/quarkus/addons/camel/pom.xml b/quarkus/addons/camel/pom.xml index 7097935411f..c0be5663e06 100644 --- a/quarkus/addons/camel/pom.xml +++ b/quarkus/addons/camel/pom.xml @@ -29,10 +29,10 @@ 4.0.0 - org.kie.kogito - kogito-addons-quarkus-camel-parent - Kogito :: Add-Ons :: Quarkus :: Camel :: Parent - Kogito Quarkus Camel Integration with Serverless Workflow + org.apache.kie.sonataflow + sonataflow-addons-quarkus-camel-parent + SonataFlow :: Add-Ons :: Quarkus :: Camel :: Parent + SonataFlow Quarkus Camel Integration with Serverless Workflow deployment runtime diff --git a/quarkus/addons/camel/runtime/pom.xml b/quarkus/addons/camel/runtime/pom.xml index 26cd079fbb7..a68826951ba 100644 --- a/quarkus/addons/camel/runtime/pom.xml +++ b/quarkus/addons/camel/runtime/pom.xml @@ -23,15 +23,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-addons-quarkus-camel-parent - org.kie.kogito + sonataflow-addons-quarkus-camel-parent + org.apache.kie.sonataflow 999-SNAPSHOT 4.0.0 - Kogito :: Add-Ons :: Quarkus :: Camel :: Runtimes - Kogito Quarkus Camel Integration with Serverless Workflow - kogito-addons-quarkus-camel + SonataFlow :: Add-Ons :: Quarkus :: Camel :: Runtimes + SonataFlow Quarkus Camel Integration with Serverless Workflow + sonataflow-addons-quarkus-camel org.kie.kogito.addons.quarkus.camel.runtime @@ -40,8 +40,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus org.apache.camel.quarkus @@ -74,7 +74,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.sonataflow.addons.camel + org.apache.kie.sonataflow.addons.camel diff --git a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/AnyEngineKogitoAddOnProcessor.java b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/AnyEngineKogitoAddOnProcessor.java index cb6edd77194..5f0b91a08ce 100644 --- a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/AnyEngineKogitoAddOnProcessor.java +++ b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/AnyEngineKogitoAddOnProcessor.java @@ -52,9 +52,9 @@ private IllegalStateException exceptionForEngineNotPresent() { KogitoCapability.ENGINES.forEach(c -> { sb.append("\t - ").append(c.getCapability()).append("\n"); sb.append("\t\t offered by the artifact ") - .append(KogitoCapability.KOGITO_GROUP_ID) + .append(c.getOfferedBy().getGroupId()) .append(":") - .append(c.getOfferedBy()) + .append(c.getOfferedBy().getArtifactId()) .append("\n"); }); sb.append("Add one of the above artifacts in your project's pom.xml file"); diff --git a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java index 04fc92c3dd1..e656262b172 100644 --- a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java +++ b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java @@ -27,12 +27,12 @@ */ public final class KogitoCapability { - public static final String KOGITO_GROUP_ID = "org.kie.kogito"; - public static final KogitoCapability DECISIONS = new KogitoCapability("org.drools.decisions", "drools-quarkus-decisions"); - public static final KogitoCapability PROCESSES = new KogitoCapability("org.jbpm.processes", "jbpm-quarkus"); - public static final KogitoCapability PREDICTIONS = new KogitoCapability("org.kie.predictions", "kie-quarkus-predictions"); - public static final KogitoCapability RULES = new KogitoCapability("org.drools.rules", "drools-quarkus-rules"); - public static final KogitoCapability SERVERLESS_WORKFLOW = new KogitoCapability("org.sonataflow.serverless-workflow", "kogito-quarkus-serverless-workflow"); + public static final KogitoCapability DECISIONS = new KogitoCapability("org.drools.decisions", new KogitoCapabilityExtension("org.drools", "drools-quarkus-decisions")); + public static final KogitoCapability PROCESSES = new KogitoCapability("org.jbpm.processes", new KogitoCapabilityExtension("org.jbpm", "jbpm-quarkus")); + public static final KogitoCapability PREDICTIONS = new KogitoCapability("org.kie.predictions", new KogitoCapabilityExtension("org.kie", "kie-quarkus-predictions")); + public static final KogitoCapability RULES = new KogitoCapability("org.drools.rules", new KogitoCapabilityExtension("org.drools", "drools-quarkus-rules")); + public static final KogitoCapability SERVERLESS_WORKFLOW = + new KogitoCapability("org.apache.kie.sonataflow.serverless-workflow", new KogitoCapabilityExtension("org.apache.kie.sonataflow", "sonataflow-quarkus")); public static final List ENGINES = asList( KogitoCapability.DECISIONS, @@ -42,9 +42,9 @@ public final class KogitoCapability { KogitoCapability.SERVERLESS_WORKFLOW); private final String capability; - private final String offeredBy; + private final KogitoCapabilityExtension offeredBy; - public KogitoCapability(final String capability, final String offeredBy) { + public KogitoCapability(final String capability, final KogitoCapabilityExtension offeredBy) { this.capability = capability; this.offeredBy = offeredBy; } @@ -53,7 +53,7 @@ public String getCapability() { return capability; } - public String getOfferedBy() { + public KogitoCapabilityExtension getOfferedBy() { return offeredBy; } } diff --git a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapabilityExtension.java b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapabilityExtension.java new file mode 100644 index 00000000000..f47c0723f8c --- /dev/null +++ b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapabilityExtension.java @@ -0,0 +1,38 @@ +/* + * 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. + */ +package org.kie.kogito.quarkus.addons.common.deployment; + +public class KogitoCapabilityExtension { + + private String groupId; + private String artifactId; + + public KogitoCapabilityExtension(String groupId, String artifactId) { + this.groupId = groupId; + this.artifactId = artifactId; + } + + public String getGroupId() { + return groupId; + } + + public String getArtifactId() { + return artifactId; + } +} diff --git a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/OneOfCapabilityKogitoAddOnProcessor.java b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/OneOfCapabilityKogitoAddOnProcessor.java index 3f4948d62f6..d1ff621e93d 100644 --- a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/OneOfCapabilityKogitoAddOnProcessor.java +++ b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/OneOfCapabilityKogitoAddOnProcessor.java @@ -82,9 +82,9 @@ private IllegalStateException exceptionForRequiredCapabilities(List { sb.append("\t - ").append(c.getCapability()).append("\n"); sb.append("\t\t offered by the artifact ") - .append(KogitoCapability.KOGITO_GROUP_ID) + .append(c.getOfferedBy().getGroupId()) .append(":") - .append(c.getOfferedBy()) + .append(c.getOfferedBy().getArtifactId()) .append("\n"); }); sb.append("Add the above artifacts in your project's pom.xml file"); diff --git a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/RequireCapabilityKogitoAddOnProcessor.java b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/RequireCapabilityKogitoAddOnProcessor.java index 25fc5a190f6..9559bfe2b8d 100644 --- a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/RequireCapabilityKogitoAddOnProcessor.java +++ b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/RequireCapabilityKogitoAddOnProcessor.java @@ -84,9 +84,9 @@ private IllegalStateException exceptionForRequiredCapabilities(List { sb.append("\t - ").append(c.getCapability()).append("\n"); sb.append("\t\t offered by the artifact ") - .append(KogitoCapability.KOGITO_GROUP_ID) + .append(c.getOfferedBy().getGroupId()) .append(":") - .append(c.getOfferedBy()) + .append(c.getOfferedBy().getArtifactId()) .append("\n"); }); sb.append("Add the above artifacts in your project's pom.xml file"); diff --git a/quarkus/addons/knative/eventing/integration-tests/pom.xml b/quarkus/addons/knative/eventing/integration-tests/pom.xml index 390871a8a03..6852603d081 100644 --- a/quarkus/addons/knative/eventing/integration-tests/pom.xml +++ b/quarkus/addons/knative/eventing/integration-tests/pom.xml @@ -50,8 +50,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus org.kie @@ -76,8 +76,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/quarkus/addons/knative/serving/integration-tests/pom.xml b/quarkus/addons/knative/serving/integration-tests/pom.xml index a1a17dbb31c..d29fe132a6c 100644 --- a/quarkus/addons/knative/serving/integration-tests/pom.xml +++ b/quarkus/addons/knative/serving/integration-tests/pom.xml @@ -55,8 +55,8 @@ quarkus-smallrye-openapi - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus @@ -117,8 +117,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment test diff --git a/quarkus/addons/kubernetes/integration-tests/pom.xml b/quarkus/addons/kubernetes/integration-tests/pom.xml index 39d62b4e0ae..0fae4733083 100644 --- a/quarkus/addons/kubernetes/integration-tests/pom.xml +++ b/quarkus/addons/kubernetes/integration-tests/pom.xml @@ -38,8 +38,8 @@ quarkus-smallrye-openapi - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus io.quarkus diff --git a/quarkus/addons/messaging/integration-tests/pom.xml b/quarkus/addons/messaging/integration-tests/pom.xml index f507e3e3f8f..91263455c03 100644 --- a/quarkus/addons/messaging/integration-tests/pom.xml +++ b/quarkus/addons/messaging/integration-tests/pom.xml @@ -37,8 +37,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus io.quarkus @@ -82,8 +82,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml index 06b3a5fcf5f..632e0f00260 100644 --- a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml +++ b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml @@ -55,8 +55,8 @@ quarkus-smallrye-openapi - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus @@ -93,8 +93,8 @@ test - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment test diff --git a/quarkus/addons/process-management/integration-tests/pom.xml b/quarkus/addons/process-management/integration-tests/pom.xml index eb37fd86c52..6bbfa96c5fa 100644 --- a/quarkus/addons/process-management/integration-tests/pom.xml +++ b/quarkus/addons/process-management/integration-tests/pom.xml @@ -51,8 +51,8 @@ test - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus org.kie @@ -68,8 +68,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/quarkus/addons/python/deployment/pom.xml b/quarkus/addons/python/deployment/pom.xml index 8d2dd1b6b46..19868a47dc6 100644 --- a/quarkus/addons/python/deployment/pom.xml +++ b/quarkus/addons/python/deployment/pom.xml @@ -21,12 +21,12 @@ 4.0.0 - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python-parent + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python-parent 999-SNAPSHOT - kogito-addons-quarkus-serverless-workflow-python-deployment - Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Deployment + sonataflow-addons-quarkus-python-deployment + SonataFlow:: Addons :: Quarkus:: Serverless Workflow:: Python:: Deployment Python support for serverless workflow @@ -36,8 +36,8 @@ - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python org.kie diff --git a/quarkus/addons/python/deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonAddonCapabilityProcessor.java b/quarkus/addons/python/deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonAddonCapabilityProcessor.java index 0bd959e5a4a..b06562426b7 100644 --- a/quarkus/addons/python/deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonAddonCapabilityProcessor.java +++ b/quarkus/addons/python/deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonAddonCapabilityProcessor.java @@ -26,7 +26,7 @@ class PythonAddonCapabilityProcessor extends OneOfCapabilityKogitoAddOnProcessor { - private static final String FEATURE = "kogito-addon-serverless-workflow-python"; + private static final String FEATURE = "sonataflow-addons-quarkus-python"; PythonAddonCapabilityProcessor() { super(KogitoCapability.SERVERLESS_WORKFLOW); diff --git a/quarkus/addons/python/integration-tests/pom.xml b/quarkus/addons/python/integration-tests/pom.xml index 8c75e584df8..1655db8a07f 100644 --- a/quarkus/addons/python/integration-tests/pom.xml +++ b/quarkus/addons/python/integration-tests/pom.xml @@ -21,12 +21,12 @@ 4.0.0 - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python-parent + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python-parent 999-SNAPSHOT - kogito-addons-quarkus-serverless-workflow-python-integration-tests - Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Integration Test + sonataflow-addons-quarkus-python-integration-tests + SonataFlow:: Addons :: Quarkus:: Serverless Workflow:: Python:: Integration Test Serverless Workflow Python Quarkus Addons Testing @@ -46,12 +46,12 @@ test - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python io.quarkus @@ -63,8 +63,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/quarkus/addons/python/pom.xml b/quarkus/addons/python/pom.xml index 6aa2513bd24..c4ff26461ec 100644 --- a/quarkus/addons/python/pom.xml +++ b/quarkus/addons/python/pom.xml @@ -25,9 +25,9 @@ kogito-addons-quarkus-parent 999-SNAPSHOT - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python-parent - Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Parent + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python-parent + SonataFlow:: Addons :: Quarkus:: Serverless Workflow:: Python:: Parent Serverless Workflow Python Quarkus Addons pom diff --git a/quarkus/addons/python/runtime/pom.xml b/quarkus/addons/python/runtime/pom.xml index 54a31b35d8b..5c585537e90 100644 --- a/quarkus/addons/python/runtime/pom.xml +++ b/quarkus/addons/python/runtime/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-quarkus-serverless-workflow-python-parent + org.apache.kie.sonataflow + sonataflow-addons-quarkus-python-parent 999-SNAPSHOT - Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Runtime + SonataFlow:: Addons :: Quarkus:: Serverless Workflow:: Python:: Runtime Python support for serverless workflow - kogito-addons-quarkus-serverless-workflow-python + sonataflow-addons-quarkus-python org.kie.kogito.quarkus.serverless.workflow.python diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml index 82c27de50c9..e74b1c102b1 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml @@ -23,14 +23,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-quarkus-serverless-workflow-extension - org.kie.kogito + sonataflow-quarkus-extension + org.apache.kie.sonataflow 999-SNAPSHOT 4.0.0 - kogito-quarkus-serverless-workflow-deployment - Kogito :: Quarkus Serverless Workflow Extension :: Deployment + sonataflow-quarkus-deployment + SonataFlow :: Quarkus Serverless Workflow Extension :: Deployment org.kie.kogito.serverless.workflow.deployment @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml index 09f1887e572..6fdd85df373 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml @@ -24,13 +24,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-quarkus-serverless-workflow-extension + org.apache.kie.sonataflow + sonataflow-quarkus-extension 999-SNAPSHOT - kogito-quarkus-serverless-workflow-extension-live-reload-test - Kogito :: Quarkus Serverless Workflow Extension :: Live Reload Tests + sonataflow-quarkus-extension-live-reload-test + SonataFlow :: Quarkus Serverless Workflow Extension :: Live Reload Tests org.kie.kogito.quarkus.serverless.workflow.deployment.livereload @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus io.quarkus @@ -105,8 +105,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml index e33f43b6ae3..0cde3b27060 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml @@ -23,14 +23,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-quarkus-serverless-workflow-extension - org.kie.kogito + sonataflow-quarkus-extension + org.apache.kie.sonataflow 999-SNAPSHOT 4.0.0 - kogito-quarkus-serverless-workflow-image-integration-test - Kogito :: Quarkus Serverless Workflow Extension :: Image Integration Tests + sonataflow-quarkus-image-integration-test + SonataFlow :: Quarkus Serverless Workflow Extension :: Image Integration Tests org.kie.kogito.quarkus.workflows.image.tests @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus io.quarkus @@ -67,8 +67,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml index f4bbb496981..f6aa9af515b 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-quarkus-serverless-workflow-extension - org.kie.kogito + sonataflow-quarkus-extension + org.apache.kie.sonataflow 999-SNAPSHOT 4.0.0 - kogito-quarkus-serverless-workflow-integration-test - Kogito :: Quarkus Serverless Workflow Extension :: Integration Tests + sonataflow-quarkus-integration-test + SonataFlow :: Quarkus Serverless Workflow Extension :: Integration Tests true @@ -24,8 +24,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus io.quarkus @@ -122,8 +122,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/ServerlessWorkflowCodestartTest.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/ServerlessWorkflowCodestartTest.java index e19e46ed9ab..ffce8e0e5c3 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/ServerlessWorkflowCodestartTest.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/ServerlessWorkflowCodestartTest.java @@ -33,7 +33,7 @@ public class ServerlessWorkflowCodestartTest { @RegisterExtension public static QuarkusCodestartTest codestartTest = QuarkusCodestartTest.builder() - .setupStandaloneExtensionTest("org.kie.kogito:kogito-quarkus-serverless-workflow") + .setupStandaloneExtensionTest("org.apache.kie.sonataflow:sonataflow-quarkus") .extension(ArtifactKey.fromString("io.quarkus:quarkus-config-yaml")) .putData(QuarkusCodestartData.QuarkusDataKey.APP_CONFIG, Map.of("quarkus.devservices.enabled", "false")) .languages(JAVA) diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml index 6673f35fd0d..e9f5bee77a7 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-quarkus-serverless-workflow-extension - org.kie.kogito + sonataflow-quarkus-extension + org.apache.kie.sonataflow 999-SNAPSHOT 4.0.0 - kogito-quarkus-serverless-workflow - Kogito :: Quarkus Serverless Workflow Extension :: Runtime - Add Kogito Serverless Workflows (SW) capabilities - Includes the Process engine capability + sonataflow-quarkus + SonataFlow :: Quarkus Serverless Workflow Extension :: Runtime + Add SonataFlow Serverless Workflows (SW) capabilities - Includes the Process engine capability org.kie.kogito.serverless.workflow @@ -159,7 +159,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.sonataflow.serverless-workflow + org.apache.kie.sonataflow.serverless-workflow diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/README.tpl.qute.md similarity index 100% rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/README.tpl.qute.md diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html similarity index 100% rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/src/main/resources/greet.sw.json b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/src/main/resources/greet.sw.json similarity index 100% rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/src/main/resources/greet.sw.json rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/src/main/resources/greet.sw.json diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/codestart.yml similarity index 59% rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/codestart.yml index 774a2e22373..5ccb0dd630f 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/codestart.yml @@ -1,15 +1,15 @@ -name: kogito-serverless-workflow-codestart -ref: kogito-serverless-workflow +name: sonataflow-quarkus-codestart +ref: sonataflow-quarkus type: code tags: extension-codestart metadata: - title: Kogito Serverless Workflow codestart + title: SonataFlow Serverless Workflow codestart description: This is an example Kogito Serverless Workflow Quarkus codestart, it contains a sample Serverless Workflow definition for REST code generation. - related-guide-section: https://quarkus.io/guides/kogito + related-guide-section: https://quarkus.io/guides/sonataflow language: base: dependencies: - - org.kie.kogito:kogito-quarkus-serverless-workflow + - org.apache.kie.sonataflow:sonataflow-quarkus - io.quarkus:quarkus-resteasy-jackson test-dependencies: - io.rest-assured:rest-assured diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/java/src/test/java/org/acme/GreetTest.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/java/src/test/java/org/acme/GreetTest.java similarity index 100% rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/java/src/test/java/org/acme/GreetTest.java rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/java/src/test/java/org/acme/GreetTest.java diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/java/src/test/resources/application.yml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/java/src/test/resources/application.yml similarity index 100% rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/java/src/test/resources/application.yml rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/java/src/test/resources/application.yml diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml index 8d3d81b0047..4e6caaaee9d 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,14 +9,14 @@ metadata: - "workflows" - "SW" - "SWF" - guide: "https://quarkus.io/guides/kogito" + guide: "https://quarkus.io/guides/sonataflow" categories: - "cloud" status: "preview" config: - "kogito." codestart: - name: "kogito-serverless-workflow-codestart" + name: "sonataflow-quarkus-codestart" languages: - "java" - artifact: "org.kie.kogito:kogito-quarkus-serverless-workflow:codestarts:jar:${project.version}" \ No newline at end of file + artifact: "org.apache.kie.sonataflow:sonataflow-quarkus:codestarts:jar:${project.version}" \ No newline at end of file diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml index 38616b206f9..1329e11e2ed 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml @@ -29,8 +29,9 @@ 4.0.0 - kogito-quarkus-serverless-workflow-extension - Kogito :: Quarkus Serverless Workflow Extension + org.apache.kie.sonataflow + sonataflow-quarkus-extension + SonataFlow :: Quarkus Serverless Workflow Extension pom diff --git a/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml index 42f42f5f38e..cfeec129444 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml @@ -49,14 +49,14 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus - + - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml index 079991f2f5e..e10d58bf771 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml @@ -53,8 +53,8 @@ quarkus-smallrye-openapi - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.kie.sonataflow + sonataflow-quarkus @@ -89,8 +89,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow-deployment + org.apache.kie.sonataflow + sonataflow-quarkus-deployment ${project.version} pom test diff --git a/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy index aa3d7f6efdc..44ff5ec5e0f 100644 --- a/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy +++ b/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy @@ -55,7 +55,7 @@ def resolveAddonGroupId(String artifactId) { case { artifactId.startsWith("jbpm-") }: return "org.jbpm" case { artifactId.startsWith("sonataflow-") }: - return "org.apache.sonataflow" + return "org.apache.kie.sonataflow" default: return "org.kie" } } From 861d709ba25d8e994b41763e61464193823b7b73 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:41:48 +0100 Subject: [PATCH 06/15] [Fix #3436] Ignoring unknown properties (#3437) * [Fix #3436] Ignoring unknown properties * [Fix #3436] Adding unit test --- addons/common/marshallers/avro/pom.xml | 26 ++++++++++++++++++- .../org/kie/kogito/event/avro/AvroIO.java | 1 + .../marshallers/avro/src/test/avro/pojo.avsc | 18 +++++++++++++ .../avro/AvroMarshallUnmarshallTest.java | 5 ++++ kogito-build/kogito-dependencies-bom/pom.xml | 8 +++++- 5 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 addons/common/marshallers/avro/src/test/avro/pojo.avsc diff --git a/addons/common/marshallers/avro/pom.xml b/addons/common/marshallers/avro/pom.xml index 130f76a6d35..92bcb8017e2 100644 --- a/addons/common/marshallers/avro/pom.xml +++ b/addons/common/marshallers/avro/pom.xml @@ -72,5 +72,29 @@ - + + + + + org.apache.avro + avro-maven-plugin + ${version.org.apache.avro} + + + generate-test-sources + + schema + + + ${project.basedir}/src/test/avro/ + PRIVATE + + **/*.avsc + + + + + + + diff --git a/addons/common/marshallers/avro/src/main/java/org/kie/kogito/event/avro/AvroIO.java b/addons/common/marshallers/avro/src/main/java/org/kie/kogito/event/avro/AvroIO.java index 9fd104c3469..b7fc36d24bf 100644 --- a/addons/common/marshallers/avro/src/main/java/org/kie/kogito/event/avro/AvroIO.java +++ b/addons/common/marshallers/avro/src/main/java/org/kie/kogito/event/avro/AvroIO.java @@ -167,6 +167,7 @@ private static Schema loadSchema(String schemaName) throws IOException { private static final AvroMapper getAvroMapper() { AvroMapper mapper = new AvroMapper(); + mapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true); mapper.findAndRegisterModules().registerModule(new SimpleModule().addSerializer(Utf8.class, new JsonSerializer() { @Override public void serialize(Utf8 value, JsonGenerator gen, SerializerProvider serializers) throws IOException { diff --git a/addons/common/marshallers/avro/src/test/avro/pojo.avsc b/addons/common/marshallers/avro/src/test/avro/pojo.avsc new file mode 100644 index 00000000000..faa12cee73d --- /dev/null +++ b/addons/common/marshallers/avro/src/test/avro/pojo.avsc @@ -0,0 +1,18 @@ +{ + "namespace": "org.kie.kogito.event.avro", + "type": "record", + "name": "Person", + "fields": [ + { + "name": "name", + "type": [ + "null", + "string" + ] + }, + { + "name": "age", + "type": "int" + } + ] +} \ No newline at end of file diff --git a/addons/common/marshallers/avro/src/test/java/org/kie/kogito/event/avro/AvroMarshallUnmarshallTest.java b/addons/common/marshallers/avro/src/test/java/org/kie/kogito/event/avro/AvroMarshallUnmarshallTest.java index a7ef1136c0c..adc45fbfaf5 100644 --- a/addons/common/marshallers/avro/src/test/java/org/kie/kogito/event/avro/AvroMarshallUnmarshallTest.java +++ b/addons/common/marshallers/avro/src/test/java/org/kie/kogito/event/avro/AvroMarshallUnmarshallTest.java @@ -61,4 +61,9 @@ void testJsonNodeMarshaller() throws IOException { void testJsonNodeCloudEventMarshaller() throws IOException { testCloudEventMarshalling(getJsonNodeCloudEvent(), JsonNode.class, new AvroCloudEventMarshaller(avroUtils), new AvroCloudEventUnmarshallerFactory(avroUtils)); } + + @Test + void testGeneratedPojoMarshaller() throws IOException { + testEventMarshalling(Person.newBuilder().setAge(0).setName("Pepe").build(), new AvroEventMarshaller(avroUtils), new AvroEventUnmarshaller(avroUtils)); + } } diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml index 5d4953c8a65..686d59f3ebf 100644 --- a/kogito-build/kogito-dependencies-bom/pom.xml +++ b/kogito-build/kogito-dependencies-bom/pom.xml @@ -98,7 +98,8 @@ 1.7.13 2.0.4 13.4-alpine3.14 - + + 1.11.3 3.22.0 2.9.0 1.3 @@ -297,6 +298,11 @@ jackson-dataformat-avro ${version.com.fasterxml.jackson} + + org.apache.avro + avro + ${version.org.apache.avro} + com.jayway.jsonpath json-path From e6679a77e2bea26f6229175036b82290b8d60fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Mu=C3=B1oz?= Date: Thu, 14 Mar 2024 16:09:05 +0100 Subject: [PATCH 07/15] [SRVLOGIC-253] Skip shouldGetDockerImageName test if no docker (#3440) --- .../kie/kogito/testcontainers/KogitoMongoDBContainerTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kogito-test-utils/src/test/java/org/kie/kogito/testcontainers/KogitoMongoDBContainerTest.java b/kogito-test-utils/src/test/java/org/kie/kogito/testcontainers/KogitoMongoDBContainerTest.java index 03a0b843b62..65122081c4f 100644 --- a/kogito-test-utils/src/test/java/org/kie/kogito/testcontainers/KogitoMongoDBContainerTest.java +++ b/kogito-test-utils/src/test/java/org/kie/kogito/testcontainers/KogitoMongoDBContainerTest.java @@ -20,8 +20,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.testcontainers.DockerClientFactory; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -51,6 +53,7 @@ void shouldGetMapperPort() { @Test void shouldGetDockerImageName() { + assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Aborting test: docker env not found"); assertThat(container.getDockerImageName()).isEqualTo(System.getProperty(Constants.CONTAINER_NAME_PREFIX + KogitoMongoDBContainer.NAME)); } } From 3b741ef530ddd1ba3a501fe6fa23cb1d82c37fa7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 21:46:54 +0100 Subject: [PATCH 08/15] Bump org.jenkins-ci.plugins:email-ext in /.ci/jenkins/tests (#3370) Bumps [org.jenkins-ci.plugins:email-ext](https://github.com/jenkinsci/email-ext-plugin) from 2.66 to 2.96.1. - [Release notes](https://github.com/jenkinsci/email-ext-plugin/releases) - [Changelog](https://github.com/jenkinsci/email-ext-plugin/blob/master/CHANGELOG.adoc) - [Commits](https://github.com/jenkinsci/email-ext-plugin/compare/email-ext-2.66...email-ext-2.96.1) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:email-ext dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .ci/jenkins/tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/jenkins/tests/pom.xml b/.ci/jenkins/tests/pom.xml index 46e295e7c54..5256cce5c57 100644 --- a/.ci/jenkins/tests/pom.xml +++ b/.ci/jenkins/tests/pom.xml @@ -211,7 +211,7 @@ org.jenkins-ci.plugins email-ext - 2.66 + 2.96.1 test From ced112c787487127032f30478b51fdb35b05e959 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 21:47:34 +0100 Subject: [PATCH 09/15] Bump org.jenkins-ci.plugins.workflow:workflow-durable-task-step (#3387) Bumps org.jenkins-ci.plugins.workflow:workflow-durable-task-step from 1.3 to 2.18. --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins.workflow:workflow-durable-task-step dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .ci/jenkins/tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/jenkins/tests/pom.xml b/.ci/jenkins/tests/pom.xml index 5256cce5c57..631f747b248 100644 --- a/.ci/jenkins/tests/pom.xml +++ b/.ci/jenkins/tests/pom.xml @@ -163,7 +163,7 @@ org.jenkins-ci.plugins.workflow workflow-durable-task-step - 1.3 + 2.18 test From a82e34cd5fb351107fca0af44ca5b90fbc12cb0d Mon Sep 17 00:00:00 2001 From: Josh Dickison Date: Fri, 15 Mar 2024 05:13:48 -0400 Subject: [PATCH 10/15] Update README.md (#2429) including starter and add-ons in command copy --- springboot/archetype/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/springboot/archetype/README.md b/springboot/archetype/README.md index fc99e2a0dc0..03aab8f47e4 100644 --- a/springboot/archetype/README.md +++ b/springboot/archetype/README.md @@ -28,7 +28,7 @@ mvn archetype:generate \ -DarchetypeArtifactId=kogito-spring-boot-archetype \ -DarchetypeVersion=2.0.0-SNAPSHOT \ -DgroupId=com.company \ - -DartifactId=sample-kogito + -DartifactId=sample-kogito \ -Dstarters=decisions,rules,processes ``` @@ -52,7 +52,7 @@ mvn archetype:generate \ -DarchetypeArtifactId=kogito-spring-boot-archetype \ -DarchetypeVersion=2.0.0-SNAPSHOT \ -DgroupId=com.company \ - -DartifactId=sample-kogito + -DartifactId=sample-kogito \ -Daddons=monitoring-prometheus,persistence-infinispan ``` From 2b693b6d46b5cac33c44f0fcdedd1f2432276073 Mon Sep 17 00:00:00 2001 From: Gabriele Cardosi Date: Fri, 15 Mar 2024 13:57:58 +0100 Subject: [PATCH 11/15] [incubator-kie-issues#908] Fix broken tests (#3442) Co-authored-by: Gabriele-Cardosi --- .../codegen/decision/DecisionValidation.java | 12 +- .../codegen/decision/DecisionCodegenTest.java | 4 +- .../decision-empty-name/vacationDays.dmn | 247 ++++-------------- 3 files changed, 64 insertions(+), 199 deletions(-) diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionValidation.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionValidation.java index f5f194ccbba..dd9894ee7e0 100644 --- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionValidation.java +++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionValidation.java @@ -82,13 +82,10 @@ static void dmnValidateResources(KogitoBuildContext context, Collection schemaModelValidations = DMNValidatorFactory.newValidator(Arrays.asList(new ExtendedDMNProfile())) + List schemaModelValidations = DMNValidatorFactory.newValidator(List.of(new ExtendedDMNProfile())) .validateUsing(DMNValidator.Validation.VALIDATE_SCHEMA, DMNValidator.Validation.VALIDATE_MODEL) - .theseModels(resources.stream() - .map(DecisionValidation::resourceToReader) - .collect(Collectors.toList()) - .toArray(new Reader[] {})); + .theseModels(resources.toArray(new Resource[] {})); logValidationMessages(schemaModelValidations, DecisionValidation::extractMsgPrefix, DMNMessage::getText); processMessagesHandleErrors(validateOption, schemaModelValidations); } @@ -187,18 +184,17 @@ static void dmnValidateDecisionTablesInModels(KogitoBuildContext context, Collec } private static void processMessagesHandleErrors(ValidationOption validateOption, Collection messages) { - List errors = messages.stream().filter(m -> m.getLevel() == Level.ERROR).collect(Collectors.toList()); + List errors = messages.stream().filter(m -> m.getLevel() == Level.ERROR).toList(); if (!errors.isEmpty()) { if (validateOption != ValidationOption.IGNORE) { StringBuilder sb = new StringBuilder("DMN Validation schema and model validation contained errors").append("\n"); sb.append("You may configure ").append(DecisionCodegen.VALIDATION_CONFIGURATION_KEY).append("=IGNORE to ignore validation errors").append("\n"); sb.append("DMN Validation errors:").append("\n"); - sb.append(errors.stream().map(m -> modelName(m) + ": " + m.getMessage()).collect(Collectors.joining(",\n"))); + sb.append(errors.stream().map(m -> modelName(m) + ": " + m.getText()).collect(Collectors.joining(",\n"))); LOG.error(sb.toString()); throw new RuntimeException(sb.toString()); } else { LOG.warn("DMN Validation encountered errors but validation configuration was set to IGNORE, continuing with no blocking error."); - return; } } } diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/test/java/org/kie/kogito/codegen/decision/DecisionCodegenTest.java b/kogito-codegen-modules/kogito-codegen-decisions/src/test/java/org/kie/kogito/codegen/decision/DecisionCodegenTest.java index beaef72378c..962d99632ec 100644 --- a/kogito-codegen-modules/kogito-codegen-decisions/src/test/java/org/kie/kogito/codegen/decision/DecisionCodegenTest.java +++ b/kogito-codegen-modules/kogito-codegen-decisions/src/test/java/org/kie/kogito/codegen/decision/DecisionCodegenTest.java @@ -52,6 +52,7 @@ import static java.util.Collections.singleton; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.kie.kogito.codegen.api.utils.KogitoContextTestUtils.mockClassAvailabilityResolver; import static org.kie.kogito.grafana.utils.GrafanaDashboardUtils.DISABLED_DOMAIN_DASHBOARDS; import static org.kie.kogito.grafana.utils.GrafanaDashboardUtils.DISABLED_OPERATIONAL_DASHBOARDS; @@ -211,7 +212,8 @@ public void resilientToDuplicateDMNIDs(KogitoBuildContext.Builder contextBuilder public void emptyName(KogitoBuildContext.Builder contextBuilder) { DecisionCodegen codeGenerator = getDecisionCodegen("src/test/resources/decision-empty-name", contextBuilder); RuntimeException re = Assertions.assertThrows(RuntimeException.class, codeGenerator::generate); - assertEquals("Model name should not be empty", re.getMessage()); + String expected = "DMN: Invalid name '': Name cannot be null or empty (DMN id: _f27bb64b-6fc7-4e1f-9848-11ba35e0df44, The listed name is not a valid FEEL identifier)"; + assertTrue(re.getMessage().contains(expected)); } @ParameterizedTest diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/test/resources/decision-empty-name/vacationDays.dmn b/kogito-codegen-modules/kogito-codegen-decisions/src/test/resources/decision-empty-name/vacationDays.dmn index e6b96c58a76..69a239b2676 100644 --- a/kogito-codegen-modules/kogito-codegen-decisions/src/test/resources/decision-empty-name/vacationDays.dmn +++ b/kogito-codegen-modules/kogito-codegen-decisions/src/test/resources/decision-empty-name/vacationDays.dmn @@ -1,196 +1,63 @@ - - - - - string - - - string - - - string - - - string - - - - - string - - - string - - - string - - - Any - - - tAddress - - - - - number - - + + + + + + + string + + number - - string - - - tEmployee - - - - + + + - - - - - - - - - - employee.address.country - - - - - 15 - - - - - "US" - - - 10 - - - - - "IT" - - - 20 - - - - - - - - - - - - + + + + - - - - - employee - - - - - - null - - - - - - vacationDays - - - - - - null - - - + + + + + Say Hello( An Imported Person ) + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + "Hello " + Person.name + "!" + + + + + From 3f0d772ef12dfed139d92e75fa14e743af2c1a84 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Sat, 16 Mar 2024 12:35:56 +0100 Subject: [PATCH 12/15] [Fix_#3413] Speed up businesskey query performance (#3441) * [Fix #3413] Speed up business key query performance * [Fix #3413] Walters comments * [Fix #3413] Fixing flaky test --- .../persistence/jdbc/GenericRepository.java | 36 ++++++++++++++----- .../jdbc/JDBCProcessInstances.java | 8 ++++- .../kogito/persistence/jdbc/Repository.java | 6 +++- .../ansi/V10.0.0__add_business_key_ansi.sql | 11 ++++++ .../V10.0.0__add_business_key_PostgreSQL.sql | 12 +++++++ .../jdbc/AbstractProcessInstancesIT.java | 5 +-- .../kie/kogito/process/ProcessInstances.java | 6 +++- 7 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 addons/common/persistence/jdbc/src/main/resources/db/ansi/V10.0.0__add_business_key_ansi.sql create mode 100644 addons/common/persistence/jdbc/src/main/resources/db/postgresql/V10.0.0__add_business_key_PostgreSQL.sql diff --git a/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/GenericRepository.java b/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/GenericRepository.java index 58fc611b17d..9dd066ee9fc 100644 --- a/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/GenericRepository.java +++ b/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/GenericRepository.java @@ -34,16 +34,11 @@ import javax.sql.DataSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class GenericRepository extends Repository { private static final String PAYLOAD = "payload"; private static final String VERSION = "version"; - private static final Logger LOGGER = LoggerFactory.getLogger(GenericRepository.class); - private final DataSource dataSource; public GenericRepository(DataSource dataSource) { @@ -51,17 +46,25 @@ public GenericRepository(DataSource dataSource) { } @Override - void insertInternal(String processId, String processVersion, UUID id, byte[] payload) { + void insertInternal(String processId, String processVersion, UUID id, byte[] payload, String businessKey) { try (Connection connection = dataSource.getConnection(); PreparedStatement statement = connection.prepareStatement(INSERT)) { - statement.setString(1, id.toString()); + String processInstanceId = id.toString(); + statement.setString(1, processInstanceId); statement.setBytes(2, payload); statement.setString(3, processId); statement.setString(4, processVersion); statement.setLong(5, 0L); statement.executeUpdate(); + if (businessKey != null) { + try (PreparedStatement businessKeyStmt = connection.prepareStatement(INSERT_BUSINESS_KEY)) { + businessKeyStmt.setString(1, businessKey); + businessKeyStmt.setString(2, processInstanceId); + businessKeyStmt.executeUpdate(); + } + } } catch (Exception e) { - throw uncheckedException(e, "Error inserting process instance %s", id); + throw uncheckedException(e, "Error inserting process instance id: %s, processId: %s processVersion: %s business key: %s", id, processId, processVersion, businessKey); } } @@ -140,6 +143,23 @@ Optional findByIdInternal(String processId, String processVersion, UUID return Optional.empty(); } + @Override + Optional findByBusinessKey(String processId, String processVersion, String businessKey) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement statement = connection.prepareStatement(sqlIncludingVersion(FIND_BY_BUSINESS_KEY, processVersion))) { + statement.setString(1, businessKey); + statement.setString(2, processId); + if (processVersion != null) { + statement.setString(3, processVersion); + } + try (ResultSet resultSet = statement.executeQuery()) { + return resultSet.next() ? Optional.of(from(resultSet)) : Optional.empty(); + } + } catch (Exception e) { + throw uncheckedException(e, "Error finding process instance. Business key: %s, Process Id: %s, Process version: %s", businessKey, processId, processVersion); + } + } + private static class CloseableWrapper implements Runnable { private Deque wrapped = new ArrayDeque<>(); diff --git a/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/JDBCProcessInstances.java b/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/JDBCProcessInstances.java index 789da4f5c7b..26c089fecfb 100644 --- a/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/JDBCProcessInstances.java +++ b/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/JDBCProcessInstances.java @@ -60,7 +60,7 @@ public boolean exists(String id) { public void create(String id, ProcessInstance instance) { LOGGER.debug("Creating process instance id: {}, processId: {}, processVersion: {}", id, process.id(), process.version()); if (isActive(instance)) { - repository.insertInternal(process.id(), process.version(), UUID.fromString(id), marshaller.marshallProcessInstance(instance)); + repository.insertInternal(process.id(), process.version(), UUID.fromString(id), marshaller.marshallProcessInstance(instance), instance.businessKey()); } else { LOGGER.warn("Skipping create of process instance id: {}, state: {}", id, instance.status()); } @@ -101,6 +101,12 @@ public Optional> findById(String id, ProcessInstanceReadMode return repository.findByIdInternal(process.id(), process.version(), UUID.fromString(id)).map(r -> unmarshall(r, mode)); } + @Override + public Optional> findByBusinessKey(String businessKey, ProcessInstanceReadMode mode) { + LOGGER.debug("Find process instance using business Key : {}", businessKey); + return repository.findByBusinessKey(process.id(), process.version(), businessKey).map(r -> unmarshall(r, mode)); + } + @Override public Stream> stream(ProcessInstanceReadMode mode) { LOGGER.debug("Find process instance values using mode: {}", mode); diff --git a/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/Repository.java b/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/Repository.java index 69ac9bfe694..a1d10367669 100644 --- a/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/Repository.java +++ b/addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/Repository.java @@ -25,8 +25,10 @@ abstract class Repository { static final String INSERT = "INSERT INTO process_instances (id, payload, process_id, process_version, version) VALUES (?, ?, ?, ?, ?)"; + static final String INSERT_BUSINESS_KEY = "INSERT INTO business_key_mapping (business_key,process_instance_id) VALUES (?,?)"; static final String FIND_ALL = "SELECT payload, version FROM process_instances WHERE process_id = ?"; static final String FIND_BY_ID = "SELECT payload, version FROM process_instances WHERE process_id = ? and id = ?"; + static final String FIND_BY_BUSINESS_KEY = "SELECT payload, version FROM process_instances INNER JOIN business_key_mapping ON id = process_instance_id WHERE business_key = ? and process_id = ?"; static final String UPDATE = "UPDATE process_instances SET payload = ? WHERE process_id = ? and id = ?"; static final String UPDATE_WITH_LOCK = "UPDATE process_instances SET payload = ?, version = ? WHERE process_id = ? and id = ? and version = ?"; static final String DELETE = "DELETE FROM process_instances WHERE process_id = ? and id = ?"; @@ -51,7 +53,7 @@ public Record(byte[] payload, long version) { } } - abstract void insertInternal(String processId, String processVersion, UUID id, byte[] payload); + abstract void insertInternal(String processId, String processVersion, UUID id, byte[] payload, String businessKey); abstract void updateInternal(String processId, String processVersion, UUID id, byte[] payload); @@ -61,6 +63,8 @@ public Record(byte[] payload, long version) { abstract Optional findByIdInternal(String processId, String processVersion, UUID id); + abstract Optional findByBusinessKey(String processId, String processVersion, String businessKey); + abstract Stream findAllInternal(String processId, String processVersion); protected RuntimeException uncheckedException(Exception ex, String message, Object... param) { diff --git a/addons/common/persistence/jdbc/src/main/resources/db/ansi/V10.0.0__add_business_key_ansi.sql b/addons/common/persistence/jdbc/src/main/resources/db/ansi/V10.0.0__add_business_key_ansi.sql new file mode 100644 index 00000000000..dad119c2ad9 --- /dev/null +++ b/addons/common/persistence/jdbc/src/main/resources/db/ansi/V10.0.0__add_business_key_ansi.sql @@ -0,0 +1,11 @@ +CREATE TABLE business_key_mapping ( + business_key VARCHAR (255) NOT NULL, + process_instance_id VARCHAR (36) NOT NULL, + CONSTRAINT business_key_primary_key PRIMARY KEY (business_key), + CONSTRAINT fk_process_instances + FOREIGN KEY (process_instance_id) + REFERENCES process_instances(id) + ON DELETE CASCADE +); + +CREATE INDEX idx_business_key_process_instance_id ON business_key_mapping (process_instance_id); diff --git a/addons/common/persistence/jdbc/src/main/resources/db/postgresql/V10.0.0__add_business_key_PostgreSQL.sql b/addons/common/persistence/jdbc/src/main/resources/db/postgresql/V10.0.0__add_business_key_PostgreSQL.sql new file mode 100644 index 00000000000..4d04dad0474 --- /dev/null +++ b/addons/common/persistence/jdbc/src/main/resources/db/postgresql/V10.0.0__add_business_key_PostgreSQL.sql @@ -0,0 +1,12 @@ +CREATE TABLE business_key_mapping ( + business_key character (255) NOT NULL, + process_instance_id character (36) NOT NULL, + PRIMARY KEY (business_key), + CONSTRAINT fk_process_instances + FOREIGN KEY (process_instance_id) + REFERENCES process_instances(id) + ON DELETE CASCADE +); + + +CREATE INDEX idx_business_key_process_instance_id ON business_key_mapping (process_instance_id); diff --git a/addons/common/persistence/jdbc/src/test/java/org/kie/persistence/jdbc/AbstractProcessInstancesIT.java b/addons/common/persistence/jdbc/src/test/java/org/kie/persistence/jdbc/AbstractProcessInstancesIT.java index 985bd61348e..3769ce2329f 100644 --- a/addons/common/persistence/jdbc/src/test/java/org/kie/persistence/jdbc/AbstractProcessInstancesIT.java +++ b/addons/common/persistence/jdbc/src/test/java/org/kie/persistence/jdbc/AbstractProcessInstancesIT.java @@ -152,13 +152,14 @@ void testMultipleProcesses() { @Test void testBasicFlow() { var factory = new TestProcessInstancesFactory(getDataSource(), lock()); + final String businessKey = "manolo"; BpmnProcess process = createProcess(factory, "BPMN2-UserTask.bpmn2"); - ProcessInstance processInstance = process.createInstance(BpmnVariables.create(singletonMap("test", + ProcessInstance processInstance = process.createInstance(businessKey, BpmnVariables.create(singletonMap("test", "test"))); processInstance.start(); JDBCProcessInstances processInstances = (JDBCProcessInstances) process.instances(); - Optional foundOne = processInstances.findById(processInstance.id()); + Optional foundOne = processInstances.findByBusinessKey(businessKey); BpmnProcessInstance instanceOne = (BpmnProcessInstance) foundOne.get(); processInstances.update(processInstance.id(), instanceOne); diff --git a/api/kogito-api/src/main/java/org/kie/kogito/process/ProcessInstances.java b/api/kogito-api/src/main/java/org/kie/kogito/process/ProcessInstances.java index 6cc0d95649c..a0ce2e8c422 100644 --- a/api/kogito-api/src/main/java/org/kie/kogito/process/ProcessInstances.java +++ b/api/kogito-api/src/main/java/org/kie/kogito/process/ProcessInstances.java @@ -30,7 +30,11 @@ default Optional> findById(String id) { Optional> findById(String id, ProcessInstanceReadMode mode); default Optional> findByBusinessKey(String id) { - return stream().filter(pi -> id.equals(pi.businessKey())).findAny(); + return findByBusinessKey(id, ProcessInstanceReadMode.READ_ONLY); + } + + default Optional> findByBusinessKey(String id, ProcessInstanceReadMode mode) { + return stream(mode).filter(pi -> id.equals(pi.businessKey())).findAny(); } Stream> stream(ProcessInstanceReadMode mode); From 0243d80161099b1d0b5eefbac02a7bf443882365 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 10:22:49 +0100 Subject: [PATCH 13/15] Bump com.github.tomakehurst:wiremock-jre8-standalone (#3333) Bumps [com.github.tomakehurst:wiremock-jre8-standalone](https://github.com/wiremock/wiremock) from 2.33.2 to 2.35.1. - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](https://github.com/wiremock/wiremock/compare/2.33.2...2.35.1) --- updated-dependencies: - dependency-name: com.github.tomakehurst:wiremock-jre8-standalone dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- kogito-build/kogito-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml index 686d59f3ebf..20c8932ea8b 100644 --- a/kogito-build/kogito-dependencies-bom/pom.xml +++ b/kogito-build/kogito-dependencies-bom/pom.xml @@ -37,7 +37,7 @@ 3.25.1 2.15.2 4.18.0 - 2.33.2 + 2.35.1 3.22.0 2.10.1 From d2b447ec5c5b8400ddf9b52f42c74089ee2bb948 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Tue, 19 Mar 2024 17:36:42 +0100 Subject: [PATCH 14/15] [Fix #3346] Allow add ProcessEventListener to StaticWorkflowApplication (#3448) * [Fix #3346] Allow add ProcessEventListener to StaticWorkflowApplication * [Fix #3346] Fixing mistakes --- .../DefaultProcessEventListenerConfig.java | 6 ++ .../executor/StaticWorkflowApplication.java | 76 +++++++++++++++---- .../StaticFluentWorkflowApplicationTest.java | 11 ++- 3 files changed, 79 insertions(+), 14 deletions(-) diff --git a/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/DefaultProcessEventListenerConfig.java b/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/DefaultProcessEventListenerConfig.java index f6cfa8a58b5..143033d8c53 100644 --- a/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/DefaultProcessEventListenerConfig.java +++ b/jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/DefaultProcessEventListenerConfig.java @@ -27,4 +27,10 @@ public DefaultProcessEventListenerConfig(ProcessEventListener... listeners) { register(listener); } } + + public DefaultProcessEventListenerConfig(Iterable listeners) { + for (ProcessEventListener listener : listeners) { + register(listener); + } + } } diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/src/main/java/org/kie/kogito/serverless/workflow/executor/StaticWorkflowApplication.java b/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/src/main/java/org/kie/kogito/serverless/workflow/executor/StaticWorkflowApplication.java index bce8b4f53b6..aaaedd8606d 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/src/main/java/org/kie/kogito/serverless/workflow/executor/StaticWorkflowApplication.java +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/src/main/java/org/kie/kogito/serverless/workflow/executor/StaticWorkflowApplication.java @@ -20,10 +20,13 @@ import java.io.IOException; import java.io.InputStream; +import java.net.URL; import java.time.Duration; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.Properties; @@ -46,6 +49,7 @@ import org.kie.kogito.config.StaticConfigBean; import org.kie.kogito.event.impl.EventFactoryUtils; import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener; +import org.kie.kogito.internal.process.event.KogitoProcessEventListener; import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler; import org.kie.kogito.process.Process; import org.kie.kogito.process.ProcessInstance; @@ -120,28 +124,74 @@ public void afterProcessCompleted(ProcessCompletedEvent event) { } } - public static StaticWorkflowApplication create() { - Properties properties = new Properties(); - try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("application.properties")) { - if (is != null) { - properties.load(is); + public static class WorkflowApplicationBuilder { + + private Map properties; + private Collection listeners = new ArrayList<>(); + + private WorkflowApplicationBuilder() { + } + + public WorkflowApplicationBuilder withProperties(Map properties) { + this.properties = properties; + return this; + } + + public WorkflowApplicationBuilder withEventListener(KogitoProcessEventListener listener, KogitoProcessEventListener... extraListeners) { + listeners.add(listener); + for (KogitoProcessEventListener extraListener : extraListeners) { + listeners.add(extraListener); + } + return this; + } + + public StaticWorkflowApplication build() { + if (properties == null) { + this.properties = loadApplicationDotProperties(); + } + Map> queues = new ConcurrentHashMap<>(); + listeners.add(new StaticCompletionEventListener(queues)); + StaticWorkflowApplication application = new StaticWorkflowApplication(properties, queues, listeners); + application.applicationRegisters.forEach(register -> register.register(application)); + return application; + } + } + + private static Map loadApplicationDotProperties() { + Map allProperties = new HashMap<>(); + try { + Enumeration urls = Thread.currentThread().getContextClassLoader().getResources("application.properties"); + while (urls.hasMoreElements()) { + URL url = urls.nextElement(); + try (InputStream is = url.openStream()) { + Properties fileProperties = new Properties(); + fileProperties.load(is); + fileProperties.entrySet().forEach(e -> allProperties.put(e.getKey().toString(), e.getValue())); + } catch (IOException io) { + logger.info("Error loading properties from URL {}", url, io); + } } } catch (IOException io) { - logger.warn("Error loading application.properties from classpath", io); + logger.warn("Error searching for application.properties in classpath", io); } - return create((Map) properties); + return allProperties; + } + + public static WorkflowApplicationBuilder builder() { + return new WorkflowApplicationBuilder(); + } + + public static StaticWorkflowApplication create() { + return builder().build(); } public static StaticWorkflowApplication create(Map properties) { - Map> queues = new ConcurrentHashMap<>(); - StaticWorkflowApplication application = new StaticWorkflowApplication(properties, queues); - application.applicationRegisters.forEach(register -> register.register(application)); - return application; + return builder().withProperties(properties).build(); } - private StaticWorkflowApplication(Map properties, Map> queues) { + private StaticWorkflowApplication(Map properties, Map> queues, Collection listeners) { super(new StaticConfig(new Addons(Collections.emptySet()), new StaticProcessConfig(new CachedWorkItemHandlerConfig(), - new DefaultProcessEventListenerConfig(new StaticCompletionEventListener(queues)), + new DefaultProcessEventListenerConfig(listeners), new DefaultUnitOfWorkManager(new CollectingUnitOfWorkFactory())), new StaticConfigBean())); if (!properties.isEmpty()) { ConfigResolverHolder.setConfigResolver(MultiSourceConfigResolver.withSystemProperties(properties)); diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/src/test/java/org/kie/kogito/serverless/workflow/executor/StaticFluentWorkflowApplicationTest.java b/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/src/test/java/org/kie/kogito/serverless/workflow/executor/StaticFluentWorkflowApplicationTest.java index d96afcd2c9d..81de083a09a 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/src/test/java/org/kie/kogito/serverless/workflow/executor/StaticFluentWorkflowApplicationTest.java +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-core/src/test/java/org/kie/kogito/serverless/workflow/executor/StaticFluentWorkflowApplicationTest.java @@ -23,8 +23,11 @@ import java.util.Collections; import java.util.Map; import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; import org.junit.jupiter.api.Test; +import org.kie.api.event.process.ProcessCompletedEvent; +import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener; import org.kie.kogito.process.Process; import org.kie.kogito.serverless.workflow.actions.SysoutAction; import org.kie.kogito.serverless.workflow.actions.WorkflowLogLevel; @@ -67,9 +70,15 @@ public class StaticFluentWorkflowApplicationTest { @Test void helloWorld() { final String GREETING_STRING = "Hello World!!!"; - try (StaticWorkflowApplication application = StaticWorkflowApplication.create()) { + AtomicBoolean completed = new AtomicBoolean(false); + try (StaticWorkflowApplication application = StaticWorkflowApplication.builder().withEventListener(new DefaultKogitoProcessEventListener() { + public void afterProcessCompleted(ProcessCompletedEvent event) { + completed.set(true); + } + }).build()) { Workflow workflow = workflow("HelloWorld").start(inject(new TextNode(GREETING_STRING))).end().build(); assertThat(application.execute(workflow, Collections.emptyMap()).getWorkflowdata()).contains(new TextNode(GREETING_STRING)); + assertThat(completed.get()).isTrue(); } } From 00676ce74375e3fe2fc77b3f2b9435629f53583c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Tue, 26 Mar 2024 16:23:28 +0100 Subject: [PATCH 15/15] incubator-kie-issues#1045: Rename missing addons in `incubator-kie-kogito-runtimes/addons` (#3452) --- addons/README.md | 2 +- addons/common/events/decisions/pom.xml | 12 +- addons/common/events/mongodb/pom.xml | 14 +- addons/common/events/pom.xml | 8 +- addons/common/events/predictions/pom.xml | 12 +- addons/common/events/rules/pom.xml | 9 +- addons/common/explainability/pom.xml | 6 +- .../common/human-task-prediction/api/pom.xml | 10 +- addons/common/human-task-prediction/pom.xml | 5 +- .../human-task-prediction/smile/pom.xml | 14 +- addons/common/jobs/api/pom.xml | 2 +- addons/common/jobs/management-common/pom.xml | 4 +- addons/common/jobs/pom.xml | 2 +- addons/common/knative/eventing/pom.xml | 6 +- addons/common/knative/pom.xml | 2 +- .../common/kubernetes-service-catalog/pom.xml | 6 +- addons/common/kubernetes/pom.xml | 8 +- addons/common/mail/pom.xml | 7 +- addons/common/marshallers/avro/pom.xml | 8 +- addons/common/marshallers/pom.xml | 8 +- addons/common/messaging/pom.xml | 6 +- addons/common/monitoring/core/pom.xml | 6 +- addons/common/monitoring/elastic/pom.xml | 16 +- addons/common/monitoring/pom.xml | 6 +- addons/common/monitoring/prometheus/pom.xml | 12 +- addons/common/persistence/README.md | 2 +- addons/common/persistence/ddl/pom.xml | 8 +- addons/common/persistence/filesystem/pom.xml | 10 +- addons/common/persistence/infinispan/pom.xml | 10 +- addons/common/persistence/jdbc/pom.xml | 10 +- addons/common/persistence/mongodb/pom.xml | 10 +- addons/common/persistence/pom.xml | 8 +- addons/common/persistence/postgresql/pom.xml | 12 +- addons/common/persistence/rocksdb/pom.xml | 10 +- addons/common/pom.xml | 2 +- addons/common/process-management/pom.xml | 6 +- addons/common/process-svg/pom.xml | 6 +- addons/common/rest-exception-handler/pom.xml | 6 +- addons/common/task-management/pom.xml | 7 +- addons/common/tracing/decision-common/pom.xml | 16 +- addons/common/tracing/pom.xml | 6 +- addons/common/tracing/tracing-api/pom.xml | 12 +- addons/common/tracing/typedvalue-api/pom.xml | 8 +- addons/deprecated/README.md | 52 ++-- addons/pom.xml | 3 + kogito-bom/pom.xml | 246 +++++++++--------- .../pom.xml | 4 +- .../addons/events/decisions/runtime/pom.xml | 4 +- quarkus/addons/events/mongodb/runtime/pom.xml | 4 +- .../addons/events/predictions/runtime/pom.xml | 4 +- quarkus/addons/events/rules/runtime/pom.xml | 4 +- quarkus/addons/explainability/runtime/pom.xml | 4 +- .../runtime/pom.xml | 8 +- .../test-utils/pom.xml | 4 +- quarkus/addons/jobs/common/messaging/pom.xml | 2 +- .../addons/jobs/common/rest-callback/pom.xml | 2 +- .../addons/jobs/management/runtime/pom.xml | 6 +- quarkus/addons/jobs/messaging/runtime/pom.xml | 2 +- .../addons/knative/eventing/runtime/pom.xml | 2 +- quarkus/addons/kubernetes/runtime/pom.xml | 8 +- quarkus/addons/mail/runtime/pom.xml | 4 +- .../addons/marshallers/avro/runtime/pom.xml | 4 +- quarkus/addons/messaging/common/pom.xml | 4 +- .../runtime/pom.xml | 8 +- quarkus/addons/monitoring/core/pom.xml | 8 +- .../addons/monitoring/elastic/runtime/pom.xml | 4 +- .../monitoring/prometheus/runtime/pom.xml | 4 +- .../persistence/filesystem/runtime/pom.xml | 4 +- .../persistence/infinispan/runtime/pom.xml | 4 +- .../addons/persistence/jdbc/runtime/pom.xml | 4 +- .../persistence/mongodb/runtime/pom.xml | 4 +- .../persistence/postgresql/runtime/pom.xml | 4 +- ...ogitoAddOnPersistenceRocksDBProcessor.java | 2 +- .../persistence/rocksdb/runtime/pom.xml | 4 +- .../addons/process-management/runtime/pom.xml | 4 +- quarkus/addons/process-svg/runtime/pom.xml | 8 +- quarkus/addons/rest-exception-handler/pom.xml | 4 +- .../addons/task-management/runtime/pom.xml | 4 +- .../addons/tracing-decision/runtime/pom.xml | 4 +- springboot/addons/events/decisions/pom.xml | 4 +- springboot/addons/events/mongodb/pom.xml | 4 +- springboot/addons/events/predictions/pom.xml | 4 +- springboot/addons/events/rules/pom.xml | 4 +- springboot/addons/explainability/pom.xml | 4 +- springboot/addons/jobs/pom.xml | 6 +- springboot/addons/kubernetes/pom.xml | 4 +- springboot/addons/mail/pom.xml | 4 +- .../addons/messaging/implementation/pom.xml | 4 +- springboot/addons/monitoring/core/pom.xml | 8 +- springboot/addons/monitoring/elastic/pom.xml | 4 +- .../addons/monitoring/prometheus/pom.xml | 4 +- .../addons/persistence/filesystem/pom.xml | 4 +- .../addons/persistence/infinispan/pom.xml | 4 +- springboot/addons/persistence/jdbc/pom.xml | 4 +- springboot/addons/persistence/mongodb/pom.xml | 4 +- .../addons/persistence/postgresql/pom.xml | 4 +- springboot/addons/process-management/pom.xml | 4 +- springboot/addons/process-svg/pom.xml | 8 +- .../addons/rest-exception-handler/pom.xml | 4 +- springboot/addons/task-management/pom.xml | 4 +- springboot/addons/tracing-decision/pom.xml | 4 +- springboot/archetype/README.md | 2 +- .../META-INF/archetype-post-generate.groovy | 2 +- 103 files changed, 447 insertions(+), 440 deletions(-) diff --git a/addons/README.md b/addons/README.md index c248666aec7..63aaa4bf5b2 100644 --- a/addons/README.md +++ b/addons/README.md @@ -9,7 +9,7 @@ The following table lists all the add-ons, independent of runtime implementation | Add-On Description | Artifact ID | Since | |------------------------|--------------------------------------|---------------------| -| Human Task Predictions | kogito-addons-human-task-prediction-api | 0.7.0 | +| Human Task Predictions | jbpm-addons-human-task-prediction-api | 0.7.0 | ### Quarkus Implementation diff --git a/addons/common/events/decisions/pom.xml b/addons/common/events/decisions/pom.xml index fdae2fc91e3..0144499a8c5 100644 --- a/addons/common/events/decisions/pom.xml +++ b/addons/common/events/decisions/pom.xml @@ -24,13 +24,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-events-parent + org.kie + kie-addons-events-parent 999-SNAPSHOT - kogito-addons-events-decisions - Kogito :: Add-Ons :: Events :: Event-Driven Decisions + kie-addons-events-decisions + KIE :: Add-Ons :: Events :: Event-Driven Decisions Trigger evaluation of decision models via events @@ -59,8 +59,8 @@ test - org.kie.kogito - kogito-addons-messaging + org.kie + kie-addons-messaging test diff --git a/addons/common/events/mongodb/pom.xml b/addons/common/events/mongodb/pom.xml index 8f167769630..50c7da53b10 100644 --- a/addons/common/events/mongodb/pom.xml +++ b/addons/common/events/mongodb/pom.xml @@ -25,14 +25,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-events-parent + org.kie + kie-addons-events-parent 999-SNAPSHOT - kogito-addons-events-mongodb - Kogito :: Add-Ons :: Events :: MongoDB - Common addon for Kogito Events based on MongoDB + kie-addons-events-mongodb + KIE :: Add-Ons :: Events :: MongoDB + Common addon for KIE Events based on MongoDB org.kie.kogito.events.mongodb @@ -44,8 +44,8 @@ kogito-events-core - org.kie.kogito - kogito-addons-persistence-mongodb + org.kie + kie-addons-persistence-mongodb com.fasterxml.jackson.core diff --git a/addons/common/events/pom.xml b/addons/common/events/pom.xml index dd18af95791..89c1f4f901d 100644 --- a/addons/common/events/pom.xml +++ b/addons/common/events/pom.xml @@ -21,15 +21,15 @@ 4.0.0 - org.kie.kogito + org.kie kogito-addons-common-parent 999-SNAPSHOT - kogito-addons-events-parent + kie-addons-events-parent pom - Kogito :: Add-Ons :: Events :: Parent + KIE :: Add-Ons :: Events :: Parent - Kogito Events + KIE Events decisions diff --git a/addons/common/events/predictions/pom.xml b/addons/common/events/predictions/pom.xml index 0ba1dc18c5a..630354c336f 100644 --- a/addons/common/events/predictions/pom.xml +++ b/addons/common/events/predictions/pom.xml @@ -24,13 +24,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-events-parent + org.kie + kie-addons-events-parent 999-SNAPSHOT - kogito-addons-events-predictions - Kogito :: Add-Ons :: Events :: Event-Driven Predictions + kie-addons-events-predictions + KIE :: Add-Ons :: Events :: Event-Driven Predictions Trigger evaluation of PMML models via events @@ -54,8 +54,8 @@ test - org.kie.kogito - kogito-addons-messaging + org.kie + kie-addons-messaging test diff --git a/addons/common/events/rules/pom.xml b/addons/common/events/rules/pom.xml index b7dec129cb3..f35a7abe7c5 100644 --- a/addons/common/events/rules/pom.xml +++ b/addons/common/events/rules/pom.xml @@ -24,13 +24,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-events-parent + org.kie + kie-addons-events-parent 999-SNAPSHOT - kogito-addons-events-rules - Kogito :: Add-Ons :: Events :: Event-Driven Rules + org.drools + drools-addons-events-rules + Drools :: Add-Ons :: Events :: Event-Driven Rules Trigger evaluation of rule models via events diff --git a/addons/common/explainability/pom.xml b/addons/common/explainability/pom.xml index b978bb77dce..d551c5a3938 100644 --- a/addons/common/explainability/pom.xml +++ b/addons/common/explainability/pom.xml @@ -24,13 +24,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-explainability - Kogito :: Add-Ons :: Explainability + kie-addons-explainability + KIE :: Add-Ons :: Explainability org.kie.kogito.explainability diff --git a/addons/common/human-task-prediction/api/pom.xml b/addons/common/human-task-prediction/api/pom.xml index 9d184a540c4..817ed654aed 100644 --- a/addons/common/human-task-prediction/api/pom.xml +++ b/addons/common/human-task-prediction/api/pom.xml @@ -23,14 +23,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-human-task-prediction-parent + org.jbpm + jbpm-addons-human-task-prediction-parent 999-SNAPSHOT - kogito-addons-human-task-prediction-api - Kogito :: Add-Ons :: Predictions :: API + jbpm-addons-human-task-prediction-api + jBPM :: Add-Ons :: Predictions :: API - Kogito Predictions API + jBPM Predictions API org.kie.kogito.prediction.api diff --git a/addons/common/human-task-prediction/pom.xml b/addons/common/human-task-prediction/pom.xml index 8c2f0ac826d..0c7212c515a 100644 --- a/addons/common/human-task-prediction/pom.xml +++ b/addons/common/human-task-prediction/pom.xml @@ -21,11 +21,12 @@ 4.0.0 - org.kie.kogito + org.kie kogito-addons-common-parent 999-SNAPSHOT - kogito-addons-human-task-prediction-parent + org.jbpm + jbpm-addons-human-task-prediction-parent pom Kogito :: Add-Ons :: Predictions Kogito Predictions diff --git a/addons/common/human-task-prediction/smile/pom.xml b/addons/common/human-task-prediction/smile/pom.xml index 28fd8ebd829..0ac57f042f1 100644 --- a/addons/common/human-task-prediction/smile/pom.xml +++ b/addons/common/human-task-prediction/smile/pom.xml @@ -23,13 +23,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-human-task-prediction-parent + org.jbpm + jbpm-addons-human-task-prediction-parent 999-SNAPSHOT - kogito-addons-human-task-prediction-smile - Kogito :: Add-Ons :: Predictions :: SMILE - Kogito Prediction based on SMILE addon + jbpm-addons-human-task-prediction-smile + jBPM :: Add-Ons :: Predictions :: SMILE + jBPM Prediction based on SMILE addon org.kie.kogito.predictions.smile @@ -49,8 +49,8 @@ - org.kie.kogito - kogito-addons-human-task-prediction-api + org.jbpm + jbpm-addons-human-task-prediction-api com.github.haifengl diff --git a/addons/common/jobs/api/pom.xml b/addons/common/jobs/api/pom.xml index 4aa64a01e6e..b2d3b7c0efd 100644 --- a/addons/common/jobs/api/pom.xml +++ b/addons/common/jobs/api/pom.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-jobs-parent 999-SNAPSHOT diff --git a/addons/common/jobs/management-common/pom.xml b/addons/common/jobs/management-common/pom.xml index 24f4857eb30..d7ab6b3e55b 100644 --- a/addons/common/jobs/management-common/pom.xml +++ b/addons/common/jobs/management-common/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-jobs-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 @@ -42,7 +42,7 @@ kogito-api - org.kie.kogito + org.kie kogito-addons-jobs-api diff --git a/addons/common/jobs/pom.xml b/addons/common/jobs/pom.xml index 01e6d6054b8..b419eb50c1a 100644 --- a/addons/common/jobs/pom.xml +++ b/addons/common/jobs/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - org.kie.kogito + org.kie kogito-addons-common-parent 999-SNAPSHOT diff --git a/addons/common/knative/eventing/pom.xml b/addons/common/knative/eventing/pom.xml index 6f3c34d129c..b4b858b5327 100644 --- a/addons/common/knative/eventing/pom.xml +++ b/addons/common/knative/eventing/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-knative-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-messaging + org.kie + kie-addons-messaging org.junit.jupiter diff --git a/addons/common/knative/pom.xml b/addons/common/knative/pom.xml index 93168640e61..351bb2dd11a 100644 --- a/addons/common/knative/pom.xml +++ b/addons/common/knative/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 diff --git a/addons/common/kubernetes-service-catalog/pom.xml b/addons/common/kubernetes-service-catalog/pom.xml index 7ddd933618b..e2314088e6c 100644 --- a/addons/common/kubernetes-service-catalog/pom.xml +++ b/addons/common/kubernetes-service-catalog/pom.xml @@ -24,13 +24,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-kubernetes-service-catalog - Kogito :: Add-Ons :: Kubernetes Service Catalog + kie-addons-kubernetes-service-catalog + KIE :: Add-Ons :: Kubernetes Service Catalog Common Library for Kubernetes Service Discovery implementations diff --git a/addons/common/kubernetes/pom.xml b/addons/common/kubernetes/pom.xml index 47e568f3af7..c4bfa10de10 100644 --- a/addons/common/kubernetes/pom.xml +++ b/addons/common/kubernetes/pom.xml @@ -24,14 +24,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-kubernetes - Kogito :: Add-Ons :: Kubernetes - Common library for Kogito Kubernetes Addons implementations + kie-addons-kubernetes + KIE :: Add-Ons :: Kubernetes + Common library for KIE Kubernetes Addons implementations org.kie.kogito.addons.k8s diff --git a/addons/common/mail/pom.xml b/addons/common/mail/pom.xml index d0e37ba21fe..009220eec1f 100644 --- a/addons/common/mail/pom.xml +++ b/addons/common/mail/pom.xml @@ -24,13 +24,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-mail - Kogito :: Add-Ons :: E-Mail :: Common + org.jbpm + jbpm-addons-mail + jBPM :: Add-Ons :: E-Mail :: Common org.kie.kogito.mail diff --git a/addons/common/marshallers/avro/pom.xml b/addons/common/marshallers/avro/pom.xml index 92bcb8017e2..23873e42877 100644 --- a/addons/common/marshallers/avro/pom.xml +++ b/addons/common/marshallers/avro/pom.xml @@ -23,13 +23,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-marshallers-parent + org.kie + kie-addons-marshallers-parent 999-SNAPSHOT - kogito-addons-marshallers-avro - Kogito :: Add-Ons :: Marshallers :: Avro + kie-addons-marshallers-avro + KIE :: Add-Ons :: Marshallers :: Avro Kogito Marshallers Unmarshaller for Avro diff --git a/addons/common/marshallers/pom.xml b/addons/common/marshallers/pom.xml index fbad35ed8e8..7f02b1a1d6a 100644 --- a/addons/common/marshallers/pom.xml +++ b/addons/common/marshallers/pom.xml @@ -21,15 +21,15 @@ 4.0.0 - org.kie.kogito + org.kie kogito-addons-common-parent 999-SNAPSHOT - kogito-addons-marshallers-parent + kie-addons-marshallers-parent pom - Kogito :: Add-Ons :: Marshallers :: Parent + KIE :: Add-Ons :: Marshallers :: Parent - Kogito Marshallers and Unmarshallers + KIE Marshallers and Unmarshallers avro diff --git a/addons/common/messaging/pom.xml b/addons/common/messaging/pom.xml index 84c684d48ee..50ed00ef38b 100644 --- a/addons/common/messaging/pom.xml +++ b/addons/common/messaging/pom.xml @@ -23,13 +23,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-common-parent 999-SNAPSHOT - kogito-addons-messaging - Kogito :: Add-Ons :: Messaging + kie-addons-messaging + KIE :: Add-Ons :: Messaging Messaging Add-On Common Interfaces diff --git a/addons/common/monitoring/core/pom.xml b/addons/common/monitoring/core/pom.xml index cf53d4ce549..af648e37f6d 100644 --- a/addons/common/monitoring/core/pom.xml +++ b/addons/common/monitoring/core/pom.xml @@ -23,14 +23,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-addons-monitoring-parent - org.kie.kogito + kie-addons-monitoring-parent + org.kie 999-SNAPSHOT 4.0.0 Kogito :: Add-Ons :: Monitoring Core - kogito-addons-monitoring-core + kie-addons-monitoring-core org.kie.kogito.monitoring.core.common diff --git a/addons/common/monitoring/elastic/pom.xml b/addons/common/monitoring/elastic/pom.xml index 1108f6267ad..ddfd57f2ba7 100644 --- a/addons/common/monitoring/elastic/pom.xml +++ b/addons/common/monitoring/elastic/pom.xml @@ -23,15 +23,15 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-addons-monitoring-parent - org.kie.kogito + kie-addons-monitoring-parent + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-monitoring-elastic + kie-addons-monitoring-elastic - Kogito :: Add-Ons :: Monitoring Elastic Common + KIE :: Add-Ons :: Monitoring Elastic Common Monitoring Elastic Core @@ -40,8 +40,8 @@ - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core io.micrometer @@ -65,8 +65,8 @@ test - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core test-jar test diff --git a/addons/common/monitoring/pom.xml b/addons/common/monitoring/pom.xml index 206067d79a5..4163419c720 100644 --- a/addons/common/monitoring/pom.xml +++ b/addons/common/monitoring/pom.xml @@ -23,12 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-common-parent 999-SNAPSHOT - kogito-addons-monitoring-parent - Kogito :: Add-Ons :: Monitoring + kie-addons-monitoring-parent + KIE :: Add-Ons :: Monitoring pom Monitoring addons for runtime diff --git a/addons/common/monitoring/prometheus/pom.xml b/addons/common/monitoring/prometheus/pom.xml index 020f0b7b490..7f0676cafd7 100644 --- a/addons/common/monitoring/prometheus/pom.xml +++ b/addons/common/monitoring/prometheus/pom.xml @@ -23,14 +23,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-addons-monitoring-parent - org.kie.kogito + kie-addons-monitoring-parent + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-monitoring-prometheus - Kogito :: Add-Ons :: Monitoring Prometheus Common + kie-addons-monitoring-prometheus + KIE :: Add-Ons :: Monitoring Prometheus Common org.kie.kogito.monitoring.prometheus.common.rest @@ -39,8 +39,8 @@ Prometheus monitoring for a kogito application - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core diff --git a/addons/common/persistence/README.md b/addons/common/persistence/README.md index 6be81fae963..402cd49d185 100644 --- a/addons/common/persistence/README.md +++ b/addons/common/persistence/README.md @@ -1,6 +1,6 @@ # Kogito Persistence Add-ons -The Kogito Persistence Add-ons adds persistence capability to Kogito projects.See +The KIE Persistence Add-ons adds persistence capability to Kogito projects.See the [official documentation](https://docs.jboss.org/kogito/release/latest/html_single/#con-persistence_kogito-developing-process-services) to find out more. diff --git a/addons/common/persistence/ddl/pom.xml b/addons/common/persistence/ddl/pom.xml index 347509844f5..a96bf50824c 100644 --- a/addons/common/persistence/ddl/pom.xml +++ b/addons/common/persistence/ddl/pom.xml @@ -23,14 +23,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.kie.kogito - kogito-addons-persistence-parent + org.kie + kie-addons-persistence-parent 999-SNAPSHOT 4.0.0 - kogito-ddl-runtimes - Kogito :: DB Scripts Collection + kie-ddl-runtimes + KIE :: DB Scripts Collection pom diff --git a/addons/common/persistence/filesystem/pom.xml b/addons/common/persistence/filesystem/pom.xml index 2dce567ae9e..748910aeb29 100644 --- a/addons/common/persistence/filesystem/pom.xml +++ b/addons/common/persistence/filesystem/pom.xml @@ -21,14 +21,14 @@ 4.0.0 - org.kie.kogito - kogito-addons-persistence-parent + org.kie + kie-addons-persistence-parent 999-SNAPSHOT - kogito-addons-persistence-filesystem - Kogito :: Add-Ons :: Persistence :: File System + kie-addons-persistence-filesystem + KIE :: Add-Ons :: Persistence :: File System - File System based persistence for Kogito + File System based persistence for KIE org.kie.kogito.persistence.filesystem diff --git a/addons/common/persistence/infinispan/pom.xml b/addons/common/persistence/infinispan/pom.xml index 21dbfa7dc95..82e4912fdb3 100644 --- a/addons/common/persistence/infinispan/pom.xml +++ b/addons/common/persistence/infinispan/pom.xml @@ -23,13 +23,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-persistence-parent + org.kie + kie-addons-persistence-parent 999-SNAPSHOT - kogito-addons-persistence-infinispan - Kogito :: Add-Ons :: Persistence :: Infinispan - Infinispan based persistence for Kogito + kie-addons-persistence-infinispan + KIE :: Add-Ons :: Persistence :: Infinispan + Infinispan based persistence for KIE org.kie.kogito.infinispan diff --git a/addons/common/persistence/jdbc/pom.xml b/addons/common/persistence/jdbc/pom.xml index 9689a7b998c..e6bdd17b503 100644 --- a/addons/common/persistence/jdbc/pom.xml +++ b/addons/common/persistence/jdbc/pom.xml @@ -21,14 +21,14 @@ 4.0.0 - org.kie.kogito - kogito-addons-persistence-parent + org.kie + kie-addons-persistence-parent 999-SNAPSHOT - kogito-addons-persistence-jdbc - Kogito :: Add-Ons :: Persistence :: JDBC + kie-addons-persistence-jdbc + KIE :: Add-Ons :: Persistence :: JDBC - JDBC based persistence for Kogito + JDBC based persistence for KIE org.kie.kogito.persistence.jdbc diff --git a/addons/common/persistence/mongodb/pom.xml b/addons/common/persistence/mongodb/pom.xml index 4e2d00ec996..2fe3c34a9f3 100644 --- a/addons/common/persistence/mongodb/pom.xml +++ b/addons/common/persistence/mongodb/pom.xml @@ -23,15 +23,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.kie.kogito - kogito-addons-persistence-parent + org.kie + kie-addons-persistence-parent 999-SNAPSHOT 4.0.0 - kogito-addons-persistence-mongodb - Kogito :: Add-Ons :: Persistence :: MongoDB - MongoDB based persistence for Kogito + kie-addons-persistence-mongodb + KIE :: Add-Ons :: Persistence :: MongoDB + MongoDB based persistence for KIE org.kie.kogito.mongodb diff --git a/addons/common/persistence/pom.xml b/addons/common/persistence/pom.xml index 2c0f6e201ec..c7c1aa56f8c 100644 --- a/addons/common/persistence/pom.xml +++ b/addons/common/persistence/pom.xml @@ -22,15 +22,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-common-parent 999-SNAPSHOT - kogito-addons-persistence-parent + kie-addons-persistence-parent pom - Kogito :: Add-Ons :: Persistence :: Parent + KIE :: Add-Ons :: Persistence :: Parent - Kogito Persistence Add-Ons Implementations + KIE Persistence Add-Ons Implementations jdbc diff --git a/addons/common/persistence/postgresql/pom.xml b/addons/common/persistence/postgresql/pom.xml index af0fdf275d0..abb4fac0e49 100644 --- a/addons/common/persistence/postgresql/pom.xml +++ b/addons/common/persistence/postgresql/pom.xml @@ -21,14 +21,14 @@ 4.0.0 - org.kie.kogito - kogito-addons-persistence-parent + org.kie + kie-addons-persistence-parent 999-SNAPSHOT - kogito-addons-persistence-postgresql - Kogito :: Add-Ons :: Persistence :: PostgreSQL + kie-addons-persistence-postgresql + KIE :: Add-Ons :: Persistence :: PostgreSQL - PostgreSQL based persistence for Kogito + PostgreSQL based persistence for KIE ../jdbc src/main/resources/db @@ -132,7 +132,7 @@ - + org.apache.maven.plugins maven-resources-plugin diff --git a/addons/common/persistence/rocksdb/pom.xml b/addons/common/persistence/rocksdb/pom.xml index cd3e5914635..6b3ec3be672 100644 --- a/addons/common/persistence/rocksdb/pom.xml +++ b/addons/common/persistence/rocksdb/pom.xml @@ -23,13 +23,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito - kogito-addons-persistence-parent + org.kie + kie-addons-persistence-parent 999-SNAPSHOT - kogito-addons-persistence-rocksdb - Kogito :: Add-Ons :: Persistence :: RocksDB - RocksDB persistence add-on for Kogito + kie-addons-persistence-rocksdb + KIE :: Add-Ons :: Persistence :: RocksDB + RocksDB persistence add-on for KIE org.kie.kogito.persistence.rocksdb diff --git a/addons/common/pom.xml b/addons/common/pom.xml index 4400c2eb3d5..35d262844c8 100644 --- a/addons/common/pom.xml +++ b/addons/common/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 diff --git a/addons/common/process-management/pom.xml b/addons/common/process-management/pom.xml index 792bbb34a37..99bf2ff2ffb 100644 --- a/addons/common/process-management/pom.xml +++ b/addons/common/process-management/pom.xml @@ -24,13 +24,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-process-management - Kogito :: Add-Ons :: Process Management :: Common + kie-addons-process-management + KIE :: Add-Ons :: Process Management :: Common org.kie.kogito.process.management diff --git a/addons/common/process-svg/pom.xml b/addons/common/process-svg/pom.xml index 868ec080b34..40dcb234557 100644 --- a/addons/common/process-svg/pom.xml +++ b/addons/common/process-svg/pom.xml @@ -24,13 +24,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-process-svg - Kogito :: Add-Ons :: Process SVG :: Common + kie-addons-process-svg + KIE :: Add-Ons :: Process SVG :: Common org.kie.kogito.svg diff --git a/addons/common/rest-exception-handler/pom.xml b/addons/common/rest-exception-handler/pom.xml index 3d0c6a77640..0a62912e558 100644 --- a/addons/common/rest-exception-handler/pom.xml +++ b/addons/common/rest-exception-handler/pom.xml @@ -24,13 +24,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-rest-exception-handler - Kogito :: Rest Exception Handler :: Common + kie-addons-rest-exception-handler + KIE :: Rest Exception Handler :: Common org.kie.kogito.resource.exceptions diff --git a/addons/common/task-management/pom.xml b/addons/common/task-management/pom.xml index 93326d039eb..c6bf8f964e8 100644 --- a/addons/common/task-management/pom.xml +++ b/addons/common/task-management/pom.xml @@ -24,13 +24,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-task-management - Kogito :: Add-Ons :: Task Management :: Common + org.jbpm + jbpm-addons-task-management + jBPM :: Add-Ons :: Task Management :: Common org.kie.kogito.task.management.service diff --git a/addons/common/tracing/decision-common/pom.xml b/addons/common/tracing/decision-common/pom.xml index 9261d62b558..5ab47923a6b 100644 --- a/addons/common/tracing/decision-common/pom.xml +++ b/addons/common/tracing/decision-common/pom.xml @@ -23,14 +23,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-addons-tracing-parent - org.kie.kogito + kie-addons-tracing-parent + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-tracing-decision-common - Kogito :: Add-Ons :: Tracing :: Common + kie-addons-tracing-decision-common + KIE :: Add-Ons :: Tracing :: Common org.kie.kogito.tracing.decision @@ -43,8 +43,8 @@ - org.kie.kogito - kogito-addons-tracing-api + org.kie + kie-addons-tracing-api @@ -53,8 +53,8 @@ - org.kie.kogito - kogito-addons-explainability + org.kie + kie-addons-explainability diff --git a/addons/common/tracing/pom.xml b/addons/common/tracing/pom.xml index 55c3c725b6b..f58dad77561 100644 --- a/addons/common/tracing/pom.xml +++ b/addons/common/tracing/pom.xml @@ -24,14 +24,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kogito-addons-common-parent - org.kie.kogito + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-tracing-parent + kie-addons-tracing-parent pom - Kogito :: Add-Ons :: Tracing + KIE :: Add-Ons :: Tracing typedvalue-api diff --git a/addons/common/tracing/tracing-api/pom.xml b/addons/common/tracing/tracing-api/pom.xml index 8ab694787bc..c0150d85057 100644 --- a/addons/common/tracing/tracing-api/pom.xml +++ b/addons/common/tracing/tracing-api/pom.xml @@ -23,14 +23,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-addons-tracing-parent - org.kie.kogito + kie-addons-tracing-parent + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-tracing-api - Kogito :: Add-Ons :: Tracing :: API + kie-addons-tracing-api + KIE :: Add-Ons :: Tracing :: API org.kie.kogito.tracing @@ -42,8 +42,8 @@ kogito-api - org.kie.kogito - kogito-addons-tracing-typedvalue-api + org.kie + kie-addons-tracing-typedvalue-api io.cloudevents diff --git a/addons/common/tracing/typedvalue-api/pom.xml b/addons/common/tracing/typedvalue-api/pom.xml index f7c003ab473..bae307dc41b 100644 --- a/addons/common/tracing/typedvalue-api/pom.xml +++ b/addons/common/tracing/typedvalue-api/pom.xml @@ -23,14 +23,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - kogito-addons-tracing-parent - org.kie.kogito + kie-addons-tracing-parent + org.kie 999-SNAPSHOT 4.0.0 - kogito-addons-tracing-typedvalue-api - Kogito :: Add-Ons :: TypedValue API + kie-addons-tracing-typedvalue-api + KIE :: Add-Ons :: TypedValue API org.kie.kogito.tracing.typedvalue diff --git a/addons/deprecated/README.md b/addons/deprecated/README.md index 49aed765f7d..765713061b9 100644 --- a/addons/deprecated/README.md +++ b/addons/deprecated/README.md @@ -64,29 +64,29 @@ them in your project. > [1] Commons Add-ons that are not supposed to be used by end user's projects. -| Add-On Description | Deprecated Artifact ID | New Artifact ID | Since | -|-----------------------------|--------------------------------------|-------------------------------------------|-------| -| Cloud Events Utils [1] | cloudevents-utils | kogito-events-api (incorporated to core) | 1.8.0 | -| Cloud Events [1] | kogito-cloudevents-common-addon | kogito-addons-cloudevents | 1.8.0 | -| Events Decisions [1] | kogito-event-driven-decisions-common | kogito-addons-events-decisions | 1.8.0 | -| Explainability [1] | explainability-addon-common | kogito-addons-explainability | 1.8.0 | -| Human Task Prediction API | kogito-task-prediction-api | kogito-addons-human-task-prediction-api | 1.8.0 | -| Human Task Prediction Smile | kogito-task-prediction-smile-addon | kogito-addons-human-task-prediction-smile | 1.8.0 | -| Jobs Api [1] | jobs-api | kogito-addons-jobs-api | 1.8.0 | -| Jobs Management [1] | jobs-management-common | kogito-addons-jobs-management-common | 1.8.0 | -| Mail [1] | mail-common-addon | kogito-addons-mail | 1.8.0 | -| Monitoring [1] | monitoring-core-common | kogito-addons-monitoring-core | 1.8.0 | -| Monitoring Elastic [1] | monitoring-elastic-common | kogito-addons-monitoring-elastic | 1.8.0 | -| Monitoring Prometheus [1] | monitoring-prometheus-common | kogito-addons-monitoring-core | 1.8.0 | -| Persistence File System | filesystem-persistence-addon | kogito-addons-persistence-filesystem | 1.8.0 | -| Persistence Infinispan | infinispan-persistence-addon | kogito-addons-persistence-infinispan | 1.8.0 | -| Persistence JDBC | jdbc-persistence-addon | kogito-addons-persistence-jdbc | 1.8.0 | -| Persistence MongoDB | mongodb-persistence-addon | kogito-addons-persistence-mongodb | 1.8.0 | -| Persistence PostgreSQL | postgresql-persistence-addon | kogito-addons-persistence-postgresql | 1.8.0 | -| Process Management [1] | process-management-common | kogito-addons-process-management | 1.8.0 | -| Process SVG [1] | process-svg-common | kogito-addons-process-svg | 1.8.0 | -| REST Exception Handler [1] | kogito-rest-exception-handler-common | kogito-addons-rest-exception-handler | 1.8.0 | -| Task Management [1] | task-management-common | kogito-addons-task-management | 1.8.0 | -| Tracing Decision API [1] | tracing-decision-api | kogito-addons-tracing-decision-api | 1.8.0 | -| Tracing Decision Common [1] | tracing-decision-common | kogito-addons-tracing-decision-common | 1.8.0 | -| Tracing TypedValue API [1] | typedvalue-api | kogito-addons-tracing-typedvalue-api | 1.8.0 | +| Add-On Description | Deprecated Artifact ID | New Artifact ID | Since | +|-----------------------------|--------------------------------------|------------------------------------------|-------| +| Cloud Events Utils [1] | cloudevents-utils | kogito-events-api (incorporated to core) | 1.8.0 | +| Cloud Events [1] | kogito-cloudevents-common-addon | kogito-addons-cloudevents | 1.8.0 | +| Events Decisions [1] | kogito-event-driven-decisions-common | kie-addons-events-decisions | 1.8.0 | +| Explainability [1] | explainability-addon-common | kie-addons-explainability | 1.8.0 | +| Human Task Prediction API | kogito-task-prediction-api | jbpm-addons-human-task-prediction-api | 1.8.0 | +| Human Task Prediction Smile | kogito-task-prediction-smile-addon | jbpm-addons-human-task-prediction-smile | 1.8.0 | +| Jobs Api [1] | jobs-api | kogito-addons-jobs-api | 1.8.0 | +| Jobs Management [1] | jobs-management-common | kogito-addons-jobs-management-common | 1.8.0 | +| Mail [1] | mail-common-addon | jbpm-addons-mail | 1.8.0 | +| Monitoring [1] | monitoring-core-common | kie-addons-monitoring-core | 1.8.0 | +| Monitoring Elastic [1] | monitoring-elastic-common | kie-addons-monitoring-elastic | 1.8.0 | +| Monitoring Prometheus [1] | monitoring-prometheus-common | kie-addons-monitoring-core | 1.8.0 | +| Persistence File System | filesystem-persistence-addon | kie-addons-persistence-filesystem | 1.8.0 | +| Persistence Infinispan | infinispan-persistence-addon | kie-addons-persistence-infinispan | 1.8.0 | +| Persistence JDBC | jdbc-persistence-addon | kie-addons-persistence-jdbc | 1.8.0 | +| Persistence MongoDB | mongodb-persistence-addon | kie-addons-persistence-mongodb | 1.8.0 | +| Persistence PostgreSQL | postgresql-persistence-addon | kie-addons-persistence-postgresql | 1.8.0 | +| Process Management [1] | process-management-common | kie-addons-process-management | 1.8.0 | +| Process SVG [1] | process-svg-common | kie-addons-process-svg | 1.8.0 | +| REST Exception Handler [1] | kogito-rest-exception-handler-common | kie-addons-rest-exception-handler | 1.8.0 | +| Task Management [1] | task-management-common | jbpm-addons-task-management | 1.8.0 | +| Tracing Decision API [1] | tracing-decision-api | kogito-addons-tracing-decision-api | 1.8.0 | +| Tracing Decision Common [1] | tracing-decision-common | kie-addons-tracing-decision-common | 1.8.0 | +| Tracing TypedValue API [1] | typedvalue-api | kie-addons-tracing-typedvalue-api | 1.8.0 | diff --git a/addons/pom.xml b/addons/pom.xml index 99ccea32b31..bc9b366af2a 100644 --- a/addons/pom.xml +++ b/addons/pom.xml @@ -28,6 +28,9 @@ 999-SNAPSHOT ../kogito-build/kogito-build-parent/pom.xml + + org.kie + kogito-addons pom Kogito :: Add-Ons diff --git a/kogito-bom/pom.xml b/kogito-bom/pom.xml index 1cf4e60c3e8..55dd16f1836 100755 --- a/kogito-bom/pom.xml +++ b/kogito-bom/pom.xml @@ -220,24 +220,24 @@ - org.kie.kogito - kogito-addons-messaging + org.kie + kie-addons-messaging ${project.version} - org.kie.kogito - kogito-addons-messaging + org.kie + kie-addons-messaging ${project.version} sources - org.kie.kogito - kogito-addons-marshallers-avro + org.kie + kie-addons-marshallers-avro ${project.version} - org.kie.kogito - kogito-addons-marshallers-avro + org.kie + kie-addons-marshallers-avro ${project.version} sources @@ -258,12 +258,12 @@ sources - org.kie.kogito + org.kie kogito-addons-knative-eventing ${project.version} - org.kie.kogito + org.kie kogito-addons-knative-eventing ${project.version} sources @@ -292,25 +292,25 @@ - org.kie.kogito - kogito-addons-kubernetes + org.kie + kie-addons-kubernetes ${project.version} - org.kie.kogito - kogito-addons-kubernetes + org.kie + kie-addons-kubernetes ${project.version} sources - org.kie.kogito - kogito-addons-kubernetes-service-catalog + org.kie + kie-addons-kubernetes-service-catalog ${project.version} - org.kie.kogito - kogito-addons-kubernetes-service-catalog + org.kie + kie-addons-kubernetes-service-catalog ${project.version} sources @@ -622,13 +622,13 @@ - org.kie.kogito - kogito-addons-monitoring-prometheus + org.kie + kie-addons-monitoring-prometheus ${project.version} - org.kie.kogito - kogito-addons-monitoring-prometheus + org.kie + kie-addons-monitoring-prometheus ${project.version} sources @@ -667,19 +667,19 @@ - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core ${project.version} - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core ${project.version} sources - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core ${project.version} test-jar test @@ -707,13 +707,13 @@ sources - org.kie.kogito - kogito-addons-monitoring-elastic + org.kie + kie-addons-monitoring-elastic ${project.version} - org.kie.kogito - kogito-addons-monitoring-elastic + org.kie + kie-addons-monitoring-elastic ${project.version} sources @@ -765,13 +765,13 @@ - org.kie.kogito - kogito-addons-persistence-infinispan + org.kie + kie-addons-persistence-infinispan ${project.version} - org.kie.kogito - kogito-addons-persistence-infinispan + org.kie + kie-addons-persistence-infinispan ${project.version} sources @@ -787,13 +787,13 @@ sources - org.kie.kogito - kogito-addons-persistence-rocksdb + org.kie + kie-addons-persistence-rocksdb ${project.version} - org.kie.kogito - kogito-addons-persistence-rocksdb + org.kie + kie-addons-persistence-rocksdb ${project.version} sources @@ -986,25 +986,25 @@ - org.kie.kogito - kogito-addons-persistence-postgresql + org.kie + kie-addons-persistence-postgresql ${project.version} - org.kie.kogito - kogito-addons-persistence-postgresql + org.kie + kie-addons-persistence-postgresql ${project.version} sources - org.kie.kogito - kogito-addons-persistence-filesystem + org.kie + kie-addons-persistence-filesystem ${project.version} - org.kie.kogito - kogito-addons-persistence-filesystem + org.kie + kie-addons-persistence-filesystem ${project.version} sources @@ -1020,13 +1020,13 @@ sources - org.kie.kogito - kogito-addons-persistence-mongodb + org.kie + kie-addons-persistence-mongodb ${project.version} - org.kie.kogito - kogito-addons-persistence-mongodb + org.kie + kie-addons-persistence-mongodb ${project.version} sources @@ -1042,13 +1042,13 @@ sources - org.kie.kogito - kogito-addons-persistence-jdbc + org.kie + kie-addons-persistence-jdbc ${project.version} - org.kie.kogito - kogito-addons-persistence-jdbc + org.kie + kie-addons-persistence-jdbc ${project.version} sources @@ -1086,13 +1086,13 @@ sources - org.kie.kogito - kogito-addons-events-mongodb + org.kie + kie-addons-events-mongodb ${project.version} - org.kie.kogito - kogito-addons-events-mongodb + org.kie + kie-addons-events-mongodb ${project.version} sources @@ -1130,13 +1130,13 @@ sources - org.kie.kogito - kogito-addons-process-management + org.kie + kie-addons-process-management ${project.version} - org.kie.kogito - kogito-addons-process-management + org.kie + kie-addons-process-management ${project.version} sources @@ -1220,13 +1220,13 @@ sources - org.kie.kogito - kogito-addons-task-management + org.jbpm + jbpm-addons-task-management ${project.version} - org.kie.kogito - kogito-addons-task-management + org.jbpm + jbpm-addons-task-management ${project.version} sources @@ -1297,13 +1297,13 @@ sources - org.kie.kogito - kogito-addons-mail + org.jbpm + jbpm-addons-mail ${project.version} - org.kie.kogito - kogito-addons-mail + org.jbpm + jbpm-addons-mail ${project.version} sources @@ -1341,13 +1341,13 @@ sources - org.kie.kogito - kogito-addons-rest-exception-handler + org.kie + kie-addons-rest-exception-handler ${project.version} - org.kie.kogito - kogito-addons-rest-exception-handler + org.kie + kie-addons-rest-exception-handler ${project.version} sources @@ -1376,19 +1376,19 @@ - org.kie.kogito - kogito-addons-process-svg + org.kie + kie-addons-process-svg ${project.version} - org.kie.kogito - kogito-addons-process-svg + org.kie + kie-addons-process-svg ${project.version} sources - org.kie.kogito - kogito-addons-process-svg + org.kie + kie-addons-process-svg ${project.version} test-jar @@ -1428,18 +1428,18 @@ - org.kie.kogito + org.kie kogito-addons-jobs-management-common ${project.version} - org.kie.kogito + org.kie kogito-addons-jobs-management-common ${project.version} sources - org.kie.kogito + org.kie kogito-addons-jobs-management-common ${project.version} test-jar @@ -1621,37 +1621,37 @@ sources - org.kie.kogito + org.kie kogito-addons-jobs-api ${project.version} - org.kie.kogito + org.kie kogito-addons-jobs-api ${project.version} sources - org.kie.kogito - kogito-addons-human-task-prediction-api + org.jbpm + jbpm-addons-human-task-prediction-api ${project.version} - org.kie.kogito - kogito-addons-human-task-prediction-api + org.jbpm + jbpm-addons-human-task-prediction-api ${project.version} sources - org.kie.kogito - kogito-addons-human-task-prediction-smile + org.jbpm + jbpm-addons-human-task-prediction-smile ${project.version} - org.kie.kogito - kogito-addons-human-task-prediction-smile + org.jbpm + jbpm-addons-human-task-prediction-smile ${project.version} sources @@ -2538,24 +2538,24 @@ - org.kie.kogito - kogito-addons-tracing-api + org.kie + kie-addons-tracing-api ${project.version} - org.kie.kogito - kogito-addons-tracing-api + org.kie + kie-addons-tracing-api ${project.version} sources - org.kie.kogito - kogito-addons-tracing-decision-common + org.kie + kie-addons-tracing-decision-common ${project.version} - org.kie.kogito - kogito-addons-tracing-decision-common + org.kie + kie-addons-tracing-decision-common ${project.version} sources @@ -2593,26 +2593,26 @@ sources - org.kie.kogito - kogito-addons-tracing-typedvalue-api + org.kie + kie-addons-tracing-typedvalue-api ${project.version} - org.kie.kogito - kogito-addons-tracing-typedvalue-api + org.kie + kie-addons-tracing-typedvalue-api ${project.version} sources - org.kie.kogito - kogito-addons-explainability + org.kie + kie-addons-explainability ${project.version} - org.kie.kogito - kogito-addons-explainability + org.kie + kie-addons-explainability ${project.version} sources @@ -2654,13 +2654,13 @@ - org.kie.kogito - kogito-addons-events-decisions + org.kie + kie-addons-events-decisions ${project.version} - org.kie.kogito - kogito-addons-events-decisions + org.kie + kie-addons-events-decisions ${project.version} sources @@ -2700,13 +2700,13 @@ - org.kie.kogito - kogito-addons-events-predictions + org.kie + kie-addons-events-predictions ${project.version} - org.kie.kogito - kogito-addons-events-predictions + org.kie + kie-addons-events-predictions ${project.version} sources @@ -2746,13 +2746,13 @@ - org.kie.kogito - kogito-addons-events-rules + org.drools + drools-addons-events-rules ${project.version} - org.kie.kogito - kogito-addons-events-rules + org.drools + drools-addons-events-rules ${project.version} sources diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml b/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml index d0a57eadd5b..1aa1202830c 100644 --- a/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml +++ b/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml @@ -78,8 +78,8 @@ test - org.kie.kogito - kogito-addons-persistence-rocksdb + org.kie + kie-addons-persistence-rocksdb test diff --git a/quarkus/addons/events/decisions/runtime/pom.xml b/quarkus/addons/events/decisions/runtime/pom.xml index 2796f3bd0d7..1c8592bd644 100644 --- a/quarkus/addons/events/decisions/runtime/pom.xml +++ b/quarkus/addons/events/decisions/runtime/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-events-decisions + org.kie + kie-addons-events-decisions org.kie diff --git a/quarkus/addons/events/mongodb/runtime/pom.xml b/quarkus/addons/events/mongodb/runtime/pom.xml index d9e90d46055..b260680eab4 100644 --- a/quarkus/addons/events/mongodb/runtime/pom.xml +++ b/quarkus/addons/events/mongodb/runtime/pom.xml @@ -40,8 +40,8 @@ - org.kie.kogito - kogito-addons-events-mongodb + org.kie + kie-addons-events-mongodb io.quarkus diff --git a/quarkus/addons/events/predictions/runtime/pom.xml b/quarkus/addons/events/predictions/runtime/pom.xml index eee06487ee9..7fba5c9c67a 100644 --- a/quarkus/addons/events/predictions/runtime/pom.xml +++ b/quarkus/addons/events/predictions/runtime/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-events-predictions + org.kie + kie-addons-events-predictions org.kie diff --git a/quarkus/addons/events/rules/runtime/pom.xml b/quarkus/addons/events/rules/runtime/pom.xml index 9043f6de051..b1bdce208ff 100644 --- a/quarkus/addons/events/rules/runtime/pom.xml +++ b/quarkus/addons/events/rules/runtime/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-events-rules + org.drools + drools-addons-events-rules org.kie diff --git a/quarkus/addons/explainability/runtime/pom.xml b/quarkus/addons/explainability/runtime/pom.xml index 142646cbbc0..5a36104b6b2 100644 --- a/quarkus/addons/explainability/runtime/pom.xml +++ b/quarkus/addons/explainability/runtime/pom.xml @@ -55,8 +55,8 @@ kogito-api - org.kie.kogito - kogito-addons-explainability + org.kie + kie-addons-explainability diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml index 89fc13cdf73..0f8b22f9f69 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-kubernetes-service-catalog + org.kie + kie-addons-kubernetes-service-catalog io.quarkus @@ -59,8 +59,8 @@ - org.kie.kogito - kogito-addons-kubernetes-service-catalog + org.kie + kie-addons-kubernetes-service-catalog ${project.version} test-jar test diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml index d28e82d3063..86a2acc9ed3 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml @@ -54,8 +54,8 @@ kubernetes-client - org.kie.kogito - kogito-addons-kubernetes + org.kie + kie-addons-kubernetes io.quarkus diff --git a/quarkus/addons/jobs/common/messaging/pom.xml b/quarkus/addons/jobs/common/messaging/pom.xml index 9a910b8a942..8f139166b7c 100644 --- a/quarkus/addons/jobs/common/messaging/pom.xml +++ b/quarkus/addons/jobs/common/messaging/pom.xml @@ -54,7 +54,7 @@ jobs-service-api - org.kie.kogito + org.kie kogito-addons-jobs-api diff --git a/quarkus/addons/jobs/common/rest-callback/pom.xml b/quarkus/addons/jobs/common/rest-callback/pom.xml index fe694489e78..e83959a37be 100644 --- a/quarkus/addons/jobs/common/rest-callback/pom.xml +++ b/quarkus/addons/jobs/common/rest-callback/pom.xml @@ -55,7 +55,7 @@ kogito-services - org.kie.kogito + org.kie kogito-addons-jobs-api diff --git a/quarkus/addons/jobs/management/runtime/pom.xml b/quarkus/addons/jobs/management/runtime/pom.xml index acf605be996..d63813e0ae0 100644 --- a/quarkus/addons/jobs/management/runtime/pom.xml +++ b/quarkus/addons/jobs/management/runtime/pom.xml @@ -46,11 +46,11 @@ jbpm-flow - org.kie.kogito + org.kie kogito-addons-jobs-management-common - org.kie.kogito + org.kie kogito-addons-jobs-api @@ -103,7 +103,7 @@ test - org.kie.kogito + org.kie kogito-addons-jobs-management-common test-jar test diff --git a/quarkus/addons/jobs/messaging/runtime/pom.xml b/quarkus/addons/jobs/messaging/runtime/pom.xml index b2b60f5f91b..36afb0d861e 100644 --- a/quarkus/addons/jobs/messaging/runtime/pom.xml +++ b/quarkus/addons/jobs/messaging/runtime/pom.xml @@ -66,7 +66,7 @@ kogito-api - org.kie.kogito + org.kie kogito-addons-jobs-api diff --git a/quarkus/addons/knative/eventing/runtime/pom.xml b/quarkus/addons/knative/eventing/runtime/pom.xml index b776132de3f..92bc7ce7187 100644 --- a/quarkus/addons/knative/eventing/runtime/pom.xml +++ b/quarkus/addons/knative/eventing/runtime/pom.xml @@ -43,7 +43,7 @@ kie-addons-quarkus-messaging - org.kie.kogito + org.kie kogito-addons-knative-eventing diff --git a/quarkus/addons/kubernetes/runtime/pom.xml b/quarkus/addons/kubernetes/runtime/pom.xml index 34c4530a7ac..2447f4b5d84 100644 --- a/quarkus/addons/kubernetes/runtime/pom.xml +++ b/quarkus/addons/kubernetes/runtime/pom.xml @@ -37,8 +37,8 @@ - org.kie.kogito - kogito-addons-kubernetes-service-catalog + org.kie + kie-addons-kubernetes-service-catalog io.quarkus @@ -57,8 +57,8 @@ kubernetes-client - org.kie.kogito - kogito-addons-kubernetes + org.kie + kie-addons-kubernetes io.quarkus diff --git a/quarkus/addons/mail/runtime/pom.xml b/quarkus/addons/mail/runtime/pom.xml index c7fb44169ec..76150fdc4cd 100644 --- a/quarkus/addons/mail/runtime/pom.xml +++ b/quarkus/addons/mail/runtime/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-mail + org.jbpm + jbpm-addons-mail io.quarkus diff --git a/quarkus/addons/marshallers/avro/runtime/pom.xml b/quarkus/addons/marshallers/avro/runtime/pom.xml index b6f1e2c980e..752d5c99361 100644 --- a/quarkus/addons/marshallers/avro/runtime/pom.xml +++ b/quarkus/addons/marshallers/avro/runtime/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-marshallers-avro + org.kie + kie-addons-marshallers-avro org.kie.kogito diff --git a/quarkus/addons/messaging/common/pom.xml b/quarkus/addons/messaging/common/pom.xml index 63780e8d7fb..26b9f4c3d98 100644 --- a/quarkus/addons/messaging/common/pom.xml +++ b/quarkus/addons/messaging/common/pom.xml @@ -37,8 +37,8 @@ - org.kie.kogito - kogito-addons-messaging + org.kie + kie-addons-messaging org.kie diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml index 945c1b388d3..089aa2507f5 100644 --- a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml +++ b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-kubernetes-service-catalog + org.kie + kie-addons-kubernetes-service-catalog io.quarkus @@ -60,8 +60,8 @@ microprofile-config-api - org.kie.kogito - kogito-addons-kubernetes-service-catalog + org.kie + kie-addons-kubernetes-service-catalog ${project.version} test-jar test diff --git a/quarkus/addons/monitoring/core/pom.xml b/quarkus/addons/monitoring/core/pom.xml index 690d50c4ad0..a69ebfcacde 100644 --- a/quarkus/addons/monitoring/core/pom.xml +++ b/quarkus/addons/monitoring/core/pom.xml @@ -45,8 +45,8 @@ kogito-api - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core @@ -66,8 +66,8 @@ test - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core test-jar test diff --git a/quarkus/addons/monitoring/elastic/runtime/pom.xml b/quarkus/addons/monitoring/elastic/runtime/pom.xml index 078085a1005..3b1428acb4b 100644 --- a/quarkus/addons/monitoring/elastic/runtime/pom.xml +++ b/quarkus/addons/monitoring/elastic/runtime/pom.xml @@ -43,8 +43,8 @@ quarkus-core - org.kie.kogito - kogito-addons-monitoring-elastic + org.kie + kie-addons-monitoring-elastic org.kie diff --git a/quarkus/addons/monitoring/prometheus/runtime/pom.xml b/quarkus/addons/monitoring/prometheus/runtime/pom.xml index 14f5c5700ed..d0c93a1458c 100644 --- a/quarkus/addons/monitoring/prometheus/runtime/pom.xml +++ b/quarkus/addons/monitoring/prometheus/runtime/pom.xml @@ -52,8 +52,8 @@ quarkus-micrometer-registry-prometheus - org.kie.kogito - kogito-addons-monitoring-prometheus + org.kie + kie-addons-monitoring-prometheus org.kie diff --git a/quarkus/addons/persistence/filesystem/runtime/pom.xml b/quarkus/addons/persistence/filesystem/runtime/pom.xml index b05c7a6123b..31ad98d5ab0 100644 --- a/quarkus/addons/persistence/filesystem/runtime/pom.xml +++ b/quarkus/addons/persistence/filesystem/runtime/pom.xml @@ -45,8 +45,8 @@ - org.kie.kogito - kogito-addons-persistence-filesystem + org.kie + kie-addons-persistence-filesystem diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml b/quarkus/addons/persistence/infinispan/runtime/pom.xml index c41d8832f58..4fc149b6251 100644 --- a/quarkus/addons/persistence/infinispan/runtime/pom.xml +++ b/quarkus/addons/persistence/infinispan/runtime/pom.xml @@ -45,8 +45,8 @@ - org.kie.kogito - kogito-addons-persistence-infinispan + org.kie + kie-addons-persistence-infinispan diff --git a/quarkus/addons/persistence/jdbc/runtime/pom.xml b/quarkus/addons/persistence/jdbc/runtime/pom.xml index 7414189ee1b..8b2083cc70b 100644 --- a/quarkus/addons/persistence/jdbc/runtime/pom.xml +++ b/quarkus/addons/persistence/jdbc/runtime/pom.xml @@ -47,8 +47,8 @@ - org.kie.kogito - kogito-addons-persistence-jdbc + org.kie + kie-addons-persistence-jdbc io.quarkus diff --git a/quarkus/addons/persistence/mongodb/runtime/pom.xml b/quarkus/addons/persistence/mongodb/runtime/pom.xml index 2183dd7280b..1203339a9fe 100644 --- a/quarkus/addons/persistence/mongodb/runtime/pom.xml +++ b/quarkus/addons/persistence/mongodb/runtime/pom.xml @@ -45,8 +45,8 @@ - org.kie.kogito - kogito-addons-persistence-mongodb + org.kie + kie-addons-persistence-mongodb io.quarkus diff --git a/quarkus/addons/persistence/postgresql/runtime/pom.xml b/quarkus/addons/persistence/postgresql/runtime/pom.xml index b102aa649f0..584cc425df1 100644 --- a/quarkus/addons/persistence/postgresql/runtime/pom.xml +++ b/quarkus/addons/persistence/postgresql/runtime/pom.xml @@ -50,8 +50,8 @@ - org.kie.kogito - kogito-addons-persistence-postgresql + org.kie + kie-addons-persistence-postgresql diff --git a/quarkus/addons/persistence/rocksdb/deployment/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/KogitoAddOnPersistenceRocksDBProcessor.java b/quarkus/addons/persistence/rocksdb/deployment/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/KogitoAddOnPersistenceRocksDBProcessor.java index cd685a4be68..bf9b9f01445 100644 --- a/quarkus/addons/persistence/rocksdb/deployment/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/KogitoAddOnPersistenceRocksDBProcessor.java +++ b/quarkus/addons/persistence/rocksdb/deployment/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/KogitoAddOnPersistenceRocksDBProcessor.java @@ -40,6 +40,6 @@ FeatureBuildItem feature() { @BuildStep IndexDependencyBuildItem addClassToIndex() { - return new IndexDependencyBuildItem("org.kie.kogito", "kogito-addons-persistence-rocksdb"); + return new IndexDependencyBuildItem("org.kie", "kie-addons-persistence-rocksdb"); } } diff --git a/quarkus/addons/persistence/rocksdb/runtime/pom.xml b/quarkus/addons/persistence/rocksdb/runtime/pom.xml index f287eb264a0..1056cf7965d 100644 --- a/quarkus/addons/persistence/rocksdb/runtime/pom.xml +++ b/quarkus/addons/persistence/rocksdb/runtime/pom.xml @@ -44,8 +44,8 @@ quarkus-arc - org.kie.kogito - kogito-addons-persistence-rocksdb + org.kie + kie-addons-persistence-rocksdb diff --git a/quarkus/addons/process-management/runtime/pom.xml b/quarkus/addons/process-management/runtime/pom.xml index 5aef5830c32..f61b4292fe8 100644 --- a/quarkus/addons/process-management/runtime/pom.xml +++ b/quarkus/addons/process-management/runtime/pom.xml @@ -41,8 +41,8 @@ quarkus-arc - org.kie.kogito - kogito-addons-process-management + org.kie + kie-addons-process-management org.kie.kogito diff --git a/quarkus/addons/process-svg/runtime/pom.xml b/quarkus/addons/process-svg/runtime/pom.xml index 09976dbbba2..679126431a7 100644 --- a/quarkus/addons/process-svg/runtime/pom.xml +++ b/quarkus/addons/process-svg/runtime/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-process-svg + org.kie + kie-addons-process-svg jakarta.ws.rs @@ -81,8 +81,8 @@ test - org.kie.kogito - kogito-addons-process-svg + org.kie + kie-addons-process-svg test-jar test diff --git a/quarkus/addons/rest-exception-handler/pom.xml b/quarkus/addons/rest-exception-handler/pom.xml index b33ca078c92..a5419789ab6 100644 --- a/quarkus/addons/rest-exception-handler/pom.xml +++ b/quarkus/addons/rest-exception-handler/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-rest-exception-handler + org.kie + kie-addons-rest-exception-handler jakarta.ws.rs diff --git a/quarkus/addons/task-management/runtime/pom.xml b/quarkus/addons/task-management/runtime/pom.xml index d3849360e5b..d2d08ce37ab 100644 --- a/quarkus/addons/task-management/runtime/pom.xml +++ b/quarkus/addons/task-management/runtime/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-task-management + org.jbpm + jbpm-addons-task-management org.kie diff --git a/quarkus/addons/tracing-decision/runtime/pom.xml b/quarkus/addons/tracing-decision/runtime/pom.xml index dc2d36f0ab3..c458dc1aebf 100644 --- a/quarkus/addons/tracing-decision/runtime/pom.xml +++ b/quarkus/addons/tracing-decision/runtime/pom.xml @@ -64,8 +64,8 @@ - org.kie.kogito - kogito-addons-tracing-decision-common + org.kie + kie-addons-tracing-decision-common org.kie diff --git a/springboot/addons/events/decisions/pom.xml b/springboot/addons/events/decisions/pom.xml index 2bdacbb22b9..bf9d4240a26 100644 --- a/springboot/addons/events/decisions/pom.xml +++ b/springboot/addons/events/decisions/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-events-decisions + org.kie + kie-addons-events-decisions org.kie diff --git a/springboot/addons/events/mongodb/pom.xml b/springboot/addons/events/mongodb/pom.xml index 0139970f8f1..f7690cd66fb 100644 --- a/springboot/addons/events/mongodb/pom.xml +++ b/springboot/addons/events/mongodb/pom.xml @@ -40,8 +40,8 @@ - org.kie.kogito - kogito-addons-events-mongodb + org.kie + kie-addons-events-mongodb org.springframework.boot diff --git a/springboot/addons/events/predictions/pom.xml b/springboot/addons/events/predictions/pom.xml index 2d6ce331f3d..ceca34b9293 100644 --- a/springboot/addons/events/predictions/pom.xml +++ b/springboot/addons/events/predictions/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-events-predictions + org.kie + kie-addons-events-predictions org.kie diff --git a/springboot/addons/events/rules/pom.xml b/springboot/addons/events/rules/pom.xml index a352823616e..76497187438 100644 --- a/springboot/addons/events/rules/pom.xml +++ b/springboot/addons/events/rules/pom.xml @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-events-rules + org.drools + drools-addons-events-rules org.kie diff --git a/springboot/addons/explainability/pom.xml b/springboot/addons/explainability/pom.xml index 6f5dda2b343..a348befdedf 100644 --- a/springboot/addons/explainability/pom.xml +++ b/springboot/addons/explainability/pom.xml @@ -47,8 +47,8 @@ kogito-api - org.kie.kogito - kogito-addons-explainability + org.kie + kie-addons-explainability diff --git a/springboot/addons/jobs/pom.xml b/springboot/addons/jobs/pom.xml index 119c5b3d630..1254f0d45cd 100644 --- a/springboot/addons/jobs/pom.xml +++ b/springboot/addons/jobs/pom.xml @@ -45,11 +45,11 @@ jbpm-flow - org.kie.kogito + org.kie kogito-addons-jobs-api - org.kie.kogito + org.kie kogito-addons-jobs-management-common @@ -91,7 +91,7 @@ test - org.kie.kogito + org.kie kogito-addons-jobs-management-common test-jar test diff --git a/springboot/addons/kubernetes/pom.xml b/springboot/addons/kubernetes/pom.xml index ce479db0ddd..546bf032856 100644 --- a/springboot/addons/kubernetes/pom.xml +++ b/springboot/addons/kubernetes/pom.xml @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-kubernetes + org.kie + kie-addons-kubernetes org.springframework.cloud diff --git a/springboot/addons/mail/pom.xml b/springboot/addons/mail/pom.xml index b702ac73e6c..b11c1d58b8b 100644 --- a/springboot/addons/mail/pom.xml +++ b/springboot/addons/mail/pom.xml @@ -50,8 +50,8 @@ - org.kie.kogito - kogito-addons-mail + org.jbpm + jbpm-addons-mail diff --git a/springboot/addons/messaging/implementation/pom.xml b/springboot/addons/messaging/implementation/pom.xml index f415d3f2089..a488b3ab1af 100644 --- a/springboot/addons/messaging/implementation/pom.xml +++ b/springboot/addons/messaging/implementation/pom.xml @@ -37,8 +37,8 @@ - org.kie.kogito - kogito-addons-messaging + org.kie + kie-addons-messaging org.springframework.kafka diff --git a/springboot/addons/monitoring/core/pom.xml b/springboot/addons/monitoring/core/pom.xml index 3322a1c0846..f07c2142346 100644 --- a/springboot/addons/monitoring/core/pom.xml +++ b/springboot/addons/monitoring/core/pom.xml @@ -37,8 +37,8 @@ - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core org.springframework.boot @@ -67,8 +67,8 @@ test - org.kie.kogito - kogito-addons-monitoring-core + org.kie + kie-addons-monitoring-core test-jar test diff --git a/springboot/addons/monitoring/elastic/pom.xml b/springboot/addons/monitoring/elastic/pom.xml index ce84aeae4b8..b809e6c0b36 100644 --- a/springboot/addons/monitoring/elastic/pom.xml +++ b/springboot/addons/monitoring/elastic/pom.xml @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-monitoring-elastic + org.kie + kie-addons-monitoring-elastic org.kie diff --git a/springboot/addons/monitoring/prometheus/pom.xml b/springboot/addons/monitoring/prometheus/pom.xml index 1144fd1661f..0a566dbb724 100644 --- a/springboot/addons/monitoring/prometheus/pom.xml +++ b/springboot/addons/monitoring/prometheus/pom.xml @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-monitoring-prometheus + org.kie + kie-addons-monitoring-prometheus org.kie diff --git a/springboot/addons/persistence/filesystem/pom.xml b/springboot/addons/persistence/filesystem/pom.xml index 594e9debd56..c81f3d8a41f 100644 --- a/springboot/addons/persistence/filesystem/pom.xml +++ b/springboot/addons/persistence/filesystem/pom.xml @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-persistence-filesystem + org.kie + kie-addons-persistence-filesystem org.springframework.boot diff --git a/springboot/addons/persistence/infinispan/pom.xml b/springboot/addons/persistence/infinispan/pom.xml index 0f9237aeba6..0c4ff89b469 100644 --- a/springboot/addons/persistence/infinispan/pom.xml +++ b/springboot/addons/persistence/infinispan/pom.xml @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-persistence-infinispan + org.kie + kie-addons-persistence-infinispan org.springframework.boot diff --git a/springboot/addons/persistence/jdbc/pom.xml b/springboot/addons/persistence/jdbc/pom.xml index e2bec34c5b3..12fe4766a38 100644 --- a/springboot/addons/persistence/jdbc/pom.xml +++ b/springboot/addons/persistence/jdbc/pom.xml @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-persistence-jdbc + org.kie + kie-addons-persistence-jdbc org.springframework.boot diff --git a/springboot/addons/persistence/mongodb/pom.xml b/springboot/addons/persistence/mongodb/pom.xml index 37c38d52bc5..053d677b08c 100644 --- a/springboot/addons/persistence/mongodb/pom.xml +++ b/springboot/addons/persistence/mongodb/pom.xml @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-persistence-mongodb + org.kie + kie-addons-persistence-mongodb org.springframework.boot diff --git a/springboot/addons/persistence/postgresql/pom.xml b/springboot/addons/persistence/postgresql/pom.xml index 4ea44f88ea2..025fd3e8088 100644 --- a/springboot/addons/persistence/postgresql/pom.xml +++ b/springboot/addons/persistence/postgresql/pom.xml @@ -39,8 +39,8 @@ - org.kie.kogito - kogito-addons-persistence-postgresql + org.kie + kie-addons-persistence-postgresql org.springframework.boot diff --git a/springboot/addons/process-management/pom.xml b/springboot/addons/process-management/pom.xml index 9a1487e8093..ad172306f08 100644 --- a/springboot/addons/process-management/pom.xml +++ b/springboot/addons/process-management/pom.xml @@ -44,8 +44,8 @@ spring-boot-starter-web - org.kie.kogito - kogito-addons-process-management + org.kie + kie-addons-process-management diff --git a/springboot/addons/process-svg/pom.xml b/springboot/addons/process-svg/pom.xml index d70bc4d13ad..b2f04a0077d 100644 --- a/springboot/addons/process-svg/pom.xml +++ b/springboot/addons/process-svg/pom.xml @@ -37,8 +37,8 @@ - org.kie.kogito - kogito-addons-process-svg + org.kie + kie-addons-process-svg org.kie.kogito @@ -88,8 +88,8 @@ test - org.kie.kogito - kogito-addons-process-svg + org.kie + kie-addons-process-svg test-jar test diff --git a/springboot/addons/rest-exception-handler/pom.xml b/springboot/addons/rest-exception-handler/pom.xml index 404cc54f4ab..fc3b230d04a 100644 --- a/springboot/addons/rest-exception-handler/pom.xml +++ b/springboot/addons/rest-exception-handler/pom.xml @@ -43,8 +43,8 @@ spring-boot-starter-web - org.kie.kogito - kogito-addons-rest-exception-handler + org.kie + kie-addons-rest-exception-handler diff --git a/springboot/addons/task-management/pom.xml b/springboot/addons/task-management/pom.xml index afd8fa0cc08..49aa4a1cc23 100644 --- a/springboot/addons/task-management/pom.xml +++ b/springboot/addons/task-management/pom.xml @@ -48,8 +48,8 @@ kie-addons-springboot-rest-exception-handler - org.kie.kogito - kogito-addons-task-management + org.jbpm + jbpm-addons-task-management diff --git a/springboot/addons/tracing-decision/pom.xml b/springboot/addons/tracing-decision/pom.xml index 77c69984249..221b596ea23 100644 --- a/springboot/addons/tracing-decision/pom.xml +++ b/springboot/addons/tracing-decision/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-addons-tracing-decision-common + org.kie + kie-addons-tracing-decision-common diff --git a/springboot/archetype/README.md b/springboot/archetype/README.md index 03aab8f47e4..2d71d3a5a04 100644 --- a/springboot/archetype/README.md +++ b/springboot/archetype/README.md @@ -63,7 +63,7 @@ For a list of valid add-ons, see these listings: Please note that you don't need to add the suffix `kogito-addons-springboot` to the name of the addon. For example, to include `kie-addons-springboot-monitoring-prometheus` just use `monitoring-prometheus`. For runtime independent -add-ons, just suppress the `kogito-addons` suffix. So for `kogito-addons-persistence-infinispan` +add-ons, just suppress the `kogito-addons` suffix. So for `kie-addons-persistence-infinispan` use `persistence-infinispan`. > You can use `starters` and `addons` together to create a Kogito project that meets your requirements. diff --git a/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy index 44ff5ec5e0f..5d502b70fd8 100644 --- a/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy +++ b/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy @@ -75,7 +75,7 @@ def addonsToArtifactsIds(String addons) { [id: "persistence-jdbc", addon: "kie-addons-springboot-persistence-jdbc"], [id: "persistence-mongodb", addon: "kie-addons-springboot-persistence-mongodb"], [id: "persistence-postgresql", addon: "kie-addons-springboot-persistence-postgresql"], - [id: "human-task-prediction-api", addon: "kogito-addons-human-task-prediction-api"], + [id: "human-task-prediction-api", addon: "jbpm-addons-human-task-prediction-api"], [id: "messaging", addon: "kie-addons-springboot-messaging"], [id: "events-decisions", addon: "kie-addons-springboot-events-decisions"], [id: "events-process-kafka", addon: "kie-addons-springboot-events-process-kafka"],