Skip to content

Commit

Permalink
Merge pull request #26 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 authored May 7, 2024
2 parents 7332d03 + 21dcd7e commit 799d25c
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class ReactiveMessagingEventConsumerTest {
IndexingService service;

@Mock
Event<DataEvent> eventPublisher;
Event<DataEvent<?>> eventPublisher;

@InjectMocks
@Spy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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)
Expand All @@ -72,13 +70,11 @@ public class ProcessDefinitionEntity extends AbstractEntity {
@OneToMany(cascade = CascadeType.ALL, mappedBy = "processDefinition")
private List<NodeEntity> 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<String> 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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> roles;
Expand All @@ -77,7 +76,6 @@ public class ProcessInstanceEntity extends AbstractEntity {
@OneToMany(cascade = CascadeType.ALL, mappedBy = "processInstance")
private List<MilestoneEntity> 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<String> addons;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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<String> 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<String> 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<String> 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<String> potentialUsers;
Expand Down
55 changes: 4 additions & 51 deletions kogito-apps-build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
<!-- OptaPlanner version -->
<version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>

<version.org.hibernate>6.2.13.Final</version.org.hibernate>
<version.org.apache.opennlp>2.3.1</version.org.apache.opennlp>
<version.org.hibernate>6.4.4.Final</version.org.hibernate>
<version.org.apache.opennlp>2.3.2</version.org.apache.opennlp>
<version.org.apache.commons.csv>1.10.0</version.org.apache.commons.csv>
<version.org.jredisearch>2.2.0</version.org.jredisearch>
<version.org.mapstruct>1.5.5.Final</version.org.mapstruct>
<version.org.skyscreamer>1.5.0</version.org.skyscreamer>
<version.com.graphql-java-extended-scalars>19.0</version.com.graphql-java-extended-scalars>
<version.org.skyscreamer>1.5.1</version.org.skyscreamer>
<version.com.graphql-java-extended-scalars>22.0</version.com.graphql-java-extended-scalars>

<!-- Explainability Toolkit version -->
<version.explainability-core>1.22.1.Final</version.explainability-core>
Expand Down Expand Up @@ -131,53 +131,6 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<!-- Remove comments from META-INF/quarkus-javadoc.properties -->
<!-- This is needed because the file generated by quarkus contains a timestamp in a comment that makes the build not reproducible -->
<!-- This workaround can be removed when drools will be migrated to quarkus release containing this fix https://github.com/quarkusio/quarkus/pull/38365 -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-util</artifactId>
<version>${version.drools.util}</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>Remove comments from generated files</id>
<phase>prepare-package</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<includeProjectDependencies>false</includeProjectDependencies>
<includePluginDependencies>true</includePluginDependencies>
<executableDependency>
<groupId>org.drools</groupId>
<artifactId>drools-util</artifactId>
</executableDependency>
<mainClass>org.drools.util.RemoveCommentsMain</mainClass>
<arguments>
<argument>true</argument>
<argument>${project.basedir}/target/classes/META-INF/quarkus-javadoc.properties</argument>
<argument>${project.basedir}/target/classes/META-INF/quarkus-extension.properties</argument>
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/job/http/recipient/JobHttpRecipientRuntimeConfiguration.jdp</argument>
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/job/sink/recipient/JobSinkRecipientRuntimeConfiguration.jdp</argument>
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedRuntimeConfig.jdp</argument>
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexBuildConfig.jdp</argument>
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.jdp</argument>
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.jdp</argument>
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/DevConsoleRuntimeConfig.jdp</argument>
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/UserConfig.jdp</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencyManagement>
Expand Down

0 comments on commit 799d25c

Please sign in to comment.