Skip to content

Commit

Permalink
Revert "incubator-kie-issues#933: Rename SonataFlow Quarkus Extensi…
Browse files Browse the repository at this point in the history 
…ons in `…" (apache#3422)

This reverts commit 18b8d43.
  • Loading branch information
@pefernan @rgdoliveira
pefernan authored and rgdoliveira committed Mar 11, 2024
1 parent d47a11a commit 5bbc16a
Show file tree
Hide file tree
Showing 35 changed files with 162 additions and 167 deletions.
52 changes: 26 additions & 26 deletions kogito-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,24 +269,24 @@
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-camel</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-camel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-camel</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-camel</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-camel-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-camel-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-camel-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-camel-deployment</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
Expand Down Expand Up @@ -1992,24 +1992,24 @@
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-python</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-serverless-workflow-python</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-python</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-serverless-workflow-python</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-python-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-serverless-workflow-python-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-python-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-serverless-workflow-python-deployment</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
Expand Down Expand Up @@ -2247,19 +2247,19 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -2314,23 +2314,23 @@
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<groupId>org.sonataflow</groupId>
<artifactId>sonataflow-quarkus-devui</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<groupId>org.sonataflow</groupId>
<artifactId>sonataflow-quarkus-devui</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<groupId>org.sonataflow</groupId>
<artifactId>sonataflow-quarkus-devui-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<groupId>org.sonataflow</groupId>
<artifactId>sonataflow-quarkus-devui-deployment</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
Expand Down
18 changes: 9 additions & 9 deletions quarkus/addons/camel/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<parent>
<artifactId>sonataflow-addons-quarkus-camel-parent</artifactId>
<groupId>org.apache.sonataflow</groupId>
<artifactId>kogito-addons-quarkus-camel-parent</artifactId>
<groupId>org.kie.kogito</groupId>
<version>999-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -33,21 +33,21 @@
<java.module.name>org.kie.kogito.addons.quarkus.camel.deployment</java.module.name>
</properties>

<name>SonataFlow :: Add-Ons :: Quarkus :: Camel :: Deployment</name>
<description>SonataFlow Quarkus Camel Integration with Serverless Workflow</description>
<artifactId>sonataflow-addons-quarkus-camel-deployment</artifactId>
<name>Kogito :: Add-Ons :: Quarkus :: Camel :: Deployment</name>
<description>Kogito Quarkus Camel Integration with Serverless Workflow</description>
<artifactId>kogito-addons-quarkus-camel-deployment</artifactId>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-camel</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-camel</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/kie/kogito/addons/quarkus/camel/deployment/KogitoAddonsQuarkusCamelProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

public class KogitoAddonsQuarkusCamelProcessor extends RequireCapabilityKogitoAddOnProcessor {

private static final String FEATURE = "sonataflow-addons-quarkus-camel";
private static final String FEATURE = "kogito-addons-quarkus-camel";

public KogitoAddonsQuarkusCamelProcessor() {
super(KogitoCapability.SERVERLESS_WORKFLOW);
Expand Down
26 changes: 13 additions & 13 deletions quarkus/addons/camel/integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,29 @@
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">
<parent>
<artifactId>sonataflow-addons-quarkus-camel-parent</artifactId>
<groupId>org.apache.sonataflow</groupId>
<artifactId>kogito-addons-quarkus-camel-parent</artifactId>
<groupId>org.kie.kogito</groupId>
<version>999-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>


<name>SonataFlow :: Add-Ons :: Quarkus :: Camel :: Integration Tests</name>
<description>SonataFlow Quarkus Camel Integration with Serverless Workflow</description>
<artifactId>sonataflow-addons-quarkus-camel-integration-tests</artifactId>
<name>Kogito :: Add-Ons :: Quarkus :: Camel :: Integration Tests</name>
<description>Kogito Quarkus Camel Integration with Serverless Workflow</description>
<artifactId>kogito-addons-quarkus-camel-integration-tests</artifactId>

<properties>
<java.module.name>org.kie.kogito.addons.quarkus.camel.integration.test</java.module.name>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-camel</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-camel</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -83,8 +83,8 @@

<!-- this is used implicitly by quarkus tests so let's make Maven aware of it. necessary to run the tests in parallel. -->
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-camel-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-camel-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand All @@ -96,8 +96,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
7 changes: 3 additions & 4 deletions quarkus/addons/camel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-addons-quarkus-camel-parent</artifactId>
<name>SonataFlow :: Add-Ons :: Quarkus :: Camel :: Parent</name>
<description>SonataFlow Quarkus Camel Integration with Serverless Workflow</description>
<artifactId>kogito-addons-quarkus-camel-parent</artifactId>
<name>Kogito :: Add-Ons :: Quarkus :: Camel :: Parent</name>
<description>Kogito Quarkus Camel Integration with Serverless Workflow</description>
<modules>
<module>deployment</module>
<module>runtime</module>
Expand Down
18 changes: 9 additions & 9 deletions quarkus/addons/camel/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<parent>
<artifactId>sonataflow-addons-quarkus-camel-parent</artifactId>
<groupId>org.apache.sonataflow</groupId>
<artifactId>kogito-addons-quarkus-camel-parent</artifactId>
<groupId>org.kie.kogito</groupId>
<version>999-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<name>SonataFlow :: Add-Ons :: Quarkus :: Camel :: Runtimes</name>
<description>SonataFlow Quarkus Camel Integration with Serverless Workflow</description>
<artifactId>sonataflow-addons-quarkus-camel</artifactId>
<name>Kogito :: Add-Ons :: Quarkus :: Camel :: Runtimes</name>
<description>Kogito Quarkus Camel Integration with Serverless Workflow</description>
<artifactId>kogito-addons-quarkus-camel</artifactId>

<properties>
<java.module.name>org.kie.kogito.addons.quarkus.camel.runtime</java.module.name>
Expand All @@ -40,8 +40,8 @@

<dependencies>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -74,7 +74,7 @@
<configuration>
<deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
<capabilities>
<provides>org.apache.sonataflow.addons.camel</provides>
<provides>org.sonataflow.addons.camel</provides>
</capabilities>
</configuration>
</execution>
Expand All @@ -94,4 +94,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion ...yment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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", "kogito-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.sonataflow.serverless-workflow", "sonataflow-quarkus");
public static final KogitoCapability SERVERLESS_WORKFLOW = new KogitoCapability("org.sonataflow.serverless-workflow", "kogito-quarkus-serverless-workflow");

public static final List<KogitoCapability> ENGINES = asList(
KogitoCapability.DECISIONS,
Expand Down
8 changes: 4 additions & 4 deletions quarkus/addons/knative/eventing/integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@

<dependencies>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow</artifactId>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
Expand All @@ -76,8 +76,8 @@

<!-- this is used implicitly by Quarkus tests so let's make Maven aware of it -->
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
8 changes: 4 additions & 4 deletions quarkus/addons/knative/serving/integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
<artifactId>quarkus-smallrye-openapi</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -117,8 +117,8 @@
</dependency>

<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions quarkus/addons/kubernetes/integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<artifactId>quarkus-smallrye-openapi</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
8 changes: 4 additions & 4 deletions quarkus/addons/messaging/integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@

<dependencies>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -82,8 +82,8 @@

<!-- this is used implicitly by quarkus tests so let's make Maven aware of it -->
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
8 changes: 4 additions & 4 deletions quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
<artifactId>quarkus-smallrye-openapi</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -93,8 +93,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sonataflow</groupId>
<artifactId>sonataflow-quarkus-deployment</artifactId>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit 5bbc16a

Please sign in to comment.