Skip to content

Commit 24f948d

Browse files
author
Gennady Kuzmin
committed
update dependencies; add reuse
1 parent 5dc6f82 commit 24f948d

File tree

25 files changed

+208
-196
lines changed

25 files changed

+208
-196
lines changed

‎pom.xml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.jupiter-tools</groupId>
77
<artifactId>spring-boot-extensions-parent</artifactId>
8-
<version>0.4</version>
8+
<version>0.4.1</version>
99
<packaging>pom</packaging>
1010

1111
<name>spring-boot-extensions-parent</name>
@@ -35,10 +35,12 @@
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3737
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
38-
<java.version>1.8</java.version>
38+
<java.version>1.8</java.version>
3939
<junit.vintage.version>5.5.0</junit.vintage.version>
40-
<junit-jupiter.version>5.5.0</junit-jupiter.version>
41-
<junit-platform.version>1.5.0</junit-platform.version>
40+
<junit-jupiter.version>5.9.0</junit-jupiter.version>
41+
<junit-platform.version>1.9.0</junit-platform.version>
42+
<testcontainers.version>1.17.5</testcontainers.version>
43+
<jna.version>5.12.1</jna.version>
4244
</properties>
4345

4446
<developers>
@@ -75,7 +77,7 @@
7577
<parent>
7678
<groupId>org.springframework.boot</groupId>
7779
<artifactId>spring-boot-starter-parent</artifactId>
78-
<version>[2.0.0.RELEASE,2.3.0.RELEASE]</version>
80+
<version>2.7.4</version>
7981
<relativePath/>
8082
</parent>
8183

@@ -122,11 +124,6 @@
122124
<artifactId>junit-platform-launcher</artifactId>
123125
<version>${junit-platform.version}</version>
124126
</dependency>
125-
<dependency>
126-
<groupId>org.junit.vintage</groupId>
127-
<artifactId>junit-vintage-engine</artifactId>
128-
<version>${junit.vintage.version}</version>
129-
</dependency>
130127
<dependency>
131128
<groupId>org.junit.jupiter</groupId>
132129
<artifactId>junit-jupiter-params</artifactId>
@@ -193,7 +190,7 @@
193190
</formats>
194191
<check/>
195192
</configuration>
196-
</plugin>
193+
</plugin>
197194

198195
<plugin>
199196
<groupId>org.apache.maven.plugins</groupId>
@@ -230,7 +227,7 @@
230227
<groupId>org.apache.maven.plugins</groupId>
231228
<artifactId>maven-surefire-plugin</artifactId>
232229
<version>2.22.2</version>
233-
<configuration>
230+
<configuration>
234231
<reportFormat>plain</reportFormat>
235232
</configuration>
236233
</plugin>

‎spring-test-activemq/pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.jupiter-tools</groupId>
88
<artifactId>spring-boot-extensions-parent</artifactId>
9-
<version>0.4</version>
9+
<version>0.4.1</version>
1010
</parent>
1111

1212
<artifactId>spring-test-activemq</artifactId>
@@ -20,7 +20,7 @@
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2222
<java.version>1.8</java.version>
23-
<test.containers.version>1.11.4</test.containers.version>
23+
<awaitility.version>4.2.0</awaitility.version>
2424
</properties>
2525

2626
<dependencies>
@@ -49,16 +49,21 @@
4949
<dependency>
5050
<groupId>org.testcontainers</groupId>
5151
<artifactId>testcontainers</artifactId>
52-
<version>${test.containers.version}</version>
52+
<version>${testcontainers.version}</version>
5353
<scope>compile</scope>
5454
</dependency>
55+
<dependency>
56+
<groupId>net.java.dev.jna</groupId>
57+
<artifactId>jna</artifactId>
58+
<version>${jna.version}</version>
59+
</dependency>
5560
<!-- TestContainers -->
5661

5762
<!-- Awaitility -->
5863
<dependency>
5964
<groupId>org.awaitility</groupId>
6065
<artifactId>awaitility</artifactId>
61-
<version>3.1.0</version>
66+
<version>${awaitility.version}</version>
6267
</dependency>
6368
<!-- Awaitility -->
6469

‎spring-test-activemq/src/main/java/com/jupiter/tools/spring/test/activemq/extension/ActiveMqTcExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
public class ActiveMqTcExtension implements Extension {
1212

1313
private static final Integer MQ_PORT = 61616;
14-
private static GenericContainer activemq =
14+
private static final GenericContainer activemq =
1515
new GenericContainer("rmohr/activemq:latest").withExposedPorts(MQ_PORT);
1616

1717
static {
18-
18+
activemq.withReuse(true);
1919
activemq.start();
2020

2121
String brokerUrl = String.format("tcp://%s:%s",
22-
activemq.getContainerIpAddress(),
22+
activemq.getHost(),
2323
activemq.getMappedPort(MQ_PORT));
2424

2525
System.setProperty("spring.activemq.broker-url", brokerUrl);

‎spring-test-core/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.jupiter-tools</groupId>
88
<artifactId>spring-boot-extensions-parent</artifactId>
9-
<version>0.4</version>
9+
<version>0.4.1</version>
1010
</parent>
1111

1212
<artifactId>spring-test-core</artifactId>
@@ -20,16 +20,15 @@
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2222
<java.version>1.8</java.version>
23-
<jackson.version>2.11.0</jackson.version>
24-
<jackson.version.core>${jackson.version}</jackson.version.core>
25-
<jackson.version.databind>${jackson.version}</jackson.version.databind>
23+
<jackson.version.databind>2.13.4</jackson.version.databind>
24+
<commons-io.version>2.11.0</commons-io.version>
2625
</properties>
2726

2827
<dependencies>
2928
<dependency>
3029
<groupId>commons-io</groupId>
3130
<artifactId>commons-io</artifactId>
32-
<version>2.4</version>
31+
<version>${commons-io.version}</version>
3332
</dependency>
3433
<dependency>
3534
<groupId>com.fasterxml.jackson.core</groupId>

‎spring-test-core/src/main/java/com/jupiter/tools/spring/test/core/annotation/EnableIntegrationTest.java

100755100644
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.jupiter.tools.spring.test.core.annotation;
22

3-
import org.junit.jupiter.api.extension.ExtendWith;
43
import org.springframework.boot.test.context.SpringBootTest;
5-
import org.springframework.test.context.junit.jupiter.SpringExtension;
64

75
import java.lang.annotation.ElementType;
86
import java.lang.annotation.Retention;
@@ -19,6 +17,5 @@
1917
@Retention(RetentionPolicy.RUNTIME)
2018
@Target(ElementType.TYPE)
2119
@SpringBootTest
22-
@ExtendWith(SpringExtension.class)
2320
public @interface EnableIntegrationTest {
2421
}

‎spring-test-jpa/pom.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.jupiter-tools</groupId>
88
<artifactId>spring-boot-extensions-parent</artifactId>
9-
<version>0.4</version>
9+
<version>0.4.1</version>
1010
</parent>
1111

1212
<artifactId>spring-test-jpa</artifactId>
@@ -20,6 +20,7 @@
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2222
<java.version>1.8</java.version>
23+
<rider-spring.version>1.34.0</rider-spring.version>
2324
</properties>
2425

2526
<dependencies>
@@ -54,18 +55,7 @@
5455
<dependency>
5556
<groupId>com.github.database-rider</groupId>
5657
<artifactId>rider-spring</artifactId>
57-
<version>1.7.2</version>
58-
<scope>compile</scope>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>org.slf4j</groupId>
62-
<artifactId>slf4j-api</artifactId>
63-
</exclusion>
64-
<exclusion>
65-
<groupId>org.slf4j</groupId>
66-
<artifactId>slf4j-simple</artifactId>
67-
</exclusion>
68-
</exclusions>
58+
<version>${rider-spring.version}</version>
6959
</dependency>
7060
<!-- DB Rider -->
7161
</dependencies>

‎spring-test-mysql/pom.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.jupiter-tools</groupId>
88
<artifactId>spring-boot-extensions-parent</artifactId>
9-
<version>0.4</version>
9+
<version>0.4.1</version>
1010
</parent>
1111

1212
<artifactId>spring-test-mysql</artifactId>
@@ -20,6 +20,7 @@
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2222
<java.version>1.8</java.version>
23+
<mysql-connector-java.version>8.0.30</mysql-connector-java.version>
2324
</properties>
2425

2526
<dependencies>
@@ -38,16 +39,21 @@
3839
<dependency>
3940
<groupId>org.testcontainers</groupId>
4041
<artifactId>mysql</artifactId>
41-
<version>1.11.4</version>
42+
<version>${testcontainers.version}</version>
4243
<scope>compile</scope>
4344
</dependency>
45+
<dependency>
46+
<groupId>net.java.dev.jna</groupId>
47+
<artifactId>jna</artifactId>
48+
<version>${jna.version}</version>
49+
</dependency>
4450
<!-- TestContainers -->
4551

4652
<!-- DB -->
4753
<dependency>
4854
<groupId>mysql</groupId>
4955
<artifactId>mysql-connector-java</artifactId>
50-
<version>5.1.47</version>
56+
<version>${mysql-connector-java.version}</version>
5157
<scope>provided</scope>
5258
</dependency>
5359
<!-- DB -->

‎spring-test-mysql/src/main/java/com/jupiter/tools/spring/test/mysql/extension/MySqlTcExtension.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public class MySqlTcExtension implements Extension {
1414
static {
1515
System.out.println("Start MySql testcontainers extension...\n");
1616

17-
MySQLContainer mysql = new MySQLContainer();
17+
MySQLContainer mysql = new MySQLContainer("mysql:8.0.30");
18+
mysql.withReuse(true);
1819
mysql.start();
1920

2021
System.setProperty("spring.datasource.driver-class-name", mysql.getDriverClassName());

‎spring-test-postgres/pom.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.jupiter-tools</groupId>
88
<artifactId>spring-boot-extensions-parent</artifactId>
9-
<version>0.4</version>
9+
<version>0.4.1</version>
1010
</parent>
1111

1212
<artifactId>spring-test-postgres</artifactId>
@@ -40,8 +40,12 @@
4040
<dependency>
4141
<groupId>org.testcontainers</groupId>
4242
<artifactId>postgresql</artifactId>
43-
<version>1.11.4</version>
44-
<scope>compile</scope>
43+
<version>${testcontainers.version}</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>net.java.dev.jna</groupId>
47+
<artifactId>jna</artifactId>
48+
<version>${jna.version}</version>
4549
</dependency>
4650
<!-- TestContainers -->
4751

@@ -62,7 +66,6 @@
6266
</dependencies>
6367

6468

65-
6669
<build>
6770
<resources>
6871
<resource>

‎spring-test-postgres/src/main/java/com/jupiter/tools/spring/test/postgres/extension/PostgresTcExtension.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public class PostgresTcExtension implements Extension {
1414
static {
1515
System.out.println("Start Postgres testcontainers extension...\n");
1616

17-
PostgreSQLContainer postgres = new PostgreSQLContainer();
17+
PostgreSQLContainer postgres = new PostgreSQLContainer("postgres:14.5-alpine");
18+
postgres.withReuse(true);
1819
postgres.start();
1920

2021
System.setProperty("spring.datasource.driver-class-name", postgres.getDriverClassName());

‎spring-test-rabbitmq/pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.jupiter-tools</groupId>
88
<artifactId>spring-boot-extensions-parent</artifactId>
9-
<version>0.4</version>
9+
<version>0.4.1</version>
1010
</parent>
1111

1212
<artifactId>spring-test-rabbitmq</artifactId>
@@ -20,7 +20,7 @@
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2222
<java.version>1.8</java.version>
23-
<test.containers.version>1.11.4</test.containers.version>
23+
<awaitility.version>4.2.0</awaitility.version>
2424
</properties>
2525

2626
<dependencies>
@@ -44,16 +44,21 @@
4444
<dependency>
4545
<groupId>org.testcontainers</groupId>
4646
<artifactId>testcontainers</artifactId>
47-
<version>${test.containers.version}</version>
47+
<version>${testcontainers.version}</version>
4848
<scope>compile</scope>
4949
</dependency>
50+
<dependency>
51+
<groupId>net.java.dev.jna</groupId>
52+
<artifactId>jna</artifactId>
53+
<version>${jna.version}</version>
54+
</dependency>
5055
<!-- TestContainers -->
5156

5257
<!-- Awaitility -->
5358
<dependency>
5459
<groupId>org.awaitility</groupId>
5560
<artifactId>awaitility</artifactId>
56-
<version>3.1.0</version>
61+
<version>${awaitility.version}</version>
5762
</dependency>
5863
<!-- Awaitility -->
5964

‎spring-test-rabbitmq/src/main/java/com/jupiter/tools/spring/test/rabbitmq/extension/RabbitMqTcExtension.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
public class RabbitMqTcExtension implements Extension {
1212

1313
private static final Integer RABBIT_PORT = 5672;
14-
private static GenericContainer rabbitmq =
15-
new GenericContainer("rabbitmq:management").withExposedPorts(RABBIT_PORT, 15672);
14+
private static final GenericContainer rabbitmq =
15+
new GenericContainer("rabbitmq:3.9.23-management-alpine").withExposedPorts(RABBIT_PORT, 15672);
1616

1717
static {
1818
rabbitmq.start();
19-
System.setProperty("spring.rabbitmq.host", rabbitmq.getContainerIpAddress());
19+
rabbitmq.withReuse(true);
20+
System.setProperty("spring.rabbitmq.host", rabbitmq.getHost());
2021
System.setProperty("spring.rabbitmq.port", rabbitmq.getMappedPort(RABBIT_PORT).toString());
2122
}
2223
}

‎spring-test-web/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.jupiter-tools</groupId>
88
<artifactId>spring-boot-extensions-parent</artifactId>
9-
<version>0.4</version>
9+
<version>0.4.1</version>
1010
</parent>
1111

1212
<artifactId>spring-test-web</artifactId>
@@ -22,7 +22,7 @@
2222
<java.version>1.8</java.version>
2323
<test.containers.version>1.11.4</test.containers.version>
2424

25-
<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
25+
<spring-cloud.version>2021.0.4</spring-cloud.version>
2626
</properties>
2727

2828
<dependencyManagement>
@@ -52,7 +52,7 @@
5252
</dependency>
5353
<dependency>
5454
<groupId>org.springframework.cloud</groupId>
55-
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
55+
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
5656
</dependency>
5757

5858
<dependency>

0 commit comments

Comments
 (0)