SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update versions for testcontainer andd rabbit versions for tests

Browse Source 
Update jacoco version so build will work with the current release of maven

update
This commit is contained in:
Glenn Renfro
2020-10-28 16:56:21 -04:00
parent a4b638a61e
commit 8337e8e3e4
10 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -201,7 +201,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<version>0.8.6</version>
<executions>
<!--
Prepares the property pointing to the JaCoCo runtime agent which

4
spring-cloud-starter-single-step-batch-job/pom.xml
View File

@@ -10,8 +10,8 @@
<artifactId>spring-cloud-starter-single-step-batch-job</artifactId>
<properties>
<test.containers.version>1.14.3</test.containers.version>
<test.rabbit.containers.version>1.14.3</test.rabbit.containers.version>
<test.containers.version>1.15.0-rc2</test.containers.version>
<test.rabbit.containers.version>1.15.0-rc2</test.rabbit.containers.version>
<test.ducttape.version>1.0.8</test.ducttape.version>
</properties>

3
spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java
View File

@@ -25,6 +25,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.RabbitMQContainer;
import org.springframework.amqp.core.AmqpAdmin;
import org.springframework.amqp.core.AmqpTemplate;
@@ -64,7 +65,7 @@ public class AmqpItemReaderAutoConfigurationTests {
private ConnectionFactory connectionFactory;
static {
GenericContainer rabbitmq = new GenericContainer("rabbitmq:3.5.3")
GenericContainer rabbitmq = new RabbitMQContainer("rabbitmq:3.7")
.withExposedPorts(5672);
rabbitmq.start();
final Integer mappedPort = rabbitmq.getMappedPort(5672);

3
spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfigurationTests.java
View File

@@ -26,6 +26,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.RabbitMQContainer;
import org.springframework.amqp.core.AmqpAdmin;
import org.springframework.amqp.core.AmqpTemplate;
@@ -77,7 +78,7 @@ public class AmqpItemWriterAutoConfigurationTests {
private String[] configurations;
static {
GenericContainer rabbitmq = new GenericContainer("rabbitmq:3.5.3")
GenericContainer rabbitmq = new RabbitMQContainer("rabbitmq:3.7")
.withExposedPorts(5672);
rabbitmq.start();
final Integer mappedPort = rabbitmq.getMappedPort(5672);

4
spring-cloud-task-integration-tests/pom.xml
View File

@@ -13,8 +13,8 @@
<artifactId>spring-cloud-task-integration-tests</artifactId>
<properties>
<test.containers.version>1.14.3</test.containers.version>
<test.rabbit.containers.version>1.14.3</test.rabbit.containers.version>
<test.containers.version>1.15.0-rc2</test.containers.version>
<test.rabbit.containers.version>1.15.0-rc2</test.rabbit.containers.version>
<test.ducttape.version>1.0.8</test.ducttape.version>
</properties>

3
spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java
View File

@@ -29,6 +29,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.RabbitMQContainer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -87,7 +88,7 @@ public class TaskLauncherSinkTests {
randomPort = SocketUtils.findAvailableTcpPort();
DATASOURCE_URL = "jdbc:h2:tcp://localhost:" + randomPort
+ "/mem:dataflow;DB_CLOSE_DELAY=-1;" + "DB_CLOSE_ON_EXIT=FALSE";
GenericContainer rabbitmq = new GenericContainer("rabbitmq:3.5.3")
GenericContainer rabbitmq = new RabbitMQContainer("rabbitmq:3.7")
.withExposedPorts(5672);
rabbitmq.start();
final Integer mappedPort = rabbitmq.getMappedPort(5672);

3
spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java
View File

@@ -26,6 +26,7 @@ import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.RabbitMQContainer;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
@@ -50,7 +51,7 @@ public class BatchExecutionEventTests {
private static final String TASK_NAME = "jobEventTest";
static {
GenericContainer rabbitmq = new GenericContainer("rabbitmq:3.5.3")
GenericContainer rabbitmq = new RabbitMQContainer("rabbitmq:3.7")
.withExposedPorts(5672);
rabbitmq.start();
final Integer mappedPort = rabbitmq.getMappedPort(5672);

3
spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java
View File

@@ -23,6 +23,7 @@ import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.RabbitMQContainer;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -56,7 +57,7 @@ public class TaskEventTests {
private static final String TASK_NAME = "taskEventTest";
static {
GenericContainer rabbitmq = new GenericContainer("rabbitmq:3.5.3")
GenericContainer rabbitmq = new RabbitMQContainer("rabbitmq:3.7")
.withExposedPorts(5672);
rabbitmq.start();
final Integer mappedPort = rabbitmq.getMappedPort(5672);

4
spring-cloud-task-samples/batch-events/pom.xml
View File

@@ -20,8 +20,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<test.containers.version>1.14.3</test.containers.version>
<test.rabbit.containers.version>1.14.3</test.rabbit.containers.version>
<test.containers.version>1.15.0-rc2</test.containers.version>
<test.rabbit.containers.version>1.15.0-rc2</test.rabbit.containers.version>
<test.ducttape.version>1.0.8</test.ducttape.version>
</properties>

3
spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java
View File

@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.assertj.core.api.BDDAssertions;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.RabbitMQContainer;
import org.springframework.boot.SpringApplication;
import org.springframework.cloud.stream.annotation.EnableBinding;
@@ -36,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class BatchEventsApplicationTests {
static {
GenericContainer rabbitmq = new GenericContainer("rabbitmq:3.5.3")
GenericContainer rabbitmq = new RabbitMQContainer("rabbitmq:3.7")
.withExposedPorts(5672);
rabbitmq.start();
final Integer mappedPort = rabbitmq.getMappedPort(5672);