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

[JBPM-9402] AuditDataReplicationKieServerTest is in probably in deadlock #2261

Merged
merged 1 commit into from
Oct 5, 2020
Merged

[JBPM-9402] AuditDataReplicationKieServerTest is in probably in deadlock #2261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 1 addition & 29 deletions ...boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,29 +211,7 @@
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>org.amqphub.spring</groupId>
<artifactId>amqp-10-jms-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.messaginghub</groupId>
<artifactId>pooled-jms</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>


<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-artemis</artifactId>
Expand Down Expand Up @@ -265,12 +243,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-amqp-protocol</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down
25 changes: 0 additions & 25 deletions ...er/spring/boot/autoconfiguration/audit/replication/AuditDataReplicationKieServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;

import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
import org.assertj.core.api.Assertions;
import org.jbpm.process.audit.NodeInstanceLog;
import org.jbpm.process.audit.VariableInstanceLog;
Expand All @@ -26,7 +21,6 @@
import org.jbpm.services.task.audit.impl.model.BAMTaskSummaryImpl;
import org.jbpm.services.task.audit.impl.model.TaskEventImpl;
import org.jbpm.services.task.audit.impl.model.TaskVariableImpl;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
Expand Down Expand Up @@ -78,7 +72,6 @@ public class AuditDataReplicationKieServerTest {
@Autowired
private UserTaskService userTaskService;

protected static final EmbeddedActiveMQ embedded = new EmbeddedActiveMQ();

@Autowired
@Qualifier("auditDataReplicationConsumer")
Expand All @@ -87,24 +80,6 @@ public class AuditDataReplicationKieServerTest {
@BeforeClass
public static void startUp() throws Exception {
KieJarBuildHelper.createKieJar("src/test/resources/kjar/");
Configuration config = new ConfigurationImpl();
config.setSecurityEnabled(false);
config.addAcceptorConfiguration("amqp-acceptor", "tcp://localhost:10022?protocols=AMQP");

CoreQueueConfiguration auditQueue = new CoreQueueConfiguration();
auditQueue.setAddress("audit-queue");
auditQueue.setRoutingType(RoutingType.ANYCAST);
auditQueue.setName("audit-queue");
config.addQueueConfiguration(auditQueue);

embedded.setConfiguration(config);
embedded.start();

}

@AfterClass
public static void shutDown() throws Exception {
embedded.stop();
}

@Before
Expand Down
11 changes: 4 additions & 7 deletions ...configuration-audit-replication/src/test/resources/application-integrationtest.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ server.address=0.0.0.0
server.port=8090

cxf.path=/rest
cxf.jaxrs.classes-scan=true
cxf.jaxrs.classes-scan-packages=com.company.service



#kie server config
kieserver.serverId=business-application-service
Expand All @@ -24,16 +20,17 @@ kieserver.dmn.enabled=true
kieserver.jbpm.enabled=true
kieserver.jbpmui.enabled=true
kieserver.casemgmt.enabled=true
kieserver.history.url=http://localhost:8095


#audit replication configuration
kieserver.audit-replication.producer=true
kieserver.audit-replication.consumer=true
kieserver.audit-replication.queue=audit-queue
amqphub.amqp10jms.remote-url=amqp://localhost:10022
amqphub.amqp10jms.pool.enabled=true
#kieserver.prometheus.enabled=true

spring.artemis.mode=embedded
spring.artemis.embedded.enabled=true
spring.artemis.embedded.queues=audit-queue

logging.level.root=INFO
logging.level.org.apache.activemq=WARN
Expand Down