From 21dcd7ef9cabf5f49d4d14b96396d8161c37f6eb Mon Sep 17 00:00:00 2001 From: Alex Porcelli Date: Thu, 2 May 2024 17:31:42 +0200 Subject: [PATCH] Quarkus LTS Upgrade to 3.8.4 (#2039) * Upgrade to and align with Quarkus 3.8.4 LTS release. * Remove unnecessary util class execution, as Quarkus 3.8.x does not have the issue anymore. * trigger build --- .../ReactiveMessagingEventConsumerTest.java | 2 +- .../kogito/index/jpa/model/NodeEntity.java | 1 - .../jpa/model/ProcessDefinitionEntity.java | 4 -- .../jpa/model/ProcessInstanceEntity.java | 2 - .../jpa/model/UserTaskInstanceEntity.java | 5 -- kogito-apps-build-parent/pom.xml | 55 ++----------------- 6 files changed, 5 insertions(+), 64 deletions(-) diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java index d8d4710228..8e0cd2d5b2 100644 --- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java +++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java @@ -52,7 +52,7 @@ public class ReactiveMessagingEventConsumerTest { IndexingService service; @Mock - Event eventPublisher; + Event> eventPublisher; @InjectMocks @Spy diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java index 73a125cea7..7eaab4dfd1 100644 --- a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java @@ -50,7 +50,6 @@ public class NodeEntity extends AbstractEntity { private String type; @ElementCollection - @JoinColumn(name = "node_id") @CollectionTable(name = "definitions_nodes_metadata", joinColumns = { @JoinColumn(name = "node_id", referencedColumnName = "id"), @JoinColumn(name = "process_id", referencedColumnName = "process_id"), @JoinColumn(name = "process_version", referencedColumnName = "process_version") }, foreignKey = @ForeignKey(name = "fk_definitions_nodes_metadata_definitions_nodes")) diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java index 63e965a2a0..100dc79c16 100644 --- a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java @@ -54,14 +54,12 @@ public class ProcessDefinitionEntity extends AbstractEntity { private byte[] source; @ElementCollection - @JoinColumn(name = "id") @CollectionTable(name = "definitions_roles", joinColumns = { @JoinColumn(name = "process_id"), @JoinColumn(name = "process_version") }, foreignKey = @ForeignKey(name = "fk_definitions_roles_definitions")) @Column(name = "role", nullable = false) private Set roles; @ElementCollection - @JoinColumn(name = "id") @CollectionTable(name = "definitions_addons", joinColumns = { @JoinColumn(name = "process_id"), @JoinColumn(name = "process_version") }, foreignKey = @ForeignKey(name = "fk_definitions_addons_definitions")) @Column(name = "addon", nullable = false) @@ -72,13 +70,11 @@ public class ProcessDefinitionEntity extends AbstractEntity { @OneToMany(cascade = CascadeType.ALL, mappedBy = "processDefinition") private List nodes; @ElementCollection - @JoinColumn(name = "id") @CollectionTable(name = "definitions_annotations", joinColumns = { @JoinColumn(name = "process_id", referencedColumnName = "id"), @JoinColumn(name = "process_version", referencedColumnName = "version") }, foreignKey = @ForeignKey(name = "fk_definitions_annotations")) @Column(name = "value") private Set annotations; @ElementCollection - @JoinColumn(name = "id") @CollectionTable(name = "definitions_metadata", joinColumns = { @JoinColumn(name = "process_id", referencedColumnName = "id"), @JoinColumn(name = "process_version", referencedColumnName = "version") }, foreignKey = @ForeignKey(name = "fk_definitions_metadata")) diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java index 0d8a731fb8..7046de267b 100644 --- a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java @@ -53,7 +53,6 @@ public class ProcessInstanceEntity extends AbstractEntity { private String businessKey; private String endpoint; @ElementCollection - @JoinColumn(name = "process_id") @CollectionTable(name = "processes_roles", joinColumns = @JoinColumn(name = "process_id", foreignKey = @ForeignKey(name = "fk_processes_roles_processes"))) @Column(name = "role", nullable = false) private Set roles; @@ -77,7 +76,6 @@ public class ProcessInstanceEntity extends AbstractEntity { @OneToMany(cascade = CascadeType.ALL, mappedBy = "processInstance") private List milestones; @ElementCollection - @JoinColumn(name = "process_id") @CollectionTable(name = "processes_addons", joinColumns = @JoinColumn(name = "process_id", foreignKey = @ForeignKey(name = "fk_processes_addons_processes"))) @Column(name = "addon", nullable = false) private Set addons; diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java index 0127a7687e..0021a0eb20 100644 --- a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java @@ -53,29 +53,24 @@ public class UserTaskInstanceEntity extends AbstractEntity { private String state; private String actualOwner; @ElementCollection - @JoinColumn(name = "task_id") @CollectionTable(name = "tasks_admin_groups", joinColumns = @JoinColumn(name = "task_id", foreignKey = @ForeignKey(name = "fk_tasks_admin_groups_tasks"))) @Column(name = "group_id", nullable = false) private Set adminGroups; @ElementCollection - @JoinColumn(name = "task_id") @CollectionTable(name = "tasks_admin_users", joinColumns = @JoinColumn(name = "task_id", foreignKey = @ForeignKey(name = "fk_tasks_admin_users_tasks"))) @Column(name = "user_id", nullable = false) private Set adminUsers; private ZonedDateTime completed; private ZonedDateTime started; @ElementCollection - @JoinColumn(name = "task_id") @CollectionTable(name = "tasks_excluded_users", joinColumns = @JoinColumn(name = "task_id", foreignKey = @ForeignKey(name = "fk_tasks_excluded_users_tasks"))) @Column(name = "user_id", nullable = false) private Set excludedUsers; @ElementCollection - @JoinColumn(name = "task_id") @CollectionTable(name = "tasks_potential_groups", joinColumns = @JoinColumn(name = "task_id", foreignKey = @ForeignKey(name = "fk_tasks_potential_groups_tasks"))) @Column(name = "group_id", nullable = false) private Set potentialGroups; @ElementCollection - @JoinColumn(name = "task_id") @CollectionTable(name = "tasks_potential_users", joinColumns = @JoinColumn(name = "task_id", foreignKey = @ForeignKey(name = "fk_tasks_potential_users_tasks"))) @Column(name = "user_id", nullable = false) private Set potentialUsers; diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml index 644a451609..f698d6d180 100644 --- a/kogito-apps-build-parent/pom.xml +++ b/kogito-apps-build-parent/pom.xml @@ -62,13 +62,13 @@ 999-SNAPSHOT - 6.2.13.Final - 2.3.1 + 6.4.4.Final + 2.3.2 1.10.0 2.2.0 1.5.5.Final - 1.5.0 - 19.0 + 1.5.1 + 22.0 1.22.1.Final @@ -131,53 +131,6 @@ - - - - - - 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/job/http/recipient/JobHttpRecipientRuntimeConfiguration.jdp - ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/job/sink/recipient/JobSinkRecipientRuntimeConfiguration.jdp - ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedRuntimeConfig.jdp - ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexBuildConfig.jdp - ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.jdp - ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.jdp - ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/DevConsoleRuntimeConfig.jdp - ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/UserConfig.jdp - - - - - -