From 85f93038f6210c045e8527bf7144f12f4baa704c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Mon, 26 Feb 2024 16:54:42 +0100 Subject: [PATCH 1/2] incubator-kie-issues#933: Rename `SonataFlow` Quarkus Extensions in `kogito-runtimes` change groupId to `org.apache.kie.sonataflow` --- 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 +++--- .../common/deployment/KogitoCapability.java | 2 +- .../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 +- 35 files changed, 166 insertions(+), 165 deletions(-) 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/KogitoCapability.java b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java index 04fc92c3dd1..611665993ce 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 @@ -32,7 +32,7 @@ public final class KogitoCapability { 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 SERVERLESS_WORKFLOW = new KogitoCapability("org.apache.kie.sonataflow.serverless-workflow", "sonataflow-quarkus"); public static final List ENGINES = asList( KogitoCapability.DECISIONS, 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 9443197ca6bfc5fee10067478e27c479bca44658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A0ndez?= Date: Tue, 12 Mar 2024 12:45:10 +0100 Subject: [PATCH 2/2] Improving `KogitoCapability` verifications to include new extension GAV's --- .../AnyEngineKogitoAddOnProcessor.java | 4 +- .../common/deployment/KogitoCapability.java | 18 ++++----- .../deployment/KogitoCapabilityExtension.java | 38 +++++++++++++++++++ .../OneOfCapabilityKogitoAddOnProcessor.java | 4 +- ...RequireCapabilityKogitoAddOnProcessor.java | 4 +- 5 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapabilityExtension.java 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 611665993ce..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.apache.kie.sonataflow.serverless-workflow", "sonataflow-quarkus"); + 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");