Skip to content

Commit 5ec66b7

Browse files
committed
Upgrade versions; prepare for milestone release
1 parent 8c7e4f9 commit 5ec66b7

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ ext {
5151
junitJupiterVersion = '5.6.0'
5252
log4jVersion = '2.12.1'
5353
logbackVersion = '1.2.3'
54-
micrometerVersion = '1.5.2'
55-
mockitoVersion = '3.0.0'
54+
micrometerVersion = '1.5.3'
55+
mockitoVersion = '3.4.6'
5656
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.9.0'
5757
rabbitmqHttpClientVersion = '3.2.0.RELEASE'
58-
reactorVersion = '2020.0.0-M1'
59-
springDataCommonsVersion = '2.3.1.RELEASE'
60-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-M1'
58+
reactorVersion = '2020.0.0-M2'
59+
springDataCommonsVersion = '2.4.0-M2'
60+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-M2'
6161
springRetryVersion = '1.3.0'
6262
}
6363

spring-amqp/src/main/java/org/springframework/amqp/support/converter/SimpleMessageConverter.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.springframework.amqp.core.MessageProperties;
2929
import org.springframework.amqp.utils.SerializationUtils;
3030
import org.springframework.beans.factory.BeanClassLoaderAware;
31-
import org.springframework.remoting.rmi.CodebaseAwareObjectInputStream;
3231
import org.springframework.util.ClassUtils;
3332

3433
/**
@@ -58,16 +57,20 @@ public void setBeanClassLoader(ClassLoader beanClassLoader) {
5857
}
5958

6059
/**
61-
* Set the codebase URL to download classes from if not found locally. Can consists of multiple URLs, separated by
62-
* spaces.
60+
* Set the codebase URL to download classes from if not found locally. Can consist of
61+
* multiple URLs, separated by spaces.
6362
* <p>
6463
* Follows RMI's codebase conventions for dynamic class download.
6564
*
6665
* @param codebaseUrl The codebase URL.
6766
*
67+
* @deprecated due to deprecation of
68+
* {@link org.springframework.remoting.rmi.CodebaseAwareObjectInputStream}.
69+
*
6870
* @see org.springframework.remoting.rmi.CodebaseAwareObjectInputStream
6971
* @see java.rmi.server.RMIClassLoader
7072
*/
73+
@Deprecated
7174
public void setCodebaseUrl(String codebaseUrl) {
7275
this.codebaseUrl = codebaseUrl;
7376
}
@@ -170,8 +173,10 @@ else if (object instanceof Serializable) {
170173
* @throws IOException if creation of the ObjectInputStream failed
171174
* @see org.springframework.remoting.rmi.CodebaseAwareObjectInputStream
172175
*/
176+
@SuppressWarnings("deprecation")
173177
protected ObjectInputStream createObjectInputStream(InputStream is, String codebaseUrl) throws IOException {
174-
return new CodebaseAwareObjectInputStream(is, this.beanClassLoader, codebaseUrl) {
178+
return new org.springframework.remoting.rmi.CodebaseAwareObjectInputStream(is, this.beanClassLoader,
179+
codebaseUrl) {
175180

176181
@Override
177182
protected Class<?> resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.mockito.Mockito.spy;
3434
import static org.mockito.Mockito.times;
3535
import static org.mockito.Mockito.verify;
36-
import static org.mockito.Mockito.verifyZeroInteractions;
36+
import static org.mockito.Mockito.verifyNoInteractions;
3737

3838
import java.util.ArrayList;
3939
import java.util.Collections;
@@ -336,7 +336,7 @@ public void testWithinInvoke() throws Exception {
336336
verify(connection, times(1)).createChannel(false);
337337
verify(channel1, times(4)).queueDeclare();
338338
verify(channel1, times(1)).close();
339-
verifyZeroInteractions(channel2);
339+
verifyNoInteractions(channel2);
340340
}
341341

342342
@Test

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitMessagingTemplateTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class RabbitMessagingTemplateTests {
7272

7373
@BeforeEach
7474
public void setup() {
75-
MockitoAnnotations.initMocks(this);
75+
MockitoAnnotations.openMocks(this);
7676
messagingTemplate = new RabbitMessagingTemplate(rabbitTemplate);
7777
}
7878

0 commit comments

Comments
 (0)