Skip to content

Commit 1a5b83f

Browse files
author
Vita Komarova
authored
Upgrade to Spring Boot 2.6.4 (yoomoney#31)
* Upgrade to Spring Boot 2.6.4 * Upgrade dependency versions
1 parent 78666e4 commit 1a5b83f

File tree

8 files changed

+38
-34
lines changed

8 files changed

+38
-34
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
### NEXT_VERSION_TYPE=MAJOR|MINOR|PATCH
1+
### NEXT_VERSION_TYPE=MINOR
22
### NEXT_VERSION_DESCRIPTION_BEGIN
3+
* Upgrade dependency versions:
4+
* org.springframework:spring-jdbc: 5.3.2 -> 5.3.16
5+
* org.springframework:spring-tx: 5.3.2 -> 5.3.16
6+
* org.slf4j:slf4j-api:1.7.30 -> 1.7.36
37
### NEXT_VERSION_DESCRIPTION_END
48
## [15.0.1]() (11-11-2021)
59

‎db-queue-brave/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ dependencies {
1010
compileOnly 'com.google.code.findbugs:jsr305:3.0.1',
1111
'com.google.code.findbugs:annotations:3.0.1'
1212

13-
testCompile 'junit:junit:4.12',
14-
'org.mockito:mockito-core:3.6.28',
15-
'org.apache.logging.log4j:log4j-core:2.13.3',
16-
'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3'
13+
testCompile 'junit:junit:4.13.2',
14+
'org.mockito:mockito-core:4.0.0',
15+
'org.apache.logging.log4j:log4j-core:2.17.1',
16+
'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
1717

1818
testCompileOnly 'com.google.code.findbugs:jsr305:3.0.1',
1919
'com.google.code.findbugs:annotations:3.0.1'

‎db-queue-core/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ buildscript {
44

55
dependencies {
66

7-
compile 'org.slf4j:slf4j-api:1.7.30'
7+
compile 'org.slf4j:slf4j-api:1.7.36'
88

99
compileOnly 'com.google.code.findbugs:jsr305:3.0.1',
1010
'com.google.code.findbugs:annotations:3.0.1'
1111

12-
testCompile 'junit:junit:4.12',
13-
'org.apache.logging.log4j:log4j-core:2.13.3',
14-
'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3',
15-
'org.mockito:mockito-core:3.6.28',
12+
testCompile 'junit:junit:4.13.2',
13+
'org.apache.logging.log4j:log4j-core:2.17.1',
14+
'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1',
15+
'org.mockito:mockito-core:4.0.0',
1616
'com.tngtech.archunit:archunit:0.9.1',
17-
'nl.jqno.equalsverifier:equalsverifier:3.3'
17+
'nl.jqno.equalsverifier:equalsverifier:3.9'
1818

1919

2020
testCompileOnly 'com.google.code.findbugs:jsr305:3.0.1',

‎db-queue-core/src/test/java/ru/yoomoney/tech/dbqueue/config/QueueServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import static org.mockito.Mockito.mock;
3333
import static org.mockito.Mockito.times;
3434
import static org.mockito.Mockito.verify;
35+
import static org.mockito.Mockito.verifyNoInteractions;
3536
import static org.mockito.Mockito.verifyNoMoreInteractions;
36-
import static org.mockito.Mockito.verifyZeroInteractions;
3737
import static org.mockito.Mockito.when;
3838

3939
/**
@@ -107,7 +107,7 @@ public void should_not_do_any_operations_when_queue_is_not_registered() throws E
107107
errorMessages.add(exc.getMessage());
108108
}
109109

110-
verifyZeroInteractions(queueExecutionPool);
110+
verifyNoInteractions(queueExecutionPool);
111111
assertThat(errorMessages.toString(), equalTo(
112112
"[cannot invoke start, queue is not registered: queueId=test, " +
113113
"cannot invoke pause, queue is not registered: queueId=test, " +

‎db-queue-core/src/test/java/ru/yoomoney/tech/dbqueue/internal/runner/QueueRunnerInExternalExecutorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.mockito.Mockito.mock;
2222
import static org.mockito.Mockito.spy;
2323
import static org.mockito.Mockito.verify;
24-
import static org.mockito.Mockito.verifyZeroInteractions;
24+
import static org.mockito.Mockito.verifyNoInteractions;
2525
import static org.mockito.Mockito.when;
2626

2727
/**
@@ -52,9 +52,9 @@ public void should_wait_notasktimeout_when_no_task_found() throws Exception {
5252

5353
assertThat(status, equalTo(QueueProcessingStatus.SKIPPED));
5454

55-
verifyZeroInteractions(executor);
55+
verifyNoInteractions(executor);
5656
verify(taskPicker).pickTask();
57-
verifyZeroInteractions(taskProcessor);
57+
verifyNoInteractions(taskProcessor);
5858
}
5959

6060
@Test

‎db-queue-core/src/test/java/ru/yoomoney/tech/dbqueue/internal/runner/QueueRunnerInSeparateTransactionsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import static org.junit.Assert.assertThat;
1818
import static org.mockito.Mockito.mock;
1919
import static org.mockito.Mockito.verify;
20-
import static org.mockito.Mockito.verifyZeroInteractions;
20+
import static org.mockito.Mockito.verifyNoInteractions;
2121
import static org.mockito.Mockito.when;
2222

2323
/**
@@ -48,7 +48,7 @@ public void should_wait_notasktimeout_when_no_task_found() {
4848
assertThat(status, equalTo(QueueProcessingStatus.SKIPPED));
4949

5050
verify(taskPicker).pickTask();
51-
verifyZeroInteractions(taskProcessor);
51+
verifyNoInteractions(taskProcessor);
5252
}
5353

5454
@Test

‎db-queue-spring/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ dependencies {
66

77
compile project(':db-queue-core')
88

9-
def springVersion = '5.3.2'
9+
def springVersion = '5.3.16'
1010
compile "org.springframework:spring-jdbc:${springVersion}",
1111
"org.springframework:spring-tx:${springVersion}"
1212

1313
compileOnly 'com.google.code.findbugs:jsr305:3.0.1',
1414
'com.google.code.findbugs:annotations:3.0.1'
1515

16-
testCompile 'junit:junit:4.12',
17-
'org.apache.logging.log4j:log4j-core:2.13.3',
18-
'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3',
19-
'org.mockito:mockito-core:3.6.28',
20-
'nl.jqno.equalsverifier:equalsverifier:3.3',
16+
testCompile 'junit:junit:4.13.2',
17+
'org.apache.logging.log4j:log4j-core:2.17.1',
18+
'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1',
19+
'org.mockito:mockito-core:4.0.0',
20+
'nl.jqno.equalsverifier:equalsverifier:3.9',
2121

22-
'org.testcontainers:testcontainers:1.16.0',
22+
'org.testcontainers:testcontainers:1.16.3',
23+
'org.testcontainers:postgresql:1.16.3',
24+
'org.testcontainers:mssqlserver:1.16.3',
2325

24-
'org.testcontainers:postgresql:1.16.0',
25-
'org.postgresql:postgresql:42.2.18',
26+
'org.postgresql:postgresql:42.3.3',
2627

27-
'org.testcontainers:mssqlserver:1.16.0',
2828
'com.microsoft.sqlserver:mssql-jdbc:8.2.0.jre8',
2929

3030
'org.testcontainers:oracle-xe:1.16.0',

‎db-queue-test/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ dependencies {
1111

1212
'io.zipkin.brave:brave-context-log4j2:5.10.2',
1313

14-
'junit:junit:4.12',
14+
'junit:junit:4.13.2',
1515

16-
'org.apache.logging.log4j:log4j-core:2.13.3',
17-
'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3',
16+
'org.apache.logging.log4j:log4j-core:2.17.1',
17+
'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1',
1818

19-
'org.testcontainers:testcontainers:1.16.0',
20-
'org.testcontainers:postgresql:1.16.0',
21-
'org.postgresql:postgresql:42.2.18'
19+
'org.testcontainers:testcontainers:1.16.3',
20+
'org.testcontainers:postgresql:1.16.3',
21+
'org.postgresql:postgresql:42.3.3'
2222

2323

2424
compileOnly 'com.google.code.findbugs:jsr305:3.0.1',

0 commit comments

Comments
 (0)