Skip to content

Commit db6a439

Browse files
nobodyiamnobodyiam
authored
upgrade spring boot to 2.6.6 and spring cloud to 2021.0.1 (#4295)
1 parent 039801a commit db6a439

24 files changed

Lines changed: 44 additions & 44 deletions

‎CHANGES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,6 @@ Apollo 2.0.0
4848
* [Refactor the soft delete design](https://github.com/apolloconfig/apollo/pull/3866)
4949
* [Fix the potential data inconsistency issue](https://github.com/apolloconfig/apollo/pull/4256)
5050
* [Fix the deleted items display issue in text mode](https://github.com/apolloconfig/apollo/pull/4279)
51+
* [Upgrade spring boot to 2.6.6 and spring cloud to 2021.0.1](https://github.com/apolloconfig/apollo/pull/4295)
5152
------------------
5253
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)

‎apollo-adminservice/src/test/resources/application.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ spring.h2.console.enabled = true
2121
spring.h2.console.settings.web-allow-others=true
2222
spring.main.allow-bean-definition-overriding=true
2323
spring.cloud.consul.enabled=false
24-
spring.cloud.zookeeper.enabled=false
24+
spring.cloud.zookeeper.enabled=false
25+
spring.jpa.defer-datasource-initialization=true

‎apollo-biz/src/test/resources/application.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ spring.jpa.properties.hibernate.metadata_builder_contributor=com.ctrip.framework
2020
spring.h2.console.enabled = true
2121
spring.h2.console.settings.web-allow-others=true
2222
spring.cloud.consul.enabled=false
23-
spring.cloud.zookeeper.enabled=false
23+
spring.cloud.zookeeper.enabled=false
24+
spring.jpa.defer-datasource-initialization=true

‎apollo-client/src/test/java/com/ctrip/framework/apollo/internals/AbstractConfigTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
package com.ctrip.framework.apollo.internals;
1818

1919
import static org.junit.Assert.assertEquals;
20+
import static org.mockito.ArgumentMatchers.any;
21+
import static org.mockito.ArgumentMatchers.eq;
2022
import static org.mockito.Mockito.spy;
2123
import static org.mockito.Mockito.times;
2224
import static org.mockito.Mockito.verify;
@@ -36,7 +38,6 @@
3638
import java.util.concurrent.TimeoutException;
3739
import java.util.concurrent.atomic.AtomicInteger;
3840
import org.junit.Test;
39-
import org.mockito.Matchers;
4041

4142
/**
4243
* @author wxq
@@ -71,7 +72,7 @@ public void onChange(ConfigChangeEvent changeEvent) {
7172
// wait a minute for invoking
7273
Thread.sleep(100);
7374

74-
verify(configChangeListener, times(0)).onChange(Matchers.<ConfigChangeEvent>any());
75+
verify(configChangeListener, times(0)).onChange(any());
7576
}
7677

7778
@Test
@@ -115,8 +116,8 @@ public void onChange(ConfigChangeEvent changeEvent) {
115116

116117
assertEquals(2, invokeCount.get());
117118

118-
verify(configChangeListener1, times(1)).onChange(Matchers.eq(configChangeEvent));
119-
verify(configChangeListener2, times(1)).onChange(Matchers.eq(configChangeEvent));
119+
verify(configChangeListener1, times(1)).onChange(eq(configChangeEvent));
120+
verify(configChangeListener2, times(1)).onChange(eq(configChangeEvent));
120121
}
121122

122123
@Test
@@ -159,8 +160,8 @@ public void onChange(ConfigChangeEvent changeEvent) {
159160

160161
assertEquals(2, invokeCount.get());
161162

162-
verify(configChangeListener1, times(1)).onChange(Matchers.<ConfigChangeEvent>any());
163-
verify(configChangeListener2, times(1)).onChange(Matchers.<ConfigChangeEvent>any());
163+
verify(configChangeListener1, times(1)).onChange(any());
164+
verify(configChangeListener2, times(1)).onChange(any());
164165
}
165166

166167
/**

‎apollo-client/src/test/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEventTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.ctrip.framework.apollo.ConfigChangeListener;
2222
import com.ctrip.framework.apollo.enums.ConfigSourceType;
2323
import com.ctrip.framework.apollo.enums.PropertyChangeType;
24-
import com.ctrip.framework.apollo.internals.AbstractConfig;
2524
import com.ctrip.framework.apollo.model.ConfigChange;
2625
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
2726
import com.google.common.collect.Sets;
@@ -35,7 +34,6 @@
3534
import java.util.concurrent.TimeUnit;
3635
import java.util.concurrent.TimeoutException;
3736
import org.junit.Test;
38-
import org.mockito.Matchers;
3937

4038
import static org.mockito.Mockito.*;
4139

@@ -78,7 +76,7 @@ public void onChange(ConfigChangeEvent changeEvent) {
7876

7977
onChangeFuture.get(500, TimeUnit.MILLISECONDS);
8078

81-
verify(configChangeListener, atLeastOnce()).onChange(Matchers.<ConfigChangeEvent>any());
79+
verify(configChangeListener, atLeastOnce()).onChange(any());
8280
}
8381

8482
/**

‎apollo-client/src/test/java/com/ctrip/framework/apollo/internals/JsonConfigFileTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.junit.Test;
3030
import org.junit.runner.RunWith;
3131
import org.mockito.Mock;
32-
import org.mockito.runners.MockitoJUnitRunner;
32+
import org.mockito.junit.MockitoJUnitRunner;
3333

3434
import com.ctrip.framework.apollo.core.ConfigConsts;
3535
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;

‎apollo-client/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.ctrip.framework.apollo.internals;
1818

1919
import static org.junit.Assert.assertEquals;
20-
import static org.mockito.Matchers.eq;
20+
import static org.mockito.ArgumentMatchers.eq;
2121
import static org.mockito.Mockito.mock;
2222
import static org.mockito.Mockito.times;
2323
import static org.mockito.Mockito.verify;

‎apollo-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesCompatibleFileConfigRepositoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.junit.Test;
3232
import org.junit.runner.RunWith;
3333
import org.mockito.Mock;
34-
import org.mockito.runners.MockitoJUnitRunner;
34+
import org.mockito.junit.MockitoJUnitRunner;
3535

3636
@RunWith(MockitoJUnitRunner.class)
3737
public class PropertiesCompatibleFileConfigRepositoryTest {

‎apollo-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesConfigFileTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.junit.runner.RunWith;
3838
import org.mockito.Mock;
3939
import org.mockito.invocation.InvocationOnMock;
40-
import org.mockito.runners.MockitoJUnitRunner;
40+
import org.mockito.junit.MockitoJUnitRunner;
4141

4242
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
4343
import org.mockito.stubbing.Answer;

‎apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollServiceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import static org.junit.Assert.assertEquals;
2020
import static org.junit.Assert.assertNotNull;
2121
import static org.junit.Assert.assertTrue;
22-
import static org.mockito.Matchers.any;
23-
import static org.mockito.Matchers.eq;
22+
import static org.mockito.ArgumentMatchers.any;
23+
import static org.mockito.ArgumentMatchers.eq;
2424
import static org.mockito.Mockito.doAnswer;
2525
import static org.mockito.Mockito.mock;
2626
import static org.mockito.Mockito.never;
@@ -55,7 +55,7 @@
5555
import org.mockito.Mock;
5656
import org.mockito.Mockito;
5757
import org.mockito.invocation.InvocationOnMock;
58-
import org.mockito.runners.MockitoJUnitRunner;
58+
import org.mockito.junit.MockitoJUnitRunner;
5959
import org.mockito.stubbing.Answer;
6060
import org.springframework.test.util.ReflectionTestUtils;
6161

0 commit comments

Comments
 (0)