From 3520043a095c24b711fc216b98357df40475962f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Thu, 29 Feb 2024 11:16:57 +0100 Subject: [PATCH] * codestart fix --- addons/deprecated/README.md | 54 +++++++++---------- quarkus/addons/README.md | 2 +- .../quarkus/dmn/KogitoDMNCodeCodestartIT.java | 8 ++- .../pom.xml | 4 +- .../ServerlessWorkflowCodestartTest.java | 2 +- .../codestart.yml | 4 +- .../resources/META-INF/quarkus-extension.yaml | 2 +- .../pom.xml | 4 +- 8 files changed, 39 insertions(+), 41 deletions(-) diff --git a/addons/deprecated/README.md b/addons/deprecated/README.md index 595423f8c17..49aed765f7d 100644 --- a/addons/deprecated/README.md +++ b/addons/deprecated/README.md @@ -7,33 +7,33 @@ them in your project. #### Quarkus Add-ons -| Add-On Description | Deprecated Artifact ID | New Artifact ID | Since | -|-------------------------|---------------------------------------------|----------------------------------------------------|--------| -| Cloud Events | kogito-cloudevents-quarkus-addon | kie-addons-quarkus-messaging | 1.8.0 | -| Cloud Events Common | kogito-cloudevents-quarkus-common-addon | kie-addons-quarkus-messaging-common | 1.8.0 | -| Cloud Events Multi | kogito-cloudevents-quarkus-multi-addon | kie-addons-quarkus-messaging | 1.8.0 | -| Events Decisions | kogito-event-driven-decisions-quarkus-addon | kogito-addons-quarkus-events-decisions | 1.8.0 | -| Events Smallrye | kogito-events-reactive-messaging-addon | kie-addons-quarkus-events-decisions | 1.8.0 | -| Explainability | explainability-quarkus-addon | kie-addons-quarkus-explainability | 1.8.0 | -| Jobs Management | jobs-management-quarkus-addon | kogito-addons-quarkus-jobs-management | 1.8.0 | -| Knative Eventing | knative-eventing-addon | kie-addons-quarkus-knative-eventing | 1.6.0 | -| Mail | mail-quarkus-addon | jbpm-addons-quarkus-mail | 1.8.0 | -| Monitoring Core | monitoring-core-quarkus-addon | kie-addons-quarkus-monitoring-core | 1.8.0 | -| Monitoring Elastic | monitoring-elastic-quarkus-addon | kie-addons-quarkus-monitoring-elastic | 1.8.0 | -| Monitoring Prometheus | monitoring-prometheus-quarkus-addon | kie-addons-quarkus-monitoring-prometheus | 1.8.0 | -| Persistence ISPN Health | infinispan-quarkus-health-addon | kie-addons-quarkus-persistence-infinispan-health | 1.8.0 | -| Persistence Infinispan | kogito-addons-persistence-infinispan | kie-addons-quarkus-persistence-infinispan | 1.12.0 | -| Persistence Kafka | kafka-persistence-addon | kie-addons-quarkus-persistence-kafka | 1.8.0 | -| Persistence FileSystem | kogito-addons-persistence-filesystem | kie-addons-quarkus-persistence-filesystem | 1.12.0 | -| Persistence JDBC | kogito-addons-persistence-jdbc | kie-addons-quarkus-persistence-jdbc | 1.12.0 | -| Persistence MongoDB | kogito-addons-persistence-mongodb | kie-addons-quarkus-persistence-mongodb | 1.12.0 | -| Persistence Postgresql | kogito-addons-persistence-postgresql | kie-addons-quarkus-persistence-postgresql | 1.12.0 | -| Process Management | process-management-addon | kie-addons-quarkus-process-management | 1.8.0 | -| Process SVG | process-svg-quarkus-addon | kie-addons-quarkus-process-svg | 1.8.0 | -| REST Exception Handler | kogito-rest-exception-handler-quarkus | kie-addons-quarkus-rest-exception-handler | 1.8.0 | -| Task Management | task-management-quarkus-addon | jbpm-addons-quarkus-task-management | 1.8.0 | -| Task Notification | task-notification-quarkus-addon | jbpm-addons-quarkus-task-notification | 1.8.0 | -| Tracing Decision | tracing-decision-quarkus-addon | kie-addons-quarkus-tracing-decision | 1.8.0 | +| Add-On Description | Deprecated Artifact ID | New Artifact ID | Since | +|-------------------------|---------------------------------------------|--------------------------------------------------|--------| +| Cloud Events | kogito-cloudevents-quarkus-addon | kie-addons-quarkus-messaging | 1.8.0 | +| Cloud Events Common | kogito-cloudevents-quarkus-common-addon | kie-addons-quarkus-messaging-common | 1.8.0 | +| Cloud Events Multi | kogito-cloudevents-quarkus-multi-addon | kie-addons-quarkus-messaging | 1.8.0 | +| Events Decisions | kogito-event-driven-decisions-quarkus-addon | kie-addons-quarkus-events-decisions | 1.8.0 | +| Events Smallrye | kogito-events-reactive-messaging-addon | kie-addons-quarkus-events-process | 1.8.0 | +| Explainability | explainability-quarkus-addon | kie-addons-quarkus-explainability | 1.8.0 | +| Jobs Management | jobs-management-quarkus-addon | kogito-addons-quarkus-jobs-management | 1.8.0 | +| Knative Eventing | knative-eventing-addon | kie-addons-quarkus-knative-eventing | 1.6.0 | +| Mail | mail-quarkus-addon | jbpm-addons-quarkus-mail | 1.8.0 | +| Monitoring Core | monitoring-core-quarkus-addon | kie-addons-quarkus-monitoring-core | 1.8.0 | +| Monitoring Elastic | monitoring-elastic-quarkus-addon | kie-addons-quarkus-monitoring-elastic | 1.8.0 | +| Monitoring Prometheus | monitoring-prometheus-quarkus-addon | kie-addons-quarkus-monitoring-prometheus | 1.8.0 | +| Persistence ISPN Health | infinispan-quarkus-health-addon | kie-addons-quarkus-persistence-infinispan-health | 1.8.0 | +| Persistence Infinispan | kogito-addons-persistence-infinispan | kie-addons-quarkus-persistence-infinispan | 1.12.0 | +| Persistence Kafka | kafka-persistence-addon | kie-addons-quarkus-persistence-kafka | 1.8.0 | +| Persistence FileSystem | kogito-addons-persistence-filesystem | kie-addons-quarkus-persistence-filesystem | 1.12.0 | +| Persistence JDBC | kogito-addons-persistence-jdbc | kie-addons-quarkus-persistence-jdbc | 1.12.0 | +| Persistence MongoDB | kogito-addons-persistence-mongodb | kie-addons-quarkus-persistence-mongodb | 1.12.0 | +| Persistence Postgresql | kogito-addons-persistence-postgresql | kie-addons-quarkus-persistence-postgresql | 1.12.0 | +| Process Management | process-management-addon | kie-addons-quarkus-process-management | 1.8.0 | +| Process SVG | process-svg-quarkus-addon | kie-addons-quarkus-process-svg | 1.8.0 | +| REST Exception Handler | kogito-rest-exception-handler-quarkus | kie-addons-quarkus-rest-exception-handler | 1.8.0 | +| Task Management | task-management-quarkus-addon | jbpm-addons-quarkus-task-management | 1.8.0 | +| Task Notification | task-notification-quarkus-addon | jbpm-addons-quarkus-task-notification | 1.8.0 | +| Tracing Decision | tracing-decision-quarkus-addon | kie-addons-quarkus-tracing-decision | 1.8.0 | #### Spring Boot Add-ons diff --git a/quarkus/addons/README.md b/quarkus/addons/README.md index fe1baac2ee4..5a575158ac1 100644 --- a/quarkus/addons/README.md +++ b/quarkus/addons/README.md @@ -6,7 +6,7 @@ In this module you will find all the add-ons supported by the community for Quar | Add-On Description | Artifact ID | Since | |------------------------|---------------------------------------------|--------| -| Events Decisions | kogito-addons-quarkus-events-decisions | 1.2.0 | +| Events Decisions | kie-addons-quarkus-events-decisions | 1.2.0 | | Events Predictions | kogito-addons-quarkus-events-predictions | 1.12.0 | | Events Rules | drools-addons-quarkus-events-rules | 1.12.0 | | Events Smallrye | kogito-addons-quarkus-events-smallrye | 0.3.0 | diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java index e6ca905b5d2..25d5c9e80cf 100644 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java @@ -26,8 +26,8 @@ import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey; import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest; -import io.quarkus.maven.ArtifactCoords; -import io.quarkus.maven.ArtifactKey; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Language.JAVA; @@ -52,9 +52,7 @@ public static String projectVersion() { @RegisterExtension public static QuarkusCodestartTest codestartTest = QuarkusCodestartTest.builder() - //.setupStandaloneExtensionTest("org.drools:drools-quarkus-decisions") //TODO Revert back once Quarkus LTS is upgraded to 2.10+ - .standaloneExtensionCatalog() - .extension(ArtifactCoords.fromString("org.drools:drools-quarkus-decisions:" + projectVersion())) + .setupStandaloneExtensionTest("org.drools:drools-quarkus-decisions") .extension(ArtifactKey.fromString("io.quarkus:quarkus-resteasy-jackson")) // account for KOGITO-5817 .extension(ArtifactCoords.fromString("org.assertj:assertj-core:" + assertjVersion())) .putData(QuarkusDataKey.APP_CONFIG, Map.of("quarkus.http.test-port", "0")) 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 a923c81501a..79fc1e7fe6f 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 @@ -63,7 +63,7 @@ org.kie - kie-addons-quarkus-events-decisions + kie-addons-quarkus-events-process io.quarkus @@ -149,7 +149,7 @@ org.kie - kie-addons-quarkus-events-decisions-deployment + kie-addons-quarkus-events-process-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 4b3a860a0e6..ea85e14e8d2 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.sonataflow:sonataflow-quarkus") + .setupStandaloneExtensionTest("org.apache.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/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/codestart.yml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/codestart.yml index f7c37505ef9..01ef2302158 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-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,5 +1,5 @@ -name: sonataflow-serverless-workflow-codestart -ref: sonataflow-serverless-workflow +name: sonataflow-quarkus-codestart +ref: sonataflow-quarkus type: code tags: extension-codestart metadata: 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 8ed4688ebd7..b39085db0dd 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 @@ -16,7 +16,7 @@ metadata: config: - "kogito." codestart: - name: "kogito-serverless-workflow-codestart" + name: "sonataflow-quarkus-codestart" languages: - "java" artifact: "org.apache.sonataflow:sonataflow-quarkus:codestarts:jar:${project.version}" \ No newline at end of file diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml index a5b684127dc..aa39bc275b6 100644 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml @@ -59,7 +59,7 @@ org.kie - kie-addons-quarkus-events-decisions + kie-addons-quarkus-events-process org.jbpm @@ -187,7 +187,7 @@ org.kie - kie-addons-quarkus-events-decisions-deployment + kie-addons-quarkus-events-process-deployment ${project.version} pom test