From 499d325531fc20e816d150595287dbdd5d3d0a4d Mon Sep 17 00:00:00 2001 From: Jason Song Date: Sat, 2 Apr 2022 19:52:09 +0800 Subject: [PATCH] upgrade spring boot to 2.6.6 and spring cloud to 2021.0.1 --- CHANGES.md | 1 + .../src/test/resources/application.properties | 3 ++- .../src/test/resources/application.properties | 3 ++- .../apollo/internals/AbstractConfigTest.java | 13 +++++++------ .../internals/InterestedConfigChangeEventTest.java | 4 +--- .../apollo/internals/JsonConfigFileTest.java | 2 +- .../internals/LocalFileConfigRepositoryTest.java | 2 +- ...ropertiesCompatibleFileConfigRepositoryTest.java | 2 +- .../apollo/internals/PropertiesConfigFileTest.java | 2 +- .../internals/RemoteConfigLongPollServiceTest.java | 6 +++--- .../internals/RemoteConfigRepositoryTest.java | 4 ++-- .../apollo/internals/SimpleConfigTest.java | 2 +- .../apollo/internals/TxtConfigFileTest.java | 2 +- .../apollo/internals/XmlConfigFileTest.java | 2 +- .../apollo/internals/YamlConfigFileTest.java | 2 +- .../apollo/spring/BootstrapConfigTest.java | 4 ++-- .../apollo/spring/JavaConfigAnnotationTest.java | 9 ++++----- .../apollo/spring/JavaConfigPlaceholderTest.java | 4 ++-- .../apollo/spring/XMLConfigAnnotationTest.java | 4 +--- .../apollo/spring/XmlConfigPlaceholderTest.java | 4 ++-- .../config/CachedCompositePropertySourceTest.java | 4 ++-- .../spring/config/ConfigPropertySourceTest.java | 4 ++-- .../src/test/resources/application.properties | 1 + pom.xml | 4 ++-- 24 files changed, 44 insertions(+), 44 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0991d52fe57..ef3557156eb 100644 --- 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 index 1fc7fe30076..6023ea462e3 100644 --- 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 \ No newline at end of file +spring.cloud.zookeeper.enabled=false +spring.jpa.defer-datasource-initialization=true \ No newline at end of file diff --git a/apollo-biz/src/test/resources/application.properties b/apollo-biz/src/test/resources/application.properties index 9f29c30a432..9b4c61093ad 100644 --- 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 \ No newline at end of file +spring.cloud.zookeeper.enabled=false +spring.jpa.defer-datasource-initialization=true \ No newline at end of file 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 index ed415bbe85b..55d3e317297 100644 --- 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.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.any()); - verify(configChangeListener2, times(1)).onChange(Matchers.any()); + verify(configChangeListener1, times(1)).onChange(any()); + verify(configChangeListener2, times(1)).onChange(any()); } /** diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEventTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEventTest.java index ae25093f9f9..9ffdfcb8d03 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEventTest.java +++ b/apollo-client/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.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 index 9640ddf4fe1..cf93cd417d0 100644 --- 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/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java index d0292cc1c58..9636e312772 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java +++ b/apollo-client/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/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesCompatibleFileConfigRepositoryTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesCompatibleFileConfigRepositoryTest.java index 738fcabb748..1b90a355853 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesCompatibleFileConfigRepositoryTest.java +++ b/apollo-client/src/test/java/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/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesConfigFileTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesConfigFileTest.java index e135ce9a99c..41add46b1d6 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/PropertiesConfigFileTest.java +++ b/apollo-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/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollServiceTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollServiceTest.java index 3083b24ff31..37fd27c08f5 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollServiceTest.java +++ b/apollo-client/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/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java index c9b74795934..812ec9624bd 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java +++ b/apollo-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 index 6089327685c..ee3fd753eac 100644 --- 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 index 26588232b24..ee712e089c0 100644 --- 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 index 3002032ea2f..a875cab6140 100644 --- 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 index 61e1c64d48a..b856d3ecffc 100644 --- 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 index 3f61b36d3cb..1e0cd75033d 100644 --- 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 index 406e1b85c77..40d5a127d33 100644 --- 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 index 58e9e26da83..ef165ddae5e 100644 --- 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 index 9d9da18de5f..09fd566a28a 100644 --- 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 index bd0bfcd8ad4..5227734ca92 100644 --- 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/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/config/CachedCompositePropertySourceTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/config/CachedCompositePropertySourceTest.java index 95085ba0fb8..9d6e11f84f4 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/config/CachedCompositePropertySourceTest.java +++ b/apollo-client/src/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/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySourceTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySourceTest.java index 96d7b1133af..f67d66a48a3 100644 --- a/apollo-client/src/test/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySourceTest.java +++ b/apollo-client/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 index 6d7364fce80..6ac3f5447d1 100644 --- 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 index b96bf01757a..923ac1755a9 100644 --- a/pom.xml +++ b/pom.xml @@ -63,8 +63,8 @@ 2.0.0-SNAPSHOT 1.8 UTF-8 - 2.4.12 - 2020.0.4 + 2.6.6 + 2021.0.1 2.3.1 1.1.1 1.6.2