Skip to content

Commit

Permalink
Merge pull request #48 from rgdoliveira/sync_main
Browse files Browse the repository at this point in the history 
Sync main branch with Apache main branch
  • Loading branch information
@rgdoliveira
rgdoliveira authored Nov 26, 2024
2 parents 4fe7908 + c5b176d commit 5b8fcc1
Show file tree
Hide file tree
Showing 43 changed files with 263 additions and 141 deletions.
45 changes: 33 additions & 12 deletions ...ration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,39 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/src/main/resources/shared</outputDirectory>
<resources>
<resource>
<directory>${common.test.resources.dir}</directory>
<includes>
<include>**/*.bpmn</include>
<include>**/*.sw.json</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/src/main/resources/shared</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>${common.test.resources.dir}</directory>
<includes>
<include>**/*.bpmn</include>
<include>**/*.sw.json</include>
</includes>
</resource>
</resources>
</build>
</project>
45 changes: 33 additions & 12 deletions ...ests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,39 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/src/main/resources/shared</outputDirectory>
<resources>
<resource>
<directory>${common.test.resources.dir}</directory>
<includes>
<include>**/*.bpmn</include>
<include>**/*.sw.json</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/src/main/resources/shared</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>${common.test.resources.dir}</directory>
<includes>
<include>**/*.bpmn</include>
<include>**/*.sw.json</include>
</includes>
</resource>
</resources>
</build>
</project>
46 changes: 33 additions & 13 deletions ...tion-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${version.io.quarkus}</version>
<configuration>
<skipOriginalJarRename>true</skipOriginalJarRename>
</configuration>
Expand All @@ -91,18 +90,39 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/src/main/resources/shared</outputDirectory>
<resources>
<resource>
<directory>${common.test.resources.dir}</directory>
<includes>
<include>**/*.bpmn</include>
<include>**/*.sw.json</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/src/main/resources/shared</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>${common.test.resources.dir}</directory>
<includes>
<include>**/*.bpmn</include>
<include>**/*.sw.json</include>
</includes>
</resource>
</resources>
</build>
</project>
47 changes: 33 additions & 14 deletions ...ation-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,10 @@
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>${common.test.resources.dir}</directory>
<includes>
<include>**/*.bpmn</include>
<include>**/*.sw.json</include>
</includes>
</resource>
</resources>

<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${version.io.quarkus}</version>
<configuration>
<skipOriginalJarRename>true</skipOriginalJarRename>
</configuration>
Expand All @@ -123,6 +109,39 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/src/main/resources/shared</outputDirectory>
<resources>
<resource>
<directory>${common.test.resources.dir}</directory>
<includes>
<include>**/*.bpmn</include>
<include>**/*.sw.json</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${project.basedir}/src/main/resources/shared</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>
</project>
4 changes: 0 additions & 4 deletions ...on-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@
<artifactId>kogito-test-utils</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
</dependencies>

</project>
3 changes: 1 addition & 2 deletions ...-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.util.stream.Collectors;

import org.junit.jupiter.api.Test;
import org.keycloak.representations.AccessTokenResponse;
import org.kie.kogito.explainability.api.CounterfactualSearchDomain;
import org.kie.kogito.explainability.api.CounterfactualSearchDomainCollectionValue;
import org.kie.kogito.explainability.api.CounterfactualSearchDomainStructureValue;
Expand Down Expand Up @@ -183,7 +182,7 @@ public void doTest() {
.param(KEYCLOAK_CLIENT_SECRET_PARAM_NAME, KEYCLOAK_CLIENT_SECRET_PARAM_VALUE)
.when()
.post(KEYCLOAK_ACCESS_TOKEN_PATH)
.as(AccessTokenResponse.class).getToken();
.jsonPath().get("access_token");

assertNotNull(accessToken);

Expand Down
2 changes: 1 addition & 1 deletion ...ests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<properties>
<container.image.kogito-service>org.kie.kogito/integration-tests-trusty-service-springboot:${project.version}</container.image.kogito-service>
<sonar.exclusions>**/KogitoApplication.java</sonar.exclusions>
<version.jib-maven-plugin>3.3.1</version.jib-maven-plugin>
<version.jib-maven-plugin>3.4.4</version.jib-maven-plugin>
<jib-maven-plugin.container.image>eclipse-temurin:17-jre</jib-maven-plugin.container.image>
</properties>

Expand Down
2 changes: 2 additions & 0 deletions data-index/data-index-graphql/src/main/resources/basic.schema.graphqls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ type ProcessInstance {
identity: String
createdBy: String
updatedBy: String
slaDueDate: DateTime
}

type ProcessInstanceError {
Expand Down Expand Up @@ -135,6 +136,7 @@ type NodeInstance {
exit: DateTime
definitionId: String!
nodeId: String!
slaDueDate: DateTime
}

enum MilestoneStatus {
Expand Down
5 changes: 0 additions & 5 deletions data-index/data-index-service/data-index-service-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,6 @@
<artifactId>json-unit-assertj</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-test-utils</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions .../test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.Test;
import org.keycloak.representations.AccessTokenResponse;
import org.kie.kogito.testcontainers.KogitoKeycloakContainer;
import org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource;

Expand Down Expand Up @@ -97,6 +96,6 @@ private String getAccessToken(String userName) {
.param("client_secret", KogitoKeycloakContainer.CLIENT_SECRET)
.when()
.post(keycloakURL + "/protocol/openid-connect/token")
.as(AccessTokenResponse.class).getToken();
.jsonPath().get("access_token");
}
}
5 changes: 0 additions & 5 deletions data-index/data-index-service/data-index-service-infinispan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,6 @@
<artifactId>kogito-quarkus-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions data-index/data-index-service/data-index-service-inmemory/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@
<artifactId>kogito-quarkus-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions data-index/data-index-service/data-index-service-mongodb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,6 @@
<artifactId>kogito-quarkus-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions data-index/data-index-service/data-index-service-postgresql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@
<artifactId>kogito-quarkus-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
Expand Down
11 changes: 11 additions & 0 deletions ...storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/NodeInstance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public class NodeInstance {
@JsonProperty("leaveTime")
private ZonedDateTime exit;

private ZonedDateTime slaDueDate;

@JsonProperty("nodeDefinitionId")
private String definitionId;

Expand Down Expand Up @@ -97,6 +99,14 @@ public void setName(String name) {
this.name = name;
}

public ZonedDateTime getSlaDueDate() {
return slaDueDate;
}

public void setSlaDueDate(ZonedDateTime slaDueDate) {
this.slaDueDate = slaDueDate;
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand Down Expand Up @@ -125,6 +135,7 @@ public String toString() {
", type='" + type + '\'' +
", enter=" + enter +
", exit=" + exit +
", slaDueDate=" + slaDueDate +
", definitionId='" + definitionId + '\'' +
'}';
}
Expand Down
Loading

0 comments on commit 5b8fcc1

Please sign in to comment.