Skip to content

Commit 838abe0

Browse files
committed
Upgrade dependencies
* Fix `ActiveMQMultiContextTests` for `amqFactory.setTrustAllPackages(true)`
1 parent fbf06e8 commit 838abe0

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = '1.3.70'
2+
ext.kotlinVersion = '1.3.71'
33
repositories {
44
maven { url 'https://repo.spring.io/plugins-release' }
55
}
@@ -16,7 +16,7 @@ plugins {
1616
id 'io.spring.nohttp' version '0.0.4.RELEASE' apply false
1717
id 'org.ajoberstar.grgit' version '4.0.1'
1818
id "io.spring.dependency-management" version '1.0.9.RELEASE'
19-
id 'com.jfrog.artifactory' version '4.14.1' apply false
19+
id 'com.jfrog.artifactory' version '4.15.1' apply false
2020
id 'org.jetbrains.dokka' version '0.10.1'
2121
}
2222

@@ -44,12 +44,12 @@ ext {
4444
modifiedFiles =
4545
files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
4646

47-
activeMqVersion = '5.15.11'
47+
activeMqVersion = '5.15.12'
4848
apacheSshdVersion = '2.4.0'
4949
avroVersion = '1.9.2'
5050
aspectjVersion = '1.9.5'
5151
assertjVersion = '3.15.0'
52-
assertkVersion = '0.21'
52+
assertkVersion = '0.22'
5353
awaitilityVersion = '4.0.2'
5454
commonsDbcp2Version = '2.7.0'
5555
commonsIoVersion = '2.6'
@@ -74,18 +74,18 @@ ext {
7474
jschVersion = '0.1.55'
7575
jsonpathVersion = '2.4.0'
7676
junit4Version = '4.13'
77-
junitJupiterVersion = '5.6.0'
77+
junitJupiterVersion = '5.6.1'
7878
jythonVersion = '2.7.0'
7979
kryoShadedVersion = '4.0.2'
8080
lettuceVersion = '5.2.2.RELEASE'
8181
log4jVersion = '2.13.1'
82-
micrometerVersion = '1.3.5'
83-
mockitoVersion = '3.3.0'
84-
mongoDriverVersion = '4.0.0'
82+
micrometerVersion = '1.3.6'
83+
mockitoVersion = '3.3.3'
84+
mongoDriverVersion = '4.0.1'
8585
mysqlVersion = '8.0.19'
8686
pahoMqttClientVersion = '1.2.2'
87-
postgresVersion = '42.2.10'
88-
reactorVersion = 'Dysprosium-SR5'
87+
postgresVersion = '42.2.11'
88+
reactorVersion = 'Dysprosium-SR6'
8989
resilience4jVersion = '1.3.1'
9090
romeToolsVersion = '1.12.2'
9191
rsocketVersion = '1.0.0-RC6'
@@ -95,7 +95,7 @@ ext {
9595
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : 'Neumann-M4'
9696
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.3.0.RELEASE'
9797
springRetryVersion = '1.2.5.RELEASE'
98-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.4.RELEASE'
98+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.5.RELEASE'
9999
springWsVersion = '3.0.8.RELEASE'
100100
tomcatVersion = "9.0.31"
101101
xstreamVersion = '1.4.11.1'

spring-integration-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 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,8 +16,6 @@
1616

1717
package org.springframework.integration.jms;
1818

19-
import javax.jms.ConnectionFactory;
20-
2119
import org.apache.activemq.ActiveMQConnectionFactory;
2220
import org.apache.activemq.transport.vm.VMTransport;
2321
import org.junit.AfterClass;
@@ -29,19 +27,23 @@
2927
* Keeps an ActiveMQ {@link VMTransport} open for the duration of
3028
* all tests (avoids cycling the transport each time the last
3129
* connection is closed).
30+
*
3231
* @author Gary Russell
32+
*
3333
* @since 3.0
3434
*
3535
*/
3636
public abstract class ActiveMQMultiContextTests {
3737

38-
protected static final ConnectionFactory amqFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
38+
protected static final ActiveMQConnectionFactory amqFactory =
39+
new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
3940

40-
protected static final CachingConnectionFactory connectionFactory = new CachingConnectionFactory(
41-
amqFactory);
41+
protected static final CachingConnectionFactory connectionFactory =
42+
new CachingConnectionFactory(amqFactory);
4243

4344
@BeforeClass
4445
public static void startUp() throws Exception {
46+
amqFactory.setTrustAllPackages(true);
4547
connectionFactory.setCacheConsumers(false);
4648
connectionFactory.createConnection().close();
4749
}

0 commit comments

Comments
 (0)