apolloconfig · lepdou · Apr 4, 2022 · Apr 2, 2022
diff --git a/CHANGES.md b/CHANGES.md
@@ -48,5 +48,6 @@ Apollo 2.0.0
 * [Refactor the soft delete design](https://github.com/apolloconfig/apollo/pull/3866)
 * [Fix the potential data inconsistency issue](https://github.com/apolloconfig/apollo/pull/4256)
 * [Fix the deleted items display issue in text mode](https://github.com/apolloconfig/apollo/pull/4279)
+* [Upgrade spring boot to 2.6.6 and spring cloud to 2021.0.1](https://github.com/apolloconfig/apollo/pull/4295)
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
diff --git a/apollo-adminservice/src/test/resources/application.properties b/apollo-adminservice/src/test/resources/application.properties
@@ -21,4 +21,5 @@ spring.h2.console.enabled = true
 spring.h2.console.settings.web-allow-others=true
 spring.main.allow-bean-definition-overriding=true
 spring.cloud.consul.enabled=false
-spring.cloud.zookeeper.enabled=false
+spring.cloud.zookeeper.enabled=false
+spring.jpa.defer-datasource-initialization=true
diff --git a/apollo-biz/src/test/resources/application.properties b/apollo-biz/src/test/resources/application.properties
@@ -20,4 +20,5 @@ spring.jpa.properties.hibernate.metadata_builder_contributor=com.ctrip.framework
 spring.h2.console.enabled = true
 spring.h2.console.settings.web-allow-others=true
 spring.cloud.consul.enabled=false
-spring.cloud.zookeeper.enabled=false
+spring.cloud.zookeeper.enabled=false
+spring.jpa.defer-datasource-initialization=true
diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/AbstractConfigTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/AbstractConfigTest.java
@@ -17,6 +17,8 @@
 package com.ctrip.framework.apollo.internals;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -36,7 +38,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Test;
-import org.mockito.Matchers;
 
 /**
  * @author wxq
@@ -71,7 +72,7 @@ public void onChange(ConfigChangeEvent changeEvent) {
     // wait a minute for invoking
     Thread.sleep(100);
 
-    verify(configChangeListener, times(0)).onChange(Matchers.<ConfigChangeEvent>any());
+    verify(configChangeListener, times(0)).onChange(any());
   }
 
   @Test
@@ -115,8 +116,8 @@ public void onChange(ConfigChangeEvent changeEvent) {
 
     assertEquals(2, invokeCount.get());
 
-    verify(configChangeListener1, times(1)).onChange(Matchers.eq(configChangeEvent));
-    verify(configChangeListener2, times(1)).onChange(Matchers.eq(configChangeEvent));
+    verify(configChangeListener1, times(1)).onChange(eq(configChangeEvent));
+    verify(configChangeListener2, times(1)).onChange(eq(configChangeEvent));
   }
 
   @Test
@@ -159,8 +160,8 @@ public void onChange(ConfigChangeEvent changeEvent) {
 
     assertEquals(2, invokeCount.get());
 
-    verify(configChangeListener1, times(1)).onChange(Matchers.<ConfigChangeEvent>any());
-    verify(configChangeListener2, times(1)).onChange(Matchers.<ConfigChangeEvent>any());
+    verify(configChangeListener1, times(1)).onChange(any());
+    verify(configChangeListener2, times(1)).onChange(any());
   }
 
   /**

diff --git a/...t/src/test/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEventTest.java b/...t/src/test/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEventTest.java
@@ -21,7 +21,6 @@
 import com.ctrip.framework.apollo.ConfigChangeListener;
 import com.ctrip.framework.apollo.enums.ConfigSourceType;
 import com.ctrip.framework.apollo.enums.PropertyChangeType;
-import com.ctrip.framework.apollo.internals.AbstractConfig;
 import com.ctrip.framework.apollo.model.ConfigChange;
 import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 import com.google.common.collect.Sets;
@@ -35,7 +34,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.Test;
-import org.mockito.Matchers;
 
 import static org.mockito.Mockito.*;
 
@@ -78,7 +76,7 @@ public void onChange(ConfigChangeEvent changeEvent) {
 
     onChangeFuture.get(500, TimeUnit.MILLISECONDS);
 
-    verify(configChangeListener, atLeastOnce()).onChange(Matchers.<ConfigChangeEvent>any());
+    verify(configChangeListener, atLeastOnce()).onChange(any());
   }
 
   /**

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/JsonConfigFileTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/JsonConfigFileTest.java
@@ -29,7 +29,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;

diff --git a/...ent/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java b/...ent/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java
@@ -17,7 +17,7 @@
 package com.ctrip.framework.apollo.internals;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

diff --git a/...va/com/ctrip/framework/apollo/internals/PropertiesCompatibleFileConfigRepositoryTest.java b/...va/com/ctrip/framework/apollo/internals/PropertiesCompatibleFileConfigRepositoryTest.java
@@ -31,7 +31,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class PropertiesCompatibleFileConfigRepositoryTest {

diff --git a/...o-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesConfigFileTest.java b/...o-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesConfigFileTest.java
@@ -37,7 +37,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
 import org.mockito.stubbing.Answer;

diff --git a/...t/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollServiceTest.java b/...t/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollServiceTest.java
@@ -19,8 +19,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -55,7 +55,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.springframework.test.util.ReflectionTestUtils;
 

diff --git a/...client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java b/...client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java
@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.doAnswer;
@@ -65,7 +65,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 
 /**

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/SimpleConfigTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/SimpleConfigTest.java
@@ -32,7 +32,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.ctrip.framework.apollo.Config;
 import com.ctrip.framework.apollo.ConfigChangeListener;

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/TxtConfigFileTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/TxtConfigFileTest.java
@@ -26,7 +26,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TxtConfigFileTest {

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/XmlConfigFileTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/XmlConfigFileTest.java
@@ -37,7 +37,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/YamlConfigFileTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/YamlConfigFileTest.java
@@ -33,7 +33,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/BootstrapConfigTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/BootstrapConfigTest.java
@@ -43,8 +43,8 @@
 
 import java.util.List;
 
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigAnnotationTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigAnnotationTest.java
@@ -56,10 +56,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anySetOf;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
@@ -405,7 +404,7 @@ public void testApolloConfigChangeListenerWithInterestedKeyPrefixes_fire()
 
     verify(simpleConfig, atLeastOnce())
         .addChangeListener(any(ConfigChangeListener.class), Mockito.nullable(Set.class),
-            anySetOf(String.class));
+            anySet());
 
     Properties properties = new Properties();
     properties.put("logging.level.com", "debug");

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigPlaceholderTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigPlaceholderTest.java
@@ -17,8 +17,8 @@
 package com.ctrip.framework.apollo.spring;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/XMLConfigAnnotationTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/XMLConfigAnnotationTest.java
@@ -16,10 +16,8 @@
  */
 package com.ctrip.framework.apollo.spring;
 
-import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anySetOf;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/XmlConfigPlaceholderTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/XmlConfigPlaceholderTest.java
@@ -17,8 +17,8 @@
 package com.ctrip.framework.apollo.spring;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...test/java/com/ctrip/framework/apollo/spring/config/CachedCompositePropertySourceTest.java b/...test/java/com/ctrip/framework/apollo/spring/config/CachedCompositePropertySourceTest.java
@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -39,7 +39,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.springframework.core.env.PropertySource;
 

diff --git a/...ient/src/test/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySourceTest.java b/...ient/src/test/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySourceTest.java
@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -37,7 +37,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/apollo-configservice/src/test/resources/application.properties b/apollo-configservice/src/test/resources/application.properties
@@ -22,6 +22,7 @@ spring.h2.console.settings.web-allow-others=true
 spring.cloud.consul.enabled=false
 spring.cloud.zookeeper.enabled=false
 spring.main.allow-bean-definition-overriding=true
+spring.jpa.defer-datasource-initialization=true
 
 # for ReleaseMessageScanner test
 apollo.message-scan.interval=100
diff --git a/pom.xml b/pom.xml
@@ -63,8 +63,8 @@
 		<revision>2.0.0-SNAPSHOT</revision>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.4.12</spring-boot.version>
-		<spring-cloud.version>2020.0.4</spring-cloud.version>
+		<spring-boot.version>2.6.6</spring-boot.version>
+		<spring-cloud.version>2021.0.1</spring-cloud.version>
 		<jaxb.version>2.3.1</jaxb.version>
 		<javax.activation.version>1.1.1</javax.activation.version>
 		<javax.mail.version>1.6.2</javax.mail.version>