This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.1.1
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.1.1 by this push:
new 42b5b48 Update Spring Boot dependencies to be 1.5.10.RELEASE
42b5b48 is described below
commit 42b5b480e978b67a5535d7ed5b6c1d2dcc152216
Author: mercyblitz <mercybl...@gmail.com>
AuthorDate: Mon Mar 26 21:57:27 2018 +0800
Update Spring Boot dependencies to be 1.5.10.RELEASE
---
README.md | 2 +-
.../com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java | 6 ++----
.../boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java | 6 ++----
.../alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java | 6 ++----
.../autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 6 ++----
.../autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java | 6 ++----
.../event/OverrideDubboConfigApplicationListenerDisableTest.java | 6 ++----
.../context/event/OverrideDubboConfigApplicationListenerTest.java | 6 ++----
.../dubbo/context/event/WelcomeLogoApplicationListenerTest.java | 6 ++----
dubbo-spring-boot-autoconfigure/src/test/resources/dubbo.properties | 5 +++++
dubbo-spring-boot-parent/pom.xml | 2 +-
11 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/README.md b/README.md
index 591aae8..2b8af73 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ If your project failed to resolve the dependency, try to add
the following repos
| versions | Java | Spring Boot | Dubbo |
| -------- | ----- | ----------------- | ---------- |
| `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + |
-| `0.1.1` | 1.7 + | `1.3.0.RELEASE` + | `2.5.11` + |
+| `0.1.1` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + |
diff --git
a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
index 09cdd1a..a3161be 100644
---
a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
+++
b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
@@ -21,8 +21,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.Map;
@@ -37,12 +36,11 @@ import static com.alibaba.dubbo.common.Version.getVersion;
* @since 1.0.0
*/
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(
+@SpringBootTest(
classes = {
DubboEndpoint.class
}
)
-@IntegrationTest
public class DubboEndpointTest {
diff --git
a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java
b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java
index 9b596fb..ae5d388 100644
---
a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java
+++
b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java
@@ -23,8 +23,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -57,14 +56,13 @@ import java.util.SortedMap;
"dubbo.scan.basePackages=com.alibaba.boot.dubbo.actuate.endpoint.mvc"
}
)
-@SpringApplicationConfiguration(
+@SpringBootTest(
classes = {
DubboAutoConfiguration.class,
DubboEndpoint.class,
DubboMvcEndpointTest.class
}
)
-@IntegrationTest
public class DubboMvcEndpointTest {
@Bean
diff --git
a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java
b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java
index 66231d4..6d736f0 100644
---
a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java
+++
b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java
@@ -24,8 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.Status;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -49,13 +48,12 @@ import java.util.Map;
"management.health.dubbo.status.defaults = memory",
"management.health.dubbo.status.extras = load,threadpool"
})
-@SpringApplicationConfiguration(
+@SpringBootTest(
classes = {
DubboHealthIndicator.class,
DubboHealthIndicatorTest.class
}
)
-@IntegrationTest
@EnableConfigurationProperties(DubboHealthIndicatorProperties.class)
@EnableDubboConfig
public class DubboHealthIndicatorTest {
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
index 8518607..96bb513 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
@@ -22,8 +22,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.test.context.TestPropertySource;
@@ -56,10 +55,9 @@ import static
org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncl
"dubbo.scan.basePackages=com.alibaba.boot.dubbo,
com.alibaba.boot.dubbo.condition"
}
)
-@SpringApplicationConfiguration(
+@SpringBootTest(
classes = {DubboAutoConfiguration.class}
)
-@IntegrationTest
public class DubboAutoConfigurationOnMultipleConfigTest {
@Autowired
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java
index 7dee041..4b5efc9 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java
@@ -23,8 +23,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.test.context.TestPropertySource;
@@ -49,10 +48,9 @@ import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
"dubbo.consumer.client=netty"
}
)
-@SpringApplicationConfiguration(
+@SpringBootTest(
classes = {DubboAutoConfiguration.class}
)
-@IntegrationTest
public class DubboAutoConfigurationOnSingleConfigTest {
@Autowired
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerDisableTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerDisableTest.java
index 94ebb51..c425b83 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerDisableTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerDisableTest.java
@@ -21,8 +21,7 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -43,10 +42,9 @@ import java.util.Properties;
"dubbo.module.name = dubbo-demo-module",
}
)
-@SpringApplicationConfiguration(
+@SpringBootTest(
classes = {OverrideDubboConfigApplicationListener.class}
)
-@IntegrationTest
public class OverrideDubboConfigApplicationListenerDisableTest {
@BeforeClass
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerTest.java
index e3875c0..c7d98d0 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerTest.java
@@ -21,8 +21,7 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -43,10 +42,9 @@ import java.util.Properties;
"dubbo.registry.address = zookeeper://192.168.99.100:32770"
}
)
-@SpringApplicationConfiguration(
+@SpringBootTest(
classes = {OverrideDubboConfigApplicationListener.class}
)
-@IntegrationTest
public class OverrideDubboConfigApplicationListenerTest {
@BeforeClass
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListenerTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListenerTest.java
index 27a167b..b603264 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListenerTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListenerTest.java
@@ -20,8 +20,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
@@ -32,10 +31,9 @@ import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @since 1.0.0
*/
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(
+@SpringBootTest(
classes = {WelcomeLogoApplicationListener.class}
)
-@IntegrationTest
public class WelcomeLogoApplicationListenerTest {
@Autowired
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/resources/dubbo.properties
b/dubbo-spring-boot-autoconfigure/src/test/resources/dubbo.properties
new file mode 100644
index 0000000..3184253
--- /dev/null
+++ b/dubbo-spring-boot-autoconfigure/src/test/resources/dubbo.properties
@@ -0,0 +1,5 @@
+dubbo.application.NAME=hello
+dubbo.application.owneR=world
+dubbo.registry.Address=10.20.153.17
+dubbo.protocol.pORt=20881
+dubbo.service.invoke.timeout=2000
\ No newline at end of file
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index 50bdb60..cc21e66 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -20,7 +20,7 @@
<java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <spring-boot.version>1.3.0.RELEASE</spring-boot.version>
+ <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
<dubbo.version>2.5.11</dubbo.version>
<zkclient.version>0.2</zkclient.version>
<zookeeper.version>3.4.9</zookeeper.version>
--
To stop receiving notification emails like this one, please contact
mercybl...@apache.org.
