Skip to content

Commit 28edf07

Browse files
committed
Upgrade dependencies; prepare for release
1 parent a98e80e commit 28edf07

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,24 @@ subprojects { subproject ->
7070

7171
ext {
7272
assertjVersion = '3.11.1'
73-
assertkVersion = '0.12'
74-
commonsHttpClientVersion = '4.5.5'
73+
assertkVersion = '0.13'
74+
commonsHttpClientVersion = '4.5.7'
7575
googleJsr305Version = '3.0.2'
7676
hamcrestVersion = '1.3'
7777
jackson2Version = '2.9.8'
7878
junit4Version = '4.12'
79-
junitJupiterVersion = '5.3.2'
80-
junitPlatformVersion = '1.3.2'
81-
log4jVersion = '2.11.1'
79+
junitJupiterVersion = '5.4.0'
80+
junitPlatformVersion = '1.4.0'
81+
log4jVersion = '2.11.2'
8282
logbackVersion = '1.2.3'
83-
mockitoVersion = '2.23.4'
83+
mockitoVersion = '2.24.0'
8484
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.4.3'
8585
rabbitmqHttpClientVersion = '2.1.0.RELEASE'
86-
reactorVersion = '3.2.3.RELEASE'
86+
reactorVersion = '3.2.6.RELEASE'
8787

88-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.4.RELEASE'
88+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.5.RELEASE'
8989

90-
springRetryVersion = '1.2.3.RELEASE'
90+
springRetryVersion = '1.2.4.RELEASE'
9191
}
9292

9393
eclipse {
@@ -355,7 +355,7 @@ task reference(type: org.asciidoctor.gradle.AsciidoctorTask) {
355355
}
356356
options doctype: 'book', eruby: 'erubis'
357357
attributes 'source-highlighter': 'coderay',
358-
'icons': 'font',
358+
'icons': 'font',
359359
"project-version=$project.version"
360360
}
361361

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j2/AmqpAppender.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2018 the original author or authors.
2+
* Copyright 2016-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -130,8 +130,10 @@ public class AmqpAppender extends AbstractAppender {
130130
*/
131131
private final Object layoutMutex = new Object();
132132

133+
@SuppressWarnings("deprecation") // For backward compatibility
133134
public AmqpAppender(String name, Filter filter, Layout<? extends Serializable> layout, boolean ignoreExceptions,
134135
AmqpManager manager, BlockingQueue<Event> eventQueue) {
136+
135137
super(name, filter, layout, ignoreExceptions);
136138
this.manager = manager;
137139
this.events = eventQueue;

spring-rabbit/src/test/kotlin/org/springframework/amqp/rabbit/annotation/EnableRabbitKotlinTests.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 the original author or authors.
2+
* Copyright 2018-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.amqp.rabbit.annotation
1818

19-
import assertk.assert
19+
import assertk.assertThat
2020
import assertk.assertions.isTrue
2121
import org.junit.jupiter.api.Test
2222
import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory
@@ -53,14 +53,14 @@ class EnableRabbitKotlinTests {
5353
fun `send and wait for consume` () {
5454
val template = RabbitTemplate(this.config.cf())
5555
template.convertAndSend("kotlinQueue", "test")
56-
assert(this.config.latch.await(10, TimeUnit.SECONDS)).isTrue();
56+
assertThat(this.config.latch.await(10, TimeUnit.SECONDS)).isTrue();
5757
}
5858

5959
@Test
6060
fun `send and wait for consume with EH` () {
6161
val template = RabbitTemplate(this.config.cf())
6262
template.convertAndSend("kotlinQueue1", "test")
63-
assert(this.config.ehLatch.await(10, TimeUnit.SECONDS)).isTrue();
63+
assertThat(this.config.ehLatch.await(10, TimeUnit.SECONDS)).isTrue();
6464
}
6565

6666
@Configuration

0 commit comments

Comments
 (0)