Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync main branch with Apache main branch #37

Merged
merged 5 commits into from
Aug 26, 2024
Merged

Sync main branch with Apache main branch #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c495bc4
[incubator-kie-issues-1401] Fix build kogito-examples.build-and-test …
rgdoliveira Aug 26, 2024
03742df
Fix GrafanaDockerComposeIT format (#2001)
gmunozfe Aug 20, 2024
66bc3af
Updating to maven 3.9.6 (#2002)
fjtirado Aug 21, 2024
825f058
Do not serialize as timestamp (#2000)
fjtirado Aug 21, 2024
e7dbfd1
[incubator-kie-issues#1441] Excluding drools implementations from pmm…
gitgabrio Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr-kogito-examples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...quarkus-metrics/src/test/java/org/kie/kogito/examples/quarkus/GrafanaDockerComposeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
69 changes: 69 additions & 0 deletions kogito-quarkus-examples/dmn-pmml-quarkus-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
69 changes: 69 additions & 0 deletions kogito-quarkus-examples/pmml-quarkus-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions kogito-quarkus-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -174,7 +173,6 @@
</property>
</activation>
<modules>
<module>trusty-tracing-quarkus-devservices</module>
</modules>
</profile>

Expand Down
4 changes: 4 additions & 0 deletions kogito-quarkus-examples/process-performance-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion ...s-performance-client/src/main/java/org/kie/kogito/performance/client/KafkaDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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());
Expand Down
Loading