Merge 9d9c844 into 27c2555

infobip · Jan 12, 2022 · 7ed3f2e · 7ed3f2e
2 parents 27c2555 + 9d9c844
commit 7ed3f2e
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 3.4.0
+* upgraded to spring-boot-dependencies 2.6.2 and testcontainers 1.16.2
+
 ### 3.3.0
 General:
 * Added support for starting containers on a predefined port

diff --git a/infobip-clickhouse-testcontainers-spring-boot-starter/pom.xml b/infobip-clickhouse-testcontainers-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.infobip</groupId>
 		<artifactId>infobip-testcontainers-spring-boot-starter</artifactId>
-		<version>3.3.1-SNAPSHOT</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>infobip-clickhouse-testcontainers-spring-boot-starter</artifactId>

diff --git a/infobip-kafka-testcontainers-spring-boot-starter/pom.xml b/infobip-kafka-testcontainers-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.infobip</groupId>
 		<artifactId>infobip-testcontainers-spring-boot-starter</artifactId>
-		<version>3.3.1-SNAPSHOT</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>infobip-kafka-testcontainers-spring-boot-starter</artifactId>

diff --git a/infobip-mssql-testcontainers-spring-boot-starter/pom.xml b/infobip-mssql-testcontainers-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.infobip</groupId>
 		<artifactId>infobip-testcontainers-spring-boot-starter</artifactId>
-		<version>3.3.1-SNAPSHOT</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>infobip-mssql-testcontainers-spring-boot-starter</artifactId>

diff --git a/infobip-postgresql-testcontainers-spring-boot-starter/pom.xml b/infobip-postgresql-testcontainers-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.infobip</groupId>
 		<artifactId>infobip-testcontainers-spring-boot-starter</artifactId>
-		<version>3.3.1-SNAPSHOT</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>infobip-postgresql-testcontainers-spring-boot-starter</artifactId>

diff --git a/infobip-rabbitmq-testcontainers-spring-boot/pom.xml b/infobip-rabbitmq-testcontainers-spring-boot/pom.xml
@@ -4,7 +4,7 @@
     <parent>
 	    <groupId>com.infobip</groupId>
 	    <artifactId>infobip-testcontainers-spring-boot-starter</artifactId>
-	    <version>3.3.1-SNAPSHOT</version>
+	    <version>3.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>infobip-rabbitmq-testcontainers-spring-boot</artifactId>

diff --git a/...om/infobip/testcontainers/spring/rabbit/RabbitContainerInitializerWithStaticPortTest.java b/...om/infobip/testcontainers/spring/rabbit/RabbitContainerInitializerWithStaticPortTest.java
@@ -30,11 +30,10 @@ void shouldInitialize() {
         String givenMessage = "test";
 
         // when
-        Throwable actual = BDDAssertions.catchThrowable(
-                () -> rabbitTemplate.convertAndSend("test.exchange", "test.key.bar", givenMessage));
+        rabbitTemplate.convertAndSend("test.exchange", "test.key.bar", givenMessage);
 
         // then
-        then(actual).isNull();
+//        then(actual).isNull();
     }
 
     @Test

diff --git a/infobip-rabbitmq-testcontainers-spring-boot/src/test/resources/application-static-port.yml b/infobip-rabbitmq-testcontainers-spring-boot/src/test/resources/application-static-port.yml
@@ -1,5 +1,5 @@
 spring:
   rabbitmq:
     port: 5005
-    docker:
-      image: rabbitmq:3.6.14-alpine
+
+testcontainers.rabbit.docker.image: rabbitmq:3.6.14-alpine
diff --git a/infobip-rabbitmq-testcontainers-spring-boot/src/test/resources/application-test.yml b/infobip-rabbitmq-testcontainers-spring-boot/src/test/resources/application-test.yml
@@ -1,4 +1 @@
-spring:
-  rabbitmq:
-    docker:
-      image: rabbitmq:3.6.14-alpine
+testcontainers.rabbit.docker.image: rabbitmq:3.6.14-alpine
diff --git a/infobip-redis-testcontainers-spring-boot-starter/pom.xml b/infobip-redis-testcontainers-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.infobip</groupId>
 		<artifactId>infobip-testcontainers-spring-boot-starter</artifactId>
-		<version>3.3.1-SNAPSHOT</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>infobip-redis-testcontainers-spring-boot-starter</artifactId>

diff --git a/infobip-testcontainers-common/pom.xml b/infobip-testcontainers-common/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.infobip</groupId>
 		<artifactId>infobip-testcontainers-spring-boot-starter</artifactId>
-		<version>3.3.1-SNAPSHOT</version>
+		<version>3.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>infobip-testcontainers-common</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>com.infobip</groupId>
 	<artifactId>infobip-testcontainers-spring-boot-starter</artifactId>
-	<version>3.3.1-SNAPSHOT</version>
+	<version>3.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Infobip TestContainers Spring Boot Starter</name>
@@ -78,9 +78,9 @@
 
 	<properties>
 		<!-- DEPENDENCY VERSIONS -->
-		<spring-boot.version>2.4.1</spring-boot.version>
+		<spring-boot.version>2.6.2</spring-boot.version>
 
-		<testcontainers.version>1.15.2</testcontainers.version>
+		<testcontainers.version>1.16.2</testcontainers.version>
 
 		<!-- PLUGIN VERSIONS -->
 		<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>