Skip to content

Commit 715e9a2

Browse files
artembilangaryrussell
artembilan
authored and
garyrussell
committed
Upgrade dependencies including Gradle 6.1
* Add `org.gradle.caching=true` and `org.gradle.parallel=true` into a `gradle.properties` * Fix `Matcher` tests in the `spring-integration-test-support` for the latest JUnit 4
1 parent dba307a commit 715e9a2

File tree

7 files changed

+78
-74
lines changed

7 files changed

+78
-74
lines changed

‎build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ buildscript {
1313
plugins {
1414
id 'org.sonarqube' version '2.8'
1515
id 'org.asciidoctor.convert' version '1.6.1'
16-
id 'io.spring.nohttp' version '0.0.3.RELEASE' apply false
17-
id 'org.ajoberstar.grgit' version '4.0.0'
16+
id 'io.spring.nohttp' version '0.0.4.RELEASE' apply false
17+
id 'org.ajoberstar.grgit' version '4.0.1'
1818
id "io.spring.dependency-management" version '1.0.8.RELEASE'
19-
id 'com.jfrog.artifactory' version '4.11.0' apply false
19+
id 'com.jfrog.artifactory' version '4.13.0' apply false
2020
}
2121

2222
if (System.getenv('TRAVIS') || System.getenv('bamboo_buildKey')) {
@@ -49,7 +49,7 @@ ext {
4949
aspectjVersion = '1.9.5'
5050
assertjVersion = '3.14.0'
5151
assertkVersion = '0.20'
52-
awaitilityVersion = '4.0.1'
52+
awaitilityVersion = '4.0.2'
5353
commonsDbcp2Version = '2.7.0'
5454
commonsIoVersion = '2.6'
5555
commonsNetVersion = '3.6'
@@ -72,29 +72,29 @@ ext {
7272
jrubyVersion = '9.2.9.0'
7373
jschVersion = '0.1.55'
7474
jsonpathVersion = '2.4.0'
75-
junit4Version = '4.12'
75+
junit4Version = '4.13'
7676
junitJupiterVersion = '5.5.2'
7777
jythonVersion = '2.7.0'
7878
kryoShadedVersion = '4.0.2'
7979
lettuceVersion = '5.2.1.RELEASE'
8080
log4jVersion = '2.13.0'
81-
micrometerVersion = '1.3.2'
81+
micrometerVersion = '1.3.3'
8282
mockitoVersion = '3.2.4'
8383
mongoDriverVersion = '1.12.0'
8484
mysqlVersion = '8.0.18'
8585
pahoMqttClientVersion = '1.2.0'
8686
postgresVersion = '42.2.9'
87-
reactorVersion = 'Dysprosium-BUILD-SNAPSHOT'
87+
reactorVersion = 'Dysprosium-SR3'
8888
resilience4jVersion = '1.2.0'
8989
romeToolsVersion = '1.12.2'
9090
rsocketVersion = '1.0.0-RC5'
9191
servletApiVersion = '4.0.1'
9292
smackVersion = '4.3.4'
93-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.3.BUILD-SNAPSHOT'
94-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : 'Neumann-BUILD-SNAPSHOT'
93+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.3.RELEASE'
94+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : 'Neumann-M1'
9595
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.3.0.M1'
9696
springRetryVersion = '1.2.5.RELEASE'
97-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.3.BUILD-SNAPSHOT'
97+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.3.RELEASE'
9898
springWsVersion = '3.0.8.RELEASE'
9999
tomcatVersion = "9.0.30"
100100
xstreamVersion = '1.4.11.1'

‎gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
version=5.3.0.BUILD-SNAPSHOT
22
org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8
3+
org.gradle.caching=true
4+
org.gradle.parallel=true

‎gradle/wrapper/gradle-wrapper.jar‎

-7 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/HeaderMatcherTests.java‎

Lines changed: 33 additions & 33 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.
@@ -21,10 +21,10 @@
2121
import java.util.Map;
2222
import java.util.UUID;
2323

24+
import org.hamcrest.MatcherAssert;
2425
import org.hamcrest.Matchers;
25-
import org.junit.Assert;
26-
import org.junit.Before;
27-
import org.junit.Test;
26+
import org.junit.jupiter.api.BeforeEach;
27+
import org.junit.jupiter.api.Test;
2828

2929
import org.springframework.messaging.Message;
3030
import org.springframework.messaging.support.MessageBuilder;
@@ -52,7 +52,7 @@ public class HeaderMatcherTests {
5252

5353
Message<?> message;
5454

55-
@Before
55+
@BeforeEach
5656
public void setUp() {
5757
message = MessageBuilder.withPayload(ANY_PAYLOAD)
5858
.setHeader(ANY_HEADER_KEY, ANY_HEADER_VALUE)
@@ -61,73 +61,73 @@ public void setUp() {
6161

6262
@Test
6363
public void hasEntry_withValidKeyValue_matches() {
64-
Assert.assertThat(message, HeaderMatcher.hasHeader(ANY_HEADER_KEY, ANY_HEADER_VALUE));
65-
Assert.assertThat(message, HeaderMatcher.hasHeader(OTHER_HEADER_KEY, OTHER_HEADER_VALUE));
64+
MatcherAssert.assertThat(message, HeaderMatcher.hasHeader(ANY_HEADER_KEY, ANY_HEADER_VALUE));
65+
MatcherAssert.assertThat(message, HeaderMatcher.hasHeader(OTHER_HEADER_KEY, OTHER_HEADER_VALUE));
6666
}
6767

6868
@Test
6969
public void hasEntry_withUnknownKey_notMatching() {
70-
Assert.assertThat(message, Matchers.not(HeaderMatcher.hasHeader("test.unknown", ANY_HEADER_VALUE)));
70+
MatcherAssert.assertThat(message, Matchers.not(HeaderMatcher.hasHeader("test.unknown", ANY_HEADER_VALUE)));
7171
}
7272

7373
@Test
7474
public void hasEntry_withValidKeyAndMatcherValue_matches() {
75-
Assert.assertThat(message,
75+
MatcherAssert.assertThat(message,
7676
HeaderMatcher.hasHeader(ANY_HEADER_KEY, Matchers.instanceOf(String.class)));
77-
Assert.assertThat(message, HeaderMatcher.hasHeader(ANY_HEADER_KEY, Matchers.notNullValue()));
78-
Assert.assertThat(message, HeaderMatcher.hasHeader(ANY_HEADER_KEY, Matchers.is(ANY_HEADER_VALUE)));
77+
MatcherAssert.assertThat(message, HeaderMatcher.hasHeader(ANY_HEADER_KEY, Matchers.notNullValue()));
78+
MatcherAssert.assertThat(message, HeaderMatcher.hasHeader(ANY_HEADER_KEY, Matchers.is(ANY_HEADER_VALUE)));
7979
}
8080

8181
@Test
8282
public void hasEntry_withValidKeyAndMatcherValue_notMatching() {
83-
Assert.assertThat(message,
83+
MatcherAssert.assertThat(message,
8484
Matchers.not(HeaderMatcher.hasHeader(ANY_HEADER_KEY,
8585
Matchers.is(Matchers.instanceOf(Integer.class)))));
8686
}
8787

8888
@Test
8989
public void hasKey_withValidKey_matches() {
90-
Assert.assertThat(message, HeaderMatcher.hasHeaderKey(ANY_HEADER_KEY));
91-
Assert.assertThat(message, HeaderMatcher.hasHeaderKey(OTHER_HEADER_KEY));
90+
MatcherAssert.assertThat(message, HeaderMatcher.hasHeaderKey(ANY_HEADER_KEY));
91+
MatcherAssert.assertThat(message, HeaderMatcher.hasHeaderKey(OTHER_HEADER_KEY));
9292
}
9393

9494
@Test
9595
public void hasKey_withInvalidKey_notMatching() {
96-
Assert.assertThat(message, Matchers.not(HeaderMatcher.hasHeaderKey(UNKNOWN_KEY)));
96+
MatcherAssert.assertThat(message, Matchers.not(HeaderMatcher.hasHeaderKey(UNKNOWN_KEY)));
9797
}
9898

9999
@Test
100100
public void hasAllEntries_withMessageHeader_matches() {
101101
Map<String, Object> expectedInHeaderMap = message.getHeaders();
102-
Assert.assertThat(message, HeaderMatcher.hasAllHeaders(expectedInHeaderMap));
102+
MatcherAssert.assertThat(message, HeaderMatcher.hasAllHeaders(expectedInHeaderMap));
103103
}
104104

105105
@Test
106106
public void hasAllEntries_withValidKeyValueOrMatcherValue_matches() {
107107
Map<String, Object> expectedInHeaderMap = new HashMap<>();
108108
expectedInHeaderMap.put(ANY_HEADER_KEY, ANY_HEADER_VALUE);
109109
expectedInHeaderMap.put(OTHER_HEADER_KEY, Matchers.is(OTHER_HEADER_VALUE));
110-
Assert.assertThat(message, HeaderMatcher.hasAllHeaders(expectedInHeaderMap));
110+
MatcherAssert.assertThat(message, HeaderMatcher.hasAllHeaders(expectedInHeaderMap));
111111
}
112112

113113
@Test
114114
public void hasAllEntries_withInvalidValidKeyValueOrMatcherValue_notMatching() {
115115
Map<String, Object> expectedInHeaderMap = new HashMap<>();
116116
expectedInHeaderMap.put(ANY_HEADER_KEY, ANY_HEADER_VALUE); // valid
117117
expectedInHeaderMap.put(UNKNOWN_KEY, Matchers.not(Matchers.nullValue())); // fails
118-
Assert.assertThat(message, Matchers.not(HeaderMatcher.hasAllHeaders(expectedInHeaderMap)));
118+
MatcherAssert.assertThat(message, Matchers.not(HeaderMatcher.hasAllHeaders(expectedInHeaderMap)));
119119
expectedInHeaderMap.remove(UNKNOWN_KEY);
120120
expectedInHeaderMap.put(OTHER_HEADER_KEY, ANY_HEADER_VALUE); // fails
121121
}
122122

123123
@Test
124124
public void readableException_singleHeader() {
125125
try {
126-
Assert.assertThat(message, HeaderMatcher.hasHeader("corn", "bread"));
126+
MatcherAssert.assertThat(message, HeaderMatcher.hasHeader("corn", "bread"));
127127
}
128128
catch (AssertionError ae) {
129-
Assert.assertThat(ae.getMessage(), Matchers.containsString("Expected: a Message with Headers containing "
130-
));
129+
MatcherAssert.assertThat(ae.getMessage(),
130+
Matchers.containsString("Expected: a Message with Headers containing "));
131131
}
132132
}
133133

@@ -137,53 +137,53 @@ public void readableException_allHeaders() {
137137
Map<String, String> entries = new HashMap<>();
138138
entries.put("corn", "bread");
139139
entries.put("chocolate", "pudding");
140-
Assert.assertThat(message, HeaderMatcher.hasAllHeaders(entries));
140+
MatcherAssert.assertThat(message, HeaderMatcher.hasAllHeaders(entries));
141141
}
142142
catch (AssertionError ae) {
143-
Assert.assertThat(ae.getMessage(), Matchers.containsString("Expected: a Message with Headers containing "
144-
));
143+
MatcherAssert.assertThat(ae.getMessage(),
144+
Matchers.containsString("Expected: a Message with Headers containing "));
145145
}
146146
}
147147

148148
@Test
149149
public void hasMessageId_sameId() {
150-
Assert.assertThat(message, HeaderMatcher.hasMessageId(message.getHeaders().getId()));
150+
MatcherAssert.assertThat(message, HeaderMatcher.hasMessageId(message.getHeaders().getId()));
151151
}
152152

153153
@Test
154154
public void hasCorrelationId_() {
155155
UUID correlationId = message.getHeaders().getId();
156156
message = MessageBuilder.withPayload("blabla").setHeader("correlationId", correlationId).build();
157-
Assert.assertThat(message, HeaderMatcher.hasCorrelationId(correlationId));
157+
MatcherAssert.assertThat(message, HeaderMatcher.hasCorrelationId(correlationId));
158158
}
159159

160160
@Test
161161
public void hasSequenceNumber_() {
162162
int sequenceNumber = 123;
163163
message = MessageBuilder.fromMessage(message).setHeader("sequenceNumber", sequenceNumber).build();
164-
Assert.assertThat(message, HeaderMatcher.hasSequenceNumber(sequenceNumber));
164+
MatcherAssert.assertThat(message, HeaderMatcher.hasSequenceNumber(sequenceNumber));
165165
}
166166

167167
@Test
168168
public void hasSequenceSize_() {
169169
int sequenceSize = 123;
170170
message = MessageBuilder.fromMessage(message).setHeader("sequenceSize", sequenceSize).build();
171-
Assert.assertThat(message, HeaderMatcher.hasSequenceSize(sequenceSize));
172-
Assert.assertThat(message, HeaderMatcher.hasSequenceSize(Matchers.is(sequenceSize)));
171+
MatcherAssert.assertThat(message, HeaderMatcher.hasSequenceSize(sequenceSize));
172+
MatcherAssert.assertThat(message, HeaderMatcher.hasSequenceSize(Matchers.is(sequenceSize)));
173173
}
174174

175175
@Test
176176
public void hasTimestamp_() {
177-
Assert.assertThat(message, HeaderMatcher.hasTimestamp(new Date(message.getHeaders().getTimestamp())));
177+
MatcherAssert.assertThat(message, HeaderMatcher.hasTimestamp(new Date(message.getHeaders().getTimestamp())));
178178
}
179179

180180
@Test
181181
public void hasExpirationDate_() {
182-
Assert.assertThat(message, Matchers.not(HeaderMatcher.hasExpirationDate(Matchers.any(Long.class))));
182+
MatcherAssert.assertThat(message, Matchers.not(HeaderMatcher.hasExpirationDate(Matchers.any(Long.class))));
183183
Date expirationDate = new Date(System.currentTimeMillis() + 10000);
184184
message = MessageBuilder.fromMessage(message).setHeader("expirationDate", expirationDate.getTime()).build();
185-
Assert.assertThat(message, HeaderMatcher.hasExpirationDate(expirationDate));
186-
Assert.assertThat(message,
185+
MatcherAssert.assertThat(message, HeaderMatcher.hasExpirationDate(expirationDate));
186+
MatcherAssert.assertThat(message,
187187
HeaderMatcher.hasExpirationDate(Matchers.not(Matchers.is((System.currentTimeMillis())))));
188188
}
189189

‎spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/MapContainsTests.java‎

Lines changed: 21 additions & 20 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.
@@ -19,14 +19,15 @@
1919
import java.util.HashMap;
2020
import java.util.Map;
2121

22+
import org.hamcrest.MatcherAssert;
2223
import org.hamcrest.Matchers;
23-
import org.junit.Assert;
24-
import org.junit.Before;
25-
import org.junit.Test;
24+
import org.junit.jupiter.api.BeforeEach;
25+
import org.junit.jupiter.api.Test;
2626

2727
/**
2828
* @author Alex Peters
2929
* @author Gunnar Hillert
30+
* @author Artem Bilan
3031
*
3132
*/
3233
public class MapContainsTests {
@@ -39,11 +40,11 @@ public class MapContainsTests {
3940

4041
static final String OTHER_KEY = "test.number";
4142

42-
static final Integer OTHER_VALUE = Integer.valueOf(123);
43+
static final Integer OTHER_VALUE = 123;
4344

4445
private HashMap<String, Object> map;
4546

46-
@Before
47+
@BeforeEach
4748
public void setUp() {
4849
map = new HashMap<>();
4950
map.put(SOME_KEY, SOME_VALUE);
@@ -52,36 +53,36 @@ public void setUp() {
5253

5354
@Test
5455
public void hasKey_validKey_matching() {
55-
Assert.assertThat(map, Matchers.hasKey(SOME_KEY));
56+
MatcherAssert.assertThat(map, Matchers.hasKey(SOME_KEY));
5657

5758
}
5859

5960
@Test
6061
public void hasKey_unknownKey_notMatching() {
61-
Assert.assertThat(map, Matchers.not(Matchers.hasKey(UNKNOWN_KEY)));
62+
MatcherAssert.assertThat(map, Matchers.not(Matchers.hasKey(UNKNOWN_KEY)));
6263
}
6364

6465
@Test
6566
public void hasEntry_withValidKeyValue_matches() {
66-
Assert.assertThat(map, Matchers.hasEntry(SOME_KEY, SOME_VALUE));
67-
Assert.assertThat(map, Matchers.hasEntry(OTHER_KEY, OTHER_VALUE));
67+
MatcherAssert.assertThat(map, Matchers.hasEntry(SOME_KEY, SOME_VALUE));
68+
MatcherAssert.assertThat(map, Matchers.hasEntry(OTHER_KEY, OTHER_VALUE));
6869
}
6970

7071
@Test
7172
public void hasEntry_withUnknownKey_notMatching() {
72-
Assert.assertThat(map, Matchers.not(Matchers.hasEntry("test.unknown", SOME_VALUE)));
73+
MatcherAssert.assertThat(map, Matchers.not(Matchers.hasEntry("test.unknown", SOME_VALUE)));
7374
}
7475

7576
@Test
7677
public void hasEntry_withValidKeyAndMatcherValue_matches() {
77-
Assert.assertThat(map, Matchers.hasEntry(Matchers.is(SOME_KEY), Matchers.instanceOf(String.class)));
78-
Assert.assertThat(map, Matchers.hasEntry(Matchers.is(SOME_KEY), Matchers.notNullValue()));
79-
Assert.assertThat(map, Matchers.hasEntry(Matchers.is(SOME_KEY), Matchers.is(SOME_VALUE)));
78+
MatcherAssert.assertThat(map, Matchers.hasEntry(Matchers.is(SOME_KEY), Matchers.instanceOf(String.class)));
79+
MatcherAssert.assertThat(map, Matchers.hasEntry(Matchers.is(SOME_KEY), Matchers.notNullValue()));
80+
MatcherAssert.assertThat(map, Matchers.hasEntry(Matchers.is(SOME_KEY), Matchers.is(SOME_VALUE)));
8081
}
8182

8283
@Test
8384
public void hasEntry_withValidKeyAndMatcherValue_notMatching() {
84-
Assert.assertThat(map,
85+
MatcherAssert.assertThat(map,
8586
Matchers.not(Matchers.hasEntry(SOME_KEY, Matchers.is(Matchers.instanceOf(Integer.class)))));
8687
}
8788

@@ -90,25 +91,25 @@ public void hasEntry_withTypedValueMap_matches() {
9091
Map<String, String> map = new HashMap<>();
9192
map.put("a", "b");
9293
map.put("c", "d");
93-
Assert.assertThat(map, Matchers.hasEntry("a", "b"));
94-
Assert.assertThat(map, Matchers.not(Matchers.hasEntry(SOME_KEY, Matchers.is("a"))));
95-
Assert.assertThat(map, MapContentMatchers.hasAllEntries(map));
94+
MatcherAssert.assertThat(map, Matchers.hasEntry("a", "b"));
95+
MatcherAssert.assertThat(map, Matchers.not(Matchers.hasEntry(SOME_KEY, Matchers.is("a"))));
96+
MatcherAssert.assertThat(map, MapContentMatchers.hasAllEntries(map));
9697
}
9798

9899
@Test
99100
public void hasAllEntries_withValidKeyValueOrMatcherValue_matches() {
100101
Map<String, Object> expectedInHeaderMap = new HashMap<>();
101102
expectedInHeaderMap.put(SOME_KEY, SOME_VALUE);
102103
expectedInHeaderMap.put(OTHER_KEY, Matchers.is(OTHER_VALUE));
103-
Assert.assertThat(map, MapContentMatchers.hasAllEntries(expectedInHeaderMap));
104+
MatcherAssert.assertThat(map, MapContentMatchers.hasAllEntries(expectedInHeaderMap));
104105
}
105106

106107
@Test
107108
public void hasAllEntries_withInvalidValidKeyValueOrMatcherValue_notMatching() {
108109
Map<String, Object> expectedInHeaderMap = new HashMap<>();
109110
expectedInHeaderMap.put(SOME_KEY, SOME_VALUE); // valid
110111
expectedInHeaderMap.put(UNKNOWN_KEY, Matchers.not(Matchers.nullValue())); // fails
111-
Assert.assertThat(map, Matchers.not(MapContentMatchers.hasAllEntries(expectedInHeaderMap)));
112+
MatcherAssert.assertThat(map, Matchers.not(MapContentMatchers.hasAllEntries(expectedInHeaderMap)));
112113
expectedInHeaderMap.remove(UNKNOWN_KEY);
113114
expectedInHeaderMap.put(OTHER_KEY, SOME_VALUE); // fails
114115
}

0 commit comments

Comments
 (0)