Skip to content

Upgrade to Spring Boot 2.6.4 #31

Merged
layfe merged 2 commits into from
Mar 17, 2022
Merged

Upgrade to Spring Boot 2.6.4 #31

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce44fa2
Upgrade to Spring Boot 2.6.4
Mar 11, 2022
bfda38a
Upgrade dependency versions
Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### NEXT_VERSION_TYPE=MAJOR|MINOR|PATCH
### NEXT_VERSION_TYPE=MAJOR
### NEXT_VERSION_DESCRIPTION_BEGIN
* Upgrade to Spring Boot 2.6.4
* Upgrade dependency versions
### NEXT_VERSION_DESCRIPTION_END
## [15.0.1]() (11-11-2021)

Expand Down
8 changes: 4 additions & 4 deletions db-queue-brave/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ dependencies {
compileOnly 'com.google.code.findbugs:jsr305:3.0.1',
'com.google.code.findbugs:annotations:3.0.1'

testCompile 'junit:junit:4.12',
'org.mockito:mockito-core:3.6.28',
'org.apache.logging.log4j:log4j-core:2.13.3',
'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3'
testCompile 'junit:junit:4.13.2',
'org.mockito:mockito-core:4.0.0',
'org.apache.logging.log4j:log4j-core:2.17.1',
'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'

testCompileOnly 'com.google.code.findbugs:jsr305:3.0.1',
'com.google.code.findbugs:annotations:3.0.1'
Expand Down
12 changes: 6 additions & 6 deletions db-queue-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ buildscript {

dependencies {

compile 'org.slf4j:slf4j-api:1.7.30'
compile 'org.slf4j:slf4j-api:1.7.36'

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

testCompile 'junit:junit:4.12',
'org.apache.logging.log4j:log4j-core:2.13.3',
'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3',
'org.mockito:mockito-core:3.6.28',
testCompile 'junit:junit:4.13.2',
'org.apache.logging.log4j:log4j-core:2.17.1',
'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1',
'org.mockito:mockito-core:4.0.0',
'com.tngtech.archunit:archunit:0.9.1',
'nl.jqno.equalsverifier:equalsverifier:3.3'
'nl.jqno.equalsverifier:equalsverifier:3.9'


testCompileOnly 'com.google.code.findbugs:jsr305:3.0.1',
Expand Down
4 changes: 2 additions & 2 deletions db-queue-core/src/test/java/ru/yoomoney/tech/dbqueue/config/QueueServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;

/**
Expand Down Expand Up @@ -107,7 +107,7 @@ public void should_not_do_any_operations_when_queue_is_not_registered() throws E
errorMessages.add(exc.getMessage());
}

verifyZeroInteractions(queueExecutionPool);
verifyNoInteractions(queueExecutionPool);
assertThat(errorMessages.toString(), equalTo(
"[cannot invoke start, queue is not registered: queueId=test, " +
"cannot invoke pause, queue is not registered: queueId=test, " +
Expand Down
6 changes: 3 additions & 3 deletions ...test/java/ru/yoomoney/tech/dbqueue/internal/runner/QueueRunnerInExternalExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;

/**
Expand Down Expand Up @@ -52,9 +52,9 @@ public void should_wait_notasktimeout_when_no_task_found() throws Exception {

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

verifyZeroInteractions(executor);
verifyNoInteractions(executor);
verify(taskPicker).pickTask();
verifyZeroInteractions(taskProcessor);
verifyNoInteractions(taskProcessor);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions .../java/ru/yoomoney/tech/dbqueue/internal/runner/QueueRunnerInSeparateTransactionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;

/**
Expand Down Expand Up @@ -48,7 +48,7 @@ public void should_wait_notasktimeout_when_no_task_found() {
assertThat(status, equalTo(QueueProcessingStatus.SKIPPED));

verify(taskPicker).pickTask();
verifyZeroInteractions(taskProcessor);
verifyNoInteractions(taskProcessor);
}

@Test
Expand Down
20 changes: 10 additions & 10 deletions db-queue-spring/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ dependencies {

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

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

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

testCompile 'junit:junit:4.12',
'org.apache.logging.log4j:log4j-core:2.13.3',
'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3',
'org.mockito:mockito-core:3.6.28',
'nl.jqno.equalsverifier:equalsverifier:3.3',
testCompile 'junit:junit:4.13.2',
'org.apache.logging.log4j:log4j-core:2.17.1',
'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1',
'org.mockito:mockito-core:4.0.0',
'nl.jqno.equalsverifier:equalsverifier:3.9',

'org.testcontainers:testcontainers:1.16.0',
'org.testcontainers:testcontainers:1.16.3',
'org.testcontainers:postgresql:1.16.3',
'org.testcontainers:mssqlserver:1.16.3',

'org.testcontainers:postgresql:1.16.0',
'org.postgresql:postgresql:42.2.18',
'org.postgresql:postgresql:42.3.3',

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

'org.testcontainers:oracle-xe:1.16.0',
Expand Down
12 changes: 6 additions & 6 deletions db-queue-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ dependencies {

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

'junit:junit:4.12',
'junit:junit:4.13.2',

'org.apache.logging.log4j:log4j-core:2.13.3',
'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3',
'org.apache.logging.log4j:log4j-core:2.17.1',
'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1',

'org.testcontainers:testcontainers:1.16.0',
'org.testcontainers:postgresql:1.16.0',
'org.postgresql:postgresql:42.2.18'
'org.testcontainers:testcontainers:1.16.3',
'org.testcontainers:postgresql:1.16.3',
'org.postgresql:postgresql:42.3.3'


compileOnly 'com.google.code.findbugs:jsr305:3.0.1',
Expand Down