Merge pull request #37 from rgdoliveira/sync_main

Sync main branch with Apache main branch
kiegroup · Aug 26, 2024 · 07ec421 · 07ec421
2 parents b2e9426 + e7dbfd1
commit 07ec421
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 5 deletions.
diff --git a/.github/workflows/pr-kogito-examples.yml b/.github/workflows/pr-kogito-examples.yml
@@ -23,7 +23,7 @@ jobs:
         job_name: [ kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples ]
         os: [ubuntu-latest]
         java-version: [17]
-        maven-version: ['3.9.3']
+        maven-version: ['3.9.6']
         include:
           - job_name: kogito-quarkus-examples
             repository: kogito-examples

diff --git a/...quarkus-metrics/src/test/java/org/kie/kogito/examples/quarkus/GrafanaDockerComposeIT.java b/...quarkus-metrics/src/test/java/org/kie/kogito/examples/quarkus/GrafanaDockerComposeIT.java
@@ -69,7 +69,7 @@ public class GrafanaDockerComposeIT {
                                     .withStartupTimeout(STARTUP_MINUTES_TIMEOUT))
                     .withLogConsumer("prometheus-1", new Slf4jLogConsumer(LOGGER))
                     .withPull(false)
-                    .withLocalCompose(true);                   
+                    .withLocalCompose(true);
         } catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }

diff --git a/kogito-quarkus-examples/dmn-pmml-quarkus-example/pom.xml b/kogito-quarkus-examples/dmn-pmml-quarkus-example/pom.xml
@@ -88,6 +88,75 @@
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-pmml</artifactId>
+      <exclusions>
+        <!-- Drools models -->
+        <!-- Tree -->
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-tree-model</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-tree-compiler</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-tree-evaluator</artifactId>
+        </exclusion>
+        <!-- Scorecard -->
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-scorecard-model</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-scorecard-compiler</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-scorecard-evaluator</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie.kogito</groupId>
+          <artifactId>kogito-drools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-mvel</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-mvel-parser</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-model-compiler</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-compiler</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-canonical-model</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-wiring-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-ruleunit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie.kogito</groupId>
+          <artifactId>kogito-efesto-drl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

diff --git a/kogito-quarkus-examples/pmml-quarkus-example/pom.xml b/kogito-quarkus-examples/pmml-quarkus-example/pom.xml
@@ -84,6 +84,75 @@
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-pmml</artifactId>
+      <exclusions>
+        <!-- Drools models -->
+        <!-- Tree -->
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-tree-model</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-tree-compiler</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-tree-evaluator</artifactId>
+        </exclusion>
+        <!-- Scorecard -->
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-scorecard-model</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-scorecard-compiler</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-pmml-models-drools-scorecard-evaluator</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie.kogito</groupId>
+          <artifactId>kogito-drools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-mvel</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-mvel-parser</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-model-compiler</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-compiler</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-canonical-model</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-wiring-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.drools</groupId>
+          <artifactId>drools-ruleunit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie.kogito</groupId>
+          <artifactId>kogito-efesto-drl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/kogito-quarkus-examples/pom.xml b/kogito-quarkus-examples/pom.xml
@@ -133,7 +133,6 @@
         <module>dmn-quarkus-example</module>
         <module>dmn-resource-jar-quarkus-example</module>
         <module>dmn-multiple-models-quarkus-example</module>
-        <module>dmn-tracing-quarkus</module>
         <module>flexible-process-quarkus</module>
         <module>kogito-travel-agency</module>
         <module>onboarding-example</module>
@@ -174,7 +173,6 @@
         </property>
       </activation>
       <modules>
-        <module>trusty-tracing-quarkus-devservices</module>
       </modules>
     </profile>
 

diff --git a/kogito-quarkus-examples/process-performance-client/pom.xml b/kogito-quarkus-examples/process-performance-client/pom.xml
@@ -77,6 +77,10 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-events-api</artifactId>

diff --git a/...s-performance-client/src/main/java/org/kie/kogito/performance/client/KafkaDispatcher.java b/...s-performance-client/src/main/java/org/kie/kogito/performance/client/KafkaDispatcher.java
@@ -31,6 +31,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 
 public class KafkaDispatcher implements RequestDispatcher {
 
@@ -46,7 +47,7 @@ public ObjectCloudEvent(String trigger, Object data) {
 
     public KafkaDispatcher(String trigger) {
         this.trigger = trigger;
-        this.objectMapper = ObjectMapperFactory.get();
+        this.objectMapper = ObjectMapperFactory.get().disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
         Map<String, Object> properties = Collections.singletonMap(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
                 "localhost:9092");
         kafkaProducer = new KafkaProducer<>(properties, new ByteArraySerializer(), new ByteArraySerializer());