Skip to content

Commit 3a9e548

Browse files
andrei-punkoandrei-punko
committed
Upgrade lib versions. Extract some version properties. Add Spring BOM
1 parent 545aae2 commit 3a9e548

File tree

22 files changed

+103
-74
lines changed

22 files changed

+103
-74
lines changed

‎akka-project/pom.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>by.andd3dfx</groupId>
76
<artifactId>akka-project</artifactId>
8-
<version>1.0-SNAPSHOT</version>
97

108
<parent>
119
<groupId>org.springframework.boot</groupId>
@@ -99,8 +97,8 @@
9997

10098
<!-- https://github.com/spring-projects/spring-framework/issues/28699 -->
10199
<plugin>
102-
<groupId>org.apache.maven.plugins</groupId>
103100
<artifactId>maven-surefire-plugin</artifactId>
101+
<version>${maven-surefire-plugin.version}</version>
104102
<configuration>
105103
<argLine>
106104
--add-opens java.base/java.lang=ALL-UNNAMED

‎akka-project/src/test/java/by/andd3dfx/akkaproject/AkkaProjectApplicationTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
@RunWith(SpringRunner.class)
99
@SpringBootTest
1010
public class AkkaProjectApplicationTests {
11+
1112
@Test
1213
public void contextLoads() {
1314
}

‎akka-project/src/test/java/by/andd3dfx/akkaproject/akka/actors/MigrationActorTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
import org.jmock.lib.legacy.ClassImposteriser;
1414
import org.junit.AfterClass;
1515
import org.junit.BeforeClass;
16+
import org.junit.Rule;
1617
import org.junit.Test;
1718

1819
import static org.hamcrest.CoreMatchers.allOf;
1920
import static org.hamcrest.CoreMatchers.is;
2021
import static org.hamcrest.Matchers.hasProperty;
2122

2223
public class MigrationActorTest {
23-
@org.junit.Rule
24+
@Rule
2425
public final JUnitRuleMockery mockery = new JUnitRuleMockery() {{
2526
setImposteriser(ClassImposteriser.INSTANCE);
2627
setThreadingPolicy(new Synchroniser());

‎common/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@
8787
<build>
8888
<plugins>
8989
<plugin>
90-
<groupId>org.apache.maven.plugins</groupId>
9190
<artifactId>maven-compiler-plugin</artifactId>
92-
<version>3.11.0</version>
91+
<version>${maven-compiler-plugin.version}</version>
9392
<configuration>
9493
<annotationProcessorPaths>
9594
<path>

‎coverage-report/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<plugin>
8080
<groupId>org.jacoco</groupId>
8181
<artifactId>jacoco-maven-plugin</artifactId>
82-
<version>${jacoco.version}</version>
82+
<version>${jacoco-maven-plugin.version}</version>
8383
<executions>
8484
<execution>
8585
<id>report-aggregate</id>

‎dagger-sample/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
<plugins>
2929
<!-- Dagger -->
3030
<plugin>
31-
<groupId>org.apache.maven.plugins</groupId>
3231
<artifactId>maven-compiler-plugin</artifactId>
33-
<version>3.11.0</version>
32+
<version>${maven-compiler-plugin.version}</version>
3433
<configuration>
3534
<annotationProcessorPaths>
3635
<path>

‎db-versioning/flyway-db/pom.xml

+35-12
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,52 @@
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

12-
<groupId>by.andd3dfx</groupId>
1312
<artifactId>flyway-db</artifactId>
1413
<packaging>jar</packaging>
1514

1615
<name>DB versioning : Flyway</name>
1716

17+
<properties>
18+
<junit.vintage.version>5.10.1</junit.vintage.version>
19+
<junit.platform.version>1.10.1</junit.platform.version>
20+
</properties>
21+
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.junit.vintage</groupId>
25+
<artifactId>junit-vintage-engine</artifactId>
26+
<version>${junit.vintage.version}</version>
27+
<scope>test</scope>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.junit.platform</groupId>
31+
<artifactId>junit-platform-runner</artifactId>
32+
<version>${junit.platform.version}</version>
33+
<scope>test</scope>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.junit.platform</groupId>
37+
<artifactId>junit-platform-commons</artifactId>
38+
<version>${junit.platform.version}</version>
39+
<scope>test</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>com.h2database</groupId>
43+
<artifactId>h2</artifactId>
44+
<version>${h2.db.version}</version>
45+
<scope>test</scope>
46+
</dependency>
47+
</dependencies>
48+
1849
<build>
1950
<plugins>
2051
<plugin>
2152
<groupId>org.flywaydb</groupId>
2253
<artifactId>flyway-maven-plugin</artifactId>
23-
<version>9.19.4</version>
54+
<version>${flyway-maven-plugin.version}</version>
2455

2556
<configuration>
26-
<url>jdbc:h2:file:${project.build.directory}/flywaydb</url>
57+
<url>jdbc:h2:mem:flywaydb</url>
2758
<user>${jdbc.username}</user>
2859
<password>${jdbc.password}</password>
2960
<locations>
@@ -34,17 +65,9 @@
3465

3566
<executions>
3667
<execution>
37-
<id>first-execution</id>
38-
<phase>compile</phase>
39-
<goals>
40-
<goal>clean</goal>
41-
</goals>
42-
</execution>
43-
44-
<execution>
45-
<id>second-execution</id>
4668
<phase>process-test-resources</phase>
4769
<goals>
70+
<goal>clean</goal>
4871
<goal>migrate</goal>
4972
</goals>
5073
</execution>

‎db-versioning/liquibase-db/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

13-
<groupId>by.andd3dfx</groupId>
1413
<artifactId>liquibase-db</artifactId>
1514
<packaging>jar</packaging>
1615

‎db-versioning/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<name>DB versioning : Root</name>
1515

1616
<properties>
17-
<h2.db.version>2.1.214</h2.db.version>
1817
<jdbc.driverClassName>org.h2.Driver</jdbc.driverClassName>
1918
<jdbc.url>dbc:h2:mem:liquibase</jdbc.url>
2019
<jdbc.username>liquibase</jdbc.username>

‎elasticsearch/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
<properties>
1515
<elasticsearch.version>7.17.14</elasticsearch.version>
16-
<fastjson.version>2.0.29</fastjson.version>
16+
<fastjson.version>2.0.44</fastjson.version>
1717
</properties>
1818

1919
<build>
2020
<plugins>
2121
<plugin>
2222
<groupId>io.fabric8</groupId>
2323
<artifactId>docker-maven-plugin</artifactId>
24-
<version>0.42.1</version>
24+
<version>${docker-maven-plugin.version}</version>
2525
<configuration>
2626
<showLogs>true</showLogs>
2727
<images>
@@ -67,7 +67,7 @@
6767
<!-- This plugin used for running integration tests in integration-test build phase -->
6868
<plugin>
6969
<artifactId>maven-failsafe-plugin</artifactId>
70-
<version>3.0.0</version>
70+
<version>${maven-failsafe-plugin.version}</version>
7171
<executions>
7272
<execution>
7373
<goals>
@@ -92,8 +92,8 @@
9292
<version>${elasticsearch.version}</version>
9393
</dependency>
9494
<dependency>
95-
<groupId>com.alibaba</groupId>
96-
<artifactId>fastjson</artifactId>
95+
<groupId>com.alibaba.fastjson2</groupId>
96+
<artifactId>fastjson2</artifactId>
9797
<version>${fastjson.version}</version>
9898
</dependency>
9999
</dependencies>

‎elasticsearch/src/test/java/by/andd3dfx/elasticsearch/ElasticSearchManualIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import static org.hamcrest.MatcherAssert.assertThat;
77

88
import by.andd3dfx.elasticsearch.dto.Person;
9-
import com.alibaba.fastjson.JSON;
9+
import com.alibaba.fastjson2.JSON;
1010
import java.net.InetAddress;
1111
import java.net.UnknownHostException;
1212
import java.util.ArrayList;
@@ -33,7 +33,7 @@
3333
*/
3434
public class ElasticSearchManualIT {
3535

36-
private static List<Person> listOfPersons = new ArrayList<Person>() {{
36+
private static List<Person> listOfPersons = new ArrayList<>() {{
3737
add(new Person(8, "John Woodcraft", new Date()));
3838
add(new Person(10, "John Doe", new Date()));
3939
add(new Person(25, "Janette Doe", new Date()));

‎elasticsearch/src/test/java/by/andd3dfx/elasticsearch/dto/Person.java

-3
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@
55
public class Person {
66

77
private int age;
8-
98
private String fullName;
10-
119
private Date dateOfBirth;
1210

1311
public Person() {
1412
}
1513

1614
public Person(int age, String fullName, Date dateOfBirth) {
17-
super();
1815
this.age = age;
1916
this.fullName = fullName;
2017
this.dateOfBirth = dateOfBirth;

‎hibernate-mappings/pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<plugin>
2121
<groupId>io.fabric8</groupId>
2222
<artifactId>docker-maven-plugin</artifactId>
23-
<version>0.42.1</version>
23+
<version>${docker-maven-plugin.version}</version>
2424
<configuration>
2525
<showLogs>true</showLogs>
2626
<images>
@@ -69,7 +69,7 @@
6969
<plugin>
7070
<groupId>org.flywaydb</groupId>
7171
<artifactId>flyway-maven-plugin</artifactId>
72-
<version>9.19.4</version>
72+
<version>${flyway-maven-plugin.version}</version>
7373

7474
<configuration>
7575
<url>jdbc:mysql://127.0.0.1:3306/db?allowPublicKeyRetrieval=true&amp;useSSL=false</url>
@@ -93,9 +93,8 @@
9393
</plugin>
9494

9595
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
9796
<artifactId>maven-compiler-plugin</artifactId>
98-
<version>3.11.0</version>
97+
<version>${maven-compiler-plugin.version}</version>
9998
<configuration>
10099
<annotationProcessorPaths>
101100
<path>
@@ -110,7 +109,7 @@
110109
<!--This plugin used for running integration tests in integration-test build phase-->
111110
<plugin>
112111
<artifactId>maven-failsafe-plugin</artifactId>
113-
<version>3.0.0</version>
112+
<version>${maven-failsafe-plugin.version}</version>
114113
<executions>
115114
<execution>
116115
<goals>

‎hibernate-mappings/src/test/java/by/andd3dfx/HibernateMainIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
public class HibernateMainIT {
1919

2020
@Test
21-
public void main() {
21+
public void checkRecordsExistence() {
2222
SessionFactory sf = new Configuration().configure().buildSessionFactory();
2323
Session session = sf.openSession();
2424
EntityManager entityManager = session.getEntityManagerFactory().createEntityManager();

‎messaging-stomp-websocket/pom.xml

+24-7
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<parent>
7-
<groupId>org.springframework.boot</groupId>
8-
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.0.6</version>
10-
<relativePath/> <!-- lookup parent from repository -->
7+
<artifactId>java-sandbox</artifactId>
8+
<groupId>by.andd3dfx</groupId>
9+
<version>1.0-SNAPSHOT</version>
1110
</parent>
1211

13-
<groupId>by.andd3dfx</groupId>
1412
<artifactId>messaging-stomp-websocket</artifactId>
15-
<version>1.0-SNAPSHOT</version>
16-
<name>messaging-stomp-websocket</name>
1713

1814
<dependencies>
1915
<dependency>
@@ -63,8 +59,29 @@
6359
<plugin>
6460
<groupId>org.springframework.boot</groupId>
6561
<artifactId>spring-boot-maven-plugin</artifactId>
62+
<version>${spring-boot.version}</version>
6663
</plugin>
6764
</plugins>
6865
</build>
6966

67+
<dependencyManagement>
68+
<dependencies>
69+
<dependency>
70+
<groupId>org.junit</groupId>
71+
<artifactId>junit-bom</artifactId>
72+
<version>5.10.1</version>
73+
<scope>import</scope>
74+
<type>pom</type>
75+
</dependency>
76+
77+
<dependency>
78+
<!-- Import dependency management from Spring Boot -->
79+
<groupId>org.springframework.boot</groupId>
80+
<artifactId>spring-boot-dependencies</artifactId>
81+
<version>${spring-boot.version}</version>
82+
<type>pom</type>
83+
<scope>import</scope>
84+
</dependency>
85+
</dependencies>
86+
</dependencyManagement>
7087
</project>

‎pom.xml

+13-11
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,18 @@
3434
<maven.compiler.source>${java.version}</maven.compiler.source>
3535
<maven.compiler.target>${java.version}</maven.compiler.target>
3636

37-
<lombok.version>1.18.28</lombok.version>
38-
<commons-lang3.version>3.12.0</commons-lang3.version>
39-
<spring-boot.version>3.1.1</spring-boot.version>
40-
<jacoco.version>0.8.10</jacoco.version>
37+
<lombok.version>1.18.30</lombok.version>
38+
<commons-lang3.version>3.14.0</commons-lang3.version>
39+
<spring-boot.version>3.2.1</spring-boot.version>
40+
<h2.db.version>2.2.220</h2.db.version>
41+
<testcontainers.version>1.19.3</testcontainers.version>
42+
43+
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
44+
<docker-maven-plugin.version>0.43.4</docker-maven-plugin.version>
45+
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
46+
<maven-failsafe-plugin.version>3.2.3</maven-failsafe-plugin.version>
47+
<maven-surefire-plugin.version>3.2.3</maven-surefire-plugin.version>
48+
<flyway-maven-plugin.version>10.4.1</flyway-maven-plugin.version>
4149
</properties>
4250

4351
<dependencies>
@@ -47,12 +55,6 @@
4755
<version>4.13.2</version>
4856
<scope>test</scope>
4957
</dependency>
50-
<dependency>
51-
<groupId>org.jmock</groupId>
52-
<artifactId>jmock-legacy</artifactId>
53-
<version>2.12.0</version>
54-
<scope>test</scope>
55-
</dependency>
5658
<dependency>
5759
<groupId>org.hamcrest</groupId>
5860
<artifactId>hamcrest-all</artifactId>
@@ -81,7 +83,7 @@
8183
<plugin>
8284
<groupId>org.jacoco</groupId>
8385
<artifactId>jacoco-maven-plugin</artifactId>
84-
<version>${jacoco.version}</version>
86+
<version>${jacoco-maven-plugin.version}</version>
8587
<executions>
8688
<execution>
8789
<goals>

‎sound-recorder-n-spectrum-analyzer/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@
3434
<build>
3535
<plugins>
3636
<plugin>
37-
<groupId>org.apache.maven.plugins</groupId>
3837
<artifactId>maven-assembly-plugin</artifactId>
39-
<version>3.5.0</version>
38+
<version>3.6.0</version>
4039
<configuration>
4140
<descriptorRefs>
4241
<descriptorRef>jar-with-dependencies</descriptorRef>

0 commit comments

Comments
 (0)