diff --git a/api/kogito-api/pom.xml b/api/kogito-api/pom.xml
index cec9ac55aab..d1b266a0ad6 100755
--- a/api/kogito-api/pom.xml
+++ b/api/kogito-api/pom.xml
@@ -61,7 +61,6 @@
jakarta.xml.bind
jakarta.xml.bind-api
provided
- 4.0.1
diff --git a/kogito-build/kogito-build-no-bom-parent/pom.xml b/kogito-build/kogito-build-no-bom-parent/pom.xml
index d13e70d16dd..ab2e6a2191e 100644
--- a/kogito-build/kogito-build-no-bom-parent/pom.xml
+++ b/kogito-build/kogito-build-no-bom-parent/pom.xml
@@ -699,58 +699,6 @@
org.apache.maven.plugins
maven-checkstyle-plugin
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
- org.drools
- drools-util
- ${version.drools.util}
-
-
-
-
- Remove comments from generated files
- prepare-package
-
- java
-
-
- false
- true
-
- org.drools
- drools-util
-
- org.drools.util.RemoveCommentsMain
-
- true
- ${project.basedir}/target/classes/META-INF/quarkus-javadoc.properties
- ${project.basedir}/target/classes/META-INF/quarkus-extension.properties
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/addons/quarkus/knative/eventing/deployment/EventingConfiguration.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/addons/quarkus/knative/eventing/deployment/SinkConfiguration.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/events/config/EventsRuntimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/config/KogitoBuildTimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/config/KogitoEventingRuntimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/config/KogitoRuntimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/serverless/workflow/config/KogitoBuildTimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/serverless/workflow/config/KogitoRPCRuntimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/serverless/workflow/config/KogitoServerlessWorkflowBuildTimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/serverless/workflow/config/KogitoServerlessWorkflowRuntimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/serverless/workflow/config/KogitoBuildTimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/workflow/deployment/config/KogitoWorkflowBuildTimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/quarkus/workflow/deployment/config/KogitoDevServicesBuildTimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/tracing/decision/quarkus/deployment/KogitoBuildTimeConfig.jdp
- ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/tracing/decision/quarkus/deployment/KogitoDevServicesBuildTimeConfig.jdp
-
-
-
-
-
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
index 908b525de32..6bd08cc5ed9 100644
--- a/kogito-build/kogito-dependencies-bom/pom.xml
+++ b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -16,43 +16,40 @@
- 3.2.10.Final
+ 3.8.4
${version.io.quarkus}
3.2.4
- 3.4.0
+ 3.6.1
1.0.86
- 2.15.2
- 2.15.2
+ 2.16.1
+ 2.16.1
2.9.0
2.4.10
- 1.0.0-preview.20220705
+ 1.0.0-preview.20240207
2.0.1
- 2.3.0
- 0.2.0
- 2.1.0
- 0.1.3
+ 2.4.1
+ 0.3.0
+ 2.2.0
+ 0.2.1
1.5.2
- 3.25.1
- 2.15.2
- 4.18.0
+ 3.25.8
+ 2.16.1
+ 4.31.0
2.35.1
- 3.22.0
+ 3.25.0
2.10.1
- 21.5.0.0
- 2.3.0.1
- 2.3.5
+ 4.0.4
2.0.1
- 1.3.2
- 1.3.2
2.0.1
- 2.0.1.Final
- 2.3.1
3.1.1
1.4.12
+ 2.1.1
+ 3.0.2
+ 4.0.1
2.3.0
- 6.7.2
- 1.11.1
- 9.16.3
- 42.6.0
+ 6.10.0
+ 1.12.2
+ 9.22.3
+ 42.7.2
4.0.5.Final
- 3.4.0
+ 3.10.0
4.2.0
- 3.7.2
+ 3.10.0
- 4.4.6
- 1.56.0
+ 4.5.7
+ 1.59.1
- 3.0.0-M1
+ 3.9.0
2.1.19
2.2.19
- 3.12.0
+ 3.14.0
- 23.0.1
+ 23.1.2
- 14.0.7.Final
- 4.6.2.Final
+ 14.0.25.Final
+ 4.6.5.Final
7.10.2
3.1.0
6.2.7.Final
- 21.0.1
+ 23.0.7
2.12-2.2.1
4.9.1
@@ -100,21 +97,20 @@
13.4-alpine3.14
1.11.3
- 3.22.0
+ 3.24.2
+ 4.0.4
2.9.0
1.3
- 10.2
- 5.${version.org.junit.minor}
+ 5.10.2
5.10.2
5.10.2
1.10.2
- 1.5.0
- 4.11.0
- 1.17.6
+ 5.2.0
+ 1.19.6
2.9.1
5.3.2
- 1.14.7
+ 1.14.11
2.5.0.Final
1.0.4
@@ -133,8 +129,8 @@
1.0-1
4.2.0
1.0
- 32.0.0-jre
- 1.26.0
+ 32.0.1-jre
+ 1.26.1
@@ -448,13 +444,6 @@
test
-
- org.junit-pioneer
- junit-pioneer
- ${version.org.junit.pioneer}
- test
-
-
org.mockito
mockito-core
@@ -600,7 +589,7 @@
jakarta.xml.bind
jakarta.xml.bind-api
- 4.0.0
+ ${version.jakarta.xml.bind-api}
com.sun.xml.bind
@@ -610,7 +599,7 @@
org.glassfish.jaxb
jaxb-runtime
- 4.0.3
+ ${version.org.glassfish.jaxb}
org.eclipse.angus
@@ -620,7 +609,7 @@
jakarta.validation
jakarta.validation-api
- 3.0.2
+ ${version.jakarta.validation-api}
jakarta.inject
@@ -630,7 +619,7 @@
jakarta.annotation
jakarta.annotation-api
- 2.1.1
+ ${version.jakarta.annotation-api}
org.eclipse.microprofile.openapi
diff --git a/kogito-test-utils/pom.xml b/kogito-test-utils/pom.xml
index a21e7b36a9d..e59f902ce8f 100644
--- a/kogito-test-utils/pom.xml
+++ b/kogito-test-utils/pom.xml
@@ -54,8 +54,13 @@
${version.org.testcontainers}
compile
-
-
+
+
+ org.junit.jupiter
+ junit-jupiter
+ compile
+
+
org.kie.kogito
kogito-api
diff --git a/quarkus/addons/messaging/common/pom.xml b/quarkus/addons/messaging/common/pom.xml
index 26b9f4c3d98..7df56e97ab0 100644
--- a/quarkus/addons/messaging/common/pom.xml
+++ b/quarkus/addons/messaging/common/pom.xml
@@ -96,11 +96,6 @@
quarkus-junit5
test
-
- org.junit-pioneer
- junit-pioneer
- test
-
org.assertj
assertj-core
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
index b4a65353103..ebd0f167544 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
@@ -41,7 +41,7 @@ public class QuarkusTopicDiscovery extends AbstractTopicDiscovery {
@Override
protected List getTopics() {
final List topics = new ArrayList<>();
- ConfigProvider.getConfig().getPropertyNames().forEach(n -> {
+ getPropertyNames().forEach(n -> {
if (n.startsWith(OUTGOING_PREFIX)) {
final String topicName = this.extractChannelName(n, OUTGOING_PREFIX);
if (topics.stream().noneMatch(t -> t.getName().equals(topicName) && t.getType() == ChannelType.OUTGOING)) {
@@ -68,7 +68,15 @@ private String extractChannelName(String property, String prefix) {
if (channelName.contains(".")) {
channelName = channelName.substring(0, channelName.indexOf("."));
}
- final Optional topicName = ConfigProvider.getConfig().getOptionalValue(prefix + channelName + TOPIC_SUFFIX, String.class);
+ final Optional topicName = getOptionalValue(prefix + channelName + TOPIC_SUFFIX);
return topicName.orElse(channelName);
}
+
+ Iterable getPropertyNames() {
+ return ConfigProvider.getConfig().getPropertyNames();
+ }
+
+ Optional getOptionalValue(String key) {
+ return ConfigProvider.getConfig().getOptionalValue(key, String.class);
+ }
}
diff --git a/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscoveryTest.java b/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscoveryTest.java
index 984f5fa3631..ad7ebdbb82a 100644
--- a/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscoveryTest.java
+++ b/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscoveryTest.java
@@ -18,13 +18,9 @@
*/
package org.kie.kogito.addon.quarkus.messaging.common;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
-import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.ClearSystemProperty;
-import org.junitpioneer.jupiter.SetSystemProperty;
+import org.junit.jupiter.api.*;
import org.kie.kogito.addon.cloudevents.AbstractTopicDiscovery;
import org.kie.kogito.event.ChannelType;
import org.kie.kogito.event.EventKind;
@@ -32,49 +28,45 @@
import org.kie.kogito.event.TopicDiscovery;
import org.kie.kogito.event.cloudevents.CloudEventMeta;
+import static java.util.Map.entry;
import static org.assertj.core.api.Assertions.assertThat;
class QuarkusTopicDiscoveryTest {
@Test
- @SetSystemProperty(key = "mp.messaging.outgoing.processedtravellers.connector", value = "quarkus-http")
- @SetSystemProperty(key = "mp.messaging.outgoing.processedtravellers.url", value = "http://localhost:8080/")
- @SetSystemProperty(key = "mp.messaging.incoming.kogito_incoming_stream.connector", value = "smallrye-kafka")
- @SetSystemProperty(key = "mp.messaging.incoming.kogito_incoming_stream.topic", value = "mycooltopic")
void verifyTopicsWithPropertiesSet() {
final List expectedTopics = new ArrayList<>();
expectedTopics.add(new Topic("processedtravellers", ChannelType.OUTGOING));
expectedTopics.add(new Topic("mycooltopic", ChannelType.INCOMING));
- final TopicDiscovery discovery = new QuarkusTopicDiscovery();
+ final TopicDiscovery discovery = getTopicDiscovery(entry("mp.messaging.outgoing.processedtravellers.connector", "quarkus-http"),
+ entry("mp.messaging.outgoing.processedtravellers.url", "http://localhost:8080/"),
+ entry("mp.messaging.incoming.kogito_incoming_stream.connector", "smallrye-kafka"),
+ entry("mp.messaging.incoming.kogito_incoming_stream.topic", "mycooltopic"));
+
final List topics = discovery.getTopics(Collections.emptyList());
assertThat(topics).hasSize(2);
expectedTopics.forEach(e -> assertThat(topics.stream().anyMatch(t -> t.getName().equals(e.getName()) && t.getType() == e.getType())).isTrue());
}
@Test
- @SetSystemProperty(key = "mp.messaging.outgoing.processedtravellers.connector", value = "quarkus-http")
- @SetSystemProperty(key = "mp.messaging.outgoing.processedtravellers.url", value = "http://localhost:8080/")
- @SetSystemProperty(key = "mp.messaging.outgoing.processedtravellers.topic", value = "mycooltopic")
- @SetSystemProperty(key = "mp.messaging.incoming.kogito_incoming_stream.connector", value = "smallrye-kafka")
- @SetSystemProperty(key = "mp.messaging.incoming.kogito_incoming_stream.topic", value = "mycooltopic")
void verifyTopicsWithPropertiesSameTopic() {
final List expectedTopics = new ArrayList<>();
expectedTopics.add(new Topic("mycooltopic", ChannelType.OUTGOING));
expectedTopics.add(new Topic("mycooltopic", ChannelType.INCOMING));
- final TopicDiscovery discovery = new QuarkusTopicDiscovery();
+ final TopicDiscovery discovery = getTopicDiscovery(entry("mp.messaging.outgoing.processedtravellers.connector", "quarkus-http"),
+ entry("mp.messaging.outgoing.processedtravellers.url", "http://localhost:8080/"),
+ entry("mp.messaging.outgoing.processedtravellers.topic", "mycooltopic"),
+ entry("mp.messaging.incoming.kogito_incoming_stream.connector", "smallrye-kafka"),
+ entry("mp.messaging.incoming.kogito_incoming_stream.topic", "mycooltopic"));
+
final List topics = discovery.getTopics(Collections.emptyList());
assertThat(topics).hasSize(2);
expectedTopics.forEach(e -> assertThat(topics.stream().anyMatch(t -> t.getName().equals(e.getName()) && t.getType() == e.getType())).isTrue());
}
@Test
- @ClearSystemProperty(key = "mp.messaging.outgoing.processedtravellers.connector")
- @ClearSystemProperty(key = "mp.messaging.outgoing.processedtravellers.url")
- @ClearSystemProperty(key = "mp.messaging.outgoing.processedtravellers.topic")
- @ClearSystemProperty(key = "mp.messaging.incoming.kogito_incoming_stream.connector")
- @ClearSystemProperty(key = "mp.messaging.incoming.kogito_incoming_stream.topic")
void verifyTopicsWithNoPropertiesSet() {
final List expectedTopics = new ArrayList<>();
expectedTopics.add(AbstractTopicDiscovery.DEFAULT_OUTGOING_CHANNEL);
@@ -83,21 +75,49 @@ void verifyTopicsWithNoPropertiesSet() {
eventsMeta.add(new CloudEventMeta("event1", "", EventKind.CONSUMED));
eventsMeta.add(new CloudEventMeta("event2", "", EventKind.PRODUCED));
- final TopicDiscovery discovery = new QuarkusTopicDiscovery();
+ final TopicDiscovery discovery = new QuarkusTopicDiscovery() {
+ Iterable getPropertyNames() {
+ return new HashSet<>();
+ }
+
+ Optional getOptionalValue(String key) {
+ return Optional.empty();
+ }
+ };
final List topics = discovery.getTopics(eventsMeta);
assertThat(topics).hasSize(2);
expectedTopics.forEach(e -> assertThat(topics.stream().anyMatch(t -> t.getName().equals(e.getName()) && t.getType() == e.getType())).isTrue());
}
@Test
- @ClearSystemProperty(key = "mp.messaging.outgoing.processedtravellers.connector")
- @ClearSystemProperty(key = "mp.messaging.outgoing.processedtravellers.url")
- @ClearSystemProperty(key = "mp.messaging.outgoing.processedtravellers.topic")
- @ClearSystemProperty(key = "mp.messaging.incoming.kogito_incoming_stream.connector")
- @ClearSystemProperty(key = "mp.messaging.incoming.kogito_incoming_stream.topic")
void verifyTopicsWithPropertiesAndChannels() {
- final TopicDiscovery discovery = new QuarkusTopicDiscovery();
+ final TopicDiscovery discovery = new QuarkusTopicDiscovery() {
+ Iterable getPropertyNames() {
+ return new HashSet<>();
+ }
+
+ Optional getOptionalValue(String key) {
+ return Optional.empty();
+ }
+ };
final List topics = discovery.getTopics(Collections.emptyList());
assertThat(topics).isEmpty();
}
+
+ private TopicDiscovery getTopicDiscovery(Map.Entry... entries) {
+ return new QuarkusTopicDiscovery() {
+ final Map properties = Map.ofEntries(entries);
+
+ @Override
+ Iterable getPropertyNames() {
+ return properties.keySet();
+ }
+
+ @Override
+ Optional getOptionalValue(String key) {
+ return Optional.ofNullable(properties.get(key));
+ }
+ };
+ }
+
}
diff --git a/quarkus/bom/pom.xml b/quarkus/bom/pom.xml
index 10f5e98f237..2532c6a27ab 100755
--- a/quarkus/bom/pom.xml
+++ b/quarkus/bom/pom.xml
@@ -37,7 +37,7 @@
Internal BOM descriptor for Kogito modules targeting Quarkus use-cases. Specific dependencies targeting the Quarkus platform must be added here.
- 6.7.2
+ 6.10.0
diff --git a/quarkus/integration-tests/integration-tests-quarkus-gradle/integration-tests-quarkus-gradle-project/gradle/wrapper/gradle-wrapper.properties b/quarkus/integration-tests/integration-tests-quarkus-gradle/integration-tests-quarkus-gradle-project/gradle/wrapper/gradle-wrapper.properties
index b9d53324a82..a6a3d0f4258 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-gradle/integration-tests-quarkus-gradle-project/gradle/wrapper/gradle-wrapper.properties
+++ b/quarkus/integration-tests/integration-tests-quarkus-gradle/integration-tests-quarkus-gradle-project/gradle/wrapper/gradle-wrapper.properties
@@ -19,6 +19,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml
index c89ca244180..cb98062e9f1 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml
@@ -71,11 +71,6 @@
rest-assured
test
-
- io.quarkus
- quarkus-test-infinispan-client
- test
-
org.assertj
assertj-core