update dependencies; add reuse; change ribbon to cloud loadbalancer

jupiter-tools · Feb 25, 2023 · 6f223b1 · 6f223b1
1 parent 5dc6f82
commit 6f223b1
Show file tree

Hide file tree

Showing 25 changed files with 225 additions and 203 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.jupiter-tools</groupId>
     <artifactId>spring-boot-extensions-parent</artifactId>
-    <version>0.4</version>
+    <version>0.5</version>
     <packaging>pom</packaging>
 
     <name>spring-boot-extensions-parent</name>
@@ -35,10 +35,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
-        <java.version>1.8</java.version>    
+        <java.version>1.8</java.version>
         <junit.vintage.version>5.5.0</junit.vintage.version>
-        <junit-jupiter.version>5.5.0</junit-jupiter.version>
-        <junit-platform.version>1.5.0</junit-platform.version>
+        <junit-jupiter.version>5.9.0</junit-jupiter.version>
+        <junit-platform.version>1.9.0</junit-platform.version>
+        <testcontainers.version>1.17.5</testcontainers.version>
+        <jna.version>5.12.1</jna.version>
     </properties>
 
     <developers>
@@ -75,7 +77,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>[2.0.0.RELEASE,2.3.0.RELEASE]</version>
+        <version>2.7.4</version>
         <relativePath/>
     </parent>
 
@@ -122,11 +124,6 @@
             <artifactId>junit-platform-launcher</artifactId>
             <version>${junit-platform.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit.vintage.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
@@ -193,7 +190,7 @@
                     </formats>
                     <check/>
                 </configuration>
-            </plugin>            
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -230,7 +227,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
-                <configuration>                    
+                <configuration>
                     <reportFormat>plain</reportFormat>
                 </configuration>
             </plugin>

diff --git a/spring-test-activemq/pom.xml b/spring-test-activemq/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jupiter-tools</groupId>
         <artifactId>spring-boot-extensions-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>spring-test-activemq</artifactId>
@@ -20,7 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <test.containers.version>1.11.4</test.containers.version>
+        <awaitility.version>4.2.0</awaitility.version>
     </properties>
 
     <dependencies>
@@ -49,16 +49,21 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>${test.containers.version}</version>
+            <version>${testcontainers.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>${jna.version}</version>
+        </dependency>
         <!-- TestContainers -->
 
         <!-- Awaitility -->
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>3.1.0</version>
+            <version>${awaitility.version}</version>
         </dependency>
         <!-- Awaitility -->
 

diff --git a/...q/src/main/java/com/jupiter/tools/spring/test/activemq/extension/ActiveMqTcExtension.java b/...q/src/main/java/com/jupiter/tools/spring/test/activemq/extension/ActiveMqTcExtension.java
@@ -11,15 +11,15 @@
 public class ActiveMqTcExtension implements Extension {
 
     private static final Integer MQ_PORT = 61616;
-    private static GenericContainer activemq =
+    private static final GenericContainer activemq =
             new GenericContainer("rmohr/activemq:latest").withExposedPorts(MQ_PORT);
 
     static {
-
+        activemq.withReuse(true);
         activemq.start();
 
         String brokerUrl = String.format("tcp://%s:%s",
-                                         activemq.getContainerIpAddress(),
+                                         activemq.getHost(),
                                          activemq.getMappedPort(MQ_PORT));
 
         System.setProperty("spring.activemq.broker-url", brokerUrl);

diff --git a/spring-test-core/pom.xml b/spring-test-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jupiter-tools</groupId>
         <artifactId>spring-boot-extensions-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>spring-test-core</artifactId>
@@ -20,16 +20,15 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <jackson.version>2.11.0</jackson.version>
-        <jackson.version.core>${jackson.version}</jackson.version.core>
-        <jackson.version.databind>${jackson.version}</jackson.version.databind>
+        <jackson.version.databind>2.13.4</jackson.version.databind>
+        <commons-io.version>2.11.0</commons-io.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
+            <version>${commons-io.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/...re/src/main/java/com/jupiter/tools/spring/test/core/annotation/EnableIntegrationTest.java b/...re/src/main/java/com/jupiter/tools/spring/test/core/annotation/EnableIntegrationTest.java
@@ -1,8 +1,6 @@
 package com.jupiter.tools.spring.test.core.annotation;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -19,6 +17,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @SpringBootTest
-@ExtendWith(SpringExtension.class)
 public @interface EnableIntegrationTest {
 }
diff --git a/spring-test-jpa/pom.xml b/spring-test-jpa/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jupiter-tools</groupId>
         <artifactId>spring-boot-extensions-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>spring-test-jpa</artifactId>
@@ -20,6 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <rider-spring.version>1.34.0</rider-spring.version>
     </properties>
 
     <dependencies>
@@ -54,18 +55,7 @@
         <dependency>
             <groupId>com.github.database-rider</groupId>
             <artifactId>rider-spring</artifactId>
-            <version>1.7.2</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>${rider-spring.version}</version>
         </dependency>
         <!-- DB Rider -->
     </dependencies>

diff --git a/spring-test-mysql/pom.xml b/spring-test-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jupiter-tools</groupId>
         <artifactId>spring-boot-extensions-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>spring-test-mysql</artifactId>
@@ -20,6 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <mysql-connector-java.version>8.0.30</mysql-connector-java.version>
     </properties>
 
     <dependencies>
@@ -38,16 +39,21 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mysql</artifactId>
-            <version>1.11.4</version>
+            <version>${testcontainers.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>${jna.version}</version>
+        </dependency>
         <!-- TestContainers -->
 
         <!-- DB -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.47</version>
+            <version>${mysql-connector-java.version}</version>
             <scope>provided</scope>
         </dependency>
         <!-- DB -->

diff --git a/...t-mysql/src/main/java/com/jupiter/tools/spring/test/mysql/extension/MySqlTcExtension.java b/...t-mysql/src/main/java/com/jupiter/tools/spring/test/mysql/extension/MySqlTcExtension.java
@@ -14,7 +14,8 @@ public class MySqlTcExtension implements Extension {
     static {
         System.out.println("Start MySql testcontainers extension...\n");
 
-        MySQLContainer mysql = new MySQLContainer();
+        MySQLContainer mysql = new MySQLContainer("mysql:8.0.30");
+        mysql.withReuse(true);
         mysql.start();
 
         System.setProperty("spring.datasource.driver-class-name", mysql.getDriverClassName());

diff --git a/spring-test-postgres/pom.xml b/spring-test-postgres/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jupiter-tools</groupId>
         <artifactId>spring-boot-extensions-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>spring-test-postgres</artifactId>
@@ -40,8 +40,12 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
-            <version>1.11.4</version>
-            <scope>compile</scope>
+            <version>${testcontainers.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>${jna.version}</version>
         </dependency>
         <!-- TestContainers -->
 
@@ -62,7 +66,6 @@
     </dependencies>
 
 
-
     <build>
         <resources>
             <resource>

diff --git a/...s/src/main/java/com/jupiter/tools/spring/test/postgres/extension/PostgresTcExtension.java b/...s/src/main/java/com/jupiter/tools/spring/test/postgres/extension/PostgresTcExtension.java
@@ -14,7 +14,8 @@ public class PostgresTcExtension implements Extension {
     static {
         System.out.println("Start Postgres testcontainers extension...\n");
 
-        PostgreSQLContainer postgres = new PostgreSQLContainer();
+        PostgreSQLContainer postgres = new PostgreSQLContainer("postgres:14.5-alpine");
+        postgres.withReuse(true);
         postgres.start();
 
         System.setProperty("spring.datasource.driver-class-name", postgres.getDriverClassName());

diff --git a/spring-test-rabbitmq/pom.xml b/spring-test-rabbitmq/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jupiter-tools</groupId>
         <artifactId>spring-boot-extensions-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>spring-test-rabbitmq</artifactId>
@@ -20,7 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <test.containers.version>1.11.4</test.containers.version>
+        <awaitility.version>4.2.0</awaitility.version>
     </properties>
 
     <dependencies>
@@ -44,16 +44,21 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>${test.containers.version}</version>
+            <version>${testcontainers.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>${jna.version}</version>
+        </dependency>
         <!-- TestContainers -->
 
         <!-- Awaitility -->
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>3.1.0</version>
+            <version>${awaitility.version}</version>
         </dependency>
         <!-- Awaitility -->
 

diff --git a/...q/src/main/java/com/jupiter/tools/spring/test/rabbitmq/extension/RabbitMqTcExtension.java b/...q/src/main/java/com/jupiter/tools/spring/test/rabbitmq/extension/RabbitMqTcExtension.java
@@ -11,12 +11,13 @@
 public class RabbitMqTcExtension implements Extension {
 
     private static final Integer RABBIT_PORT = 5672;
-    private static GenericContainer rabbitmq =
-            new GenericContainer("rabbitmq:management").withExposedPorts(RABBIT_PORT, 15672);
+    private static final GenericContainer rabbitmq =
+            new GenericContainer("rabbitmq:3.9.23-management-alpine").withExposedPorts(RABBIT_PORT, 15672);
 
     static {
         rabbitmq.start();
-        System.setProperty("spring.rabbitmq.host", rabbitmq.getContainerIpAddress());
+        rabbitmq.withReuse(true);
+        System.setProperty("spring.rabbitmq.host", rabbitmq.getHost());
         System.setProperty("spring.rabbitmq.port", rabbitmq.getMappedPort(RABBIT_PORT).toString());
     }
 }
diff --git a/spring-test-web/pom.xml b/spring-test-web/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.jupiter-tools</groupId>
         <artifactId>spring-boot-extensions-parent</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>spring-test-web</artifactId>
-    <version>${parent.version}</version>
+    <version>0.5</version>
     <packaging>jar</packaging>
 
     <name>spring-test-web</name>
@@ -22,7 +22,7 @@
         <java.version>1.8</java.version>
         <test.containers.version>1.11.4</test.containers.version>
 
-        <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
+        <spring-cloud.version>2021.0.4</spring-cloud.version>
     </properties>
 
     <dependencyManagement>
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
 
         <dependency>