This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 989da55 adjust samples to work with 2.7.5-SNAPSHOT
989da55 is described below
commit 989da5561ef6b5e33aad45fe6566fa9a4011c57f
Author: ken.lj <[email protected]>
AuthorDate: Fri Nov 1 17:44:44 2019 +0800
adjust samples to work with 2.7.5-SNAPSHOT
---
dubbo-samples-cloud-native/dubbo-call-sc/dubbo-sc-consumer/pom.xml | 2 +-
.../dubbo-call-scdubbo/dubbo-scdubbo-consumer/pom.xml | 2 +-
.../dubbo-call-scdubbo/dubbo-scdubbo-provider2/pom.xml | 2 +-
.../dubbo-demo-servicediscovery-xml/servicediscovery-consumer/pom.xml | 2 +-
.../dubbo-demo-servicediscovery-xml/servicediscovery-provider/pom.xml | 2 +-
dubbo-samples-cloud-native/pom.xml | 2 +-
dubbo-samples-cloud-native/sc-call-dubbo/sc-dubbo-provider/pom.xml | 2 +-
.../src/main/java/org/apache/dubbo/demo/provider/Application.java | 4 ++--
.../servicediscovery-transfer-consumer-old/pom.xml | 2 +-
.../servicediscovery-transfer-consumer/pom.xml | 2 +-
.../servicediscovery-transfer-provider/pom.xml | 2 +-
.../org/apache/dubbo/samples/generic/call/GenericCallProvider.java | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dubbo-samples-cloud-native/dubbo-call-sc/dubbo-sc-consumer/pom.xml
b/dubbo-samples-cloud-native/dubbo-call-sc/dubbo-sc-consumer/pom.xml
index 5b26513..5834477 100644
--- a/dubbo-samples-cloud-native/dubbo-call-sc/dubbo-sc-consumer/pom.xml
+++ b/dubbo-samples-cloud-native/dubbo-call-sc/dubbo-sc-consumer/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-config-spring</artifactId>
+ <artifactId>dubbo-bootstrap-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git
a/dubbo-samples-cloud-native/dubbo-call-scdubbo/dubbo-scdubbo-consumer/pom.xml
b/dubbo-samples-cloud-native/dubbo-call-scdubbo/dubbo-scdubbo-consumer/pom.xml
index e87c33a..1b6274b 100644
---
a/dubbo-samples-cloud-native/dubbo-call-scdubbo/dubbo-scdubbo-consumer/pom.xml
+++
b/dubbo-samples-cloud-native/dubbo-call-scdubbo/dubbo-scdubbo-consumer/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-config-spring</artifactId>
+ <artifactId>dubbo-bootstrap-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git
a/dubbo-samples-cloud-native/dubbo-call-scdubbo/dubbo-scdubbo-provider2/pom.xml
b/dubbo-samples-cloud-native/dubbo-call-scdubbo/dubbo-scdubbo-provider2/pom.xml
index a9a2393..747c3fe 100644
---
a/dubbo-samples-cloud-native/dubbo-call-scdubbo/dubbo-scdubbo-provider2/pom.xml
+++
b/dubbo-samples-cloud-native/dubbo-call-scdubbo/dubbo-scdubbo-provider2/pom.xml
@@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-config-spring</artifactId>
+ <artifactId>dubbo-bootstrap-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git
a/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/servicediscovery-consumer/pom.xml
b/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/servicediscovery-consumer/pom.xml
index 2a6f5ce..578a758 100644
---
a/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/servicediscovery-consumer/pom.xml
+++
b/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/servicediscovery-consumer/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-config-spring</artifactId>
+ <artifactId>dubbo-bootstrap-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git
a/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/servicediscovery-provider/pom.xml
b/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/servicediscovery-provider/pom.xml
index d9f0ce9..56d4757 100644
---
a/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/servicediscovery-provider/pom.xml
+++
b/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/servicediscovery-provider/pom.xml
@@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-config-spring</artifactId>
+ <artifactId>dubbo-bootstrap-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-samples-cloud-native/pom.xml
b/dubbo-samples-cloud-native/pom.xml
index 5328616..7aba306 100644
--- a/dubbo-samples-cloud-native/pom.xml
+++ b/dubbo-samples-cloud-native/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-bom</artifactId>
- <version>2.7.5-cloudnative-SNAPSHOT</version>
+ <version>2.7.5-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/dubbo-samples-cloud-native/sc-call-dubbo/sc-dubbo-provider/pom.xml
b/dubbo-samples-cloud-native/sc-call-dubbo/sc-dubbo-provider/pom.xml
index ed95447..ff6927f 100644
--- a/dubbo-samples-cloud-native/sc-call-dubbo/sc-dubbo-provider/pom.xml
+++ b/dubbo-samples-cloud-native/sc-call-dubbo/sc-dubbo-provider/pom.xml
@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-config-spring</artifactId>
+ <artifactId>dubbo-bootstrap-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git
a/dubbo-samples-cloud-native/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
b/dubbo-samples-cloud-native/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
index 1dc4191..56d4fc0 100644
---
a/dubbo-samples-cloud-native/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
+++
b/dubbo-samples-cloud-native/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
@@ -22,7 +22,7 @@ import org.apache.dubbo.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.ServiceConfig;
+import org.apache.dubbo.config.service.ServiceConfig;
import org.apache.dubbo.demo.provider.rest.UserService;
import org.apache.dubbo.demo.provider.rest.UserServiceImpl;
@@ -35,7 +35,7 @@ public class Application {
ProtocolConfig protocolConfig = new ProtocolConfig("rest");
protocolConfig.setPort(8090);
- DubboBootstrap bootstrap = new DubboBootstrap();
+ DubboBootstrap bootstrap = DubboBootstrap.getInstance();
bootstrap.application(new ApplicationConfig("dubbo-provider-for-sc"))
.registry(new
RegistryConfig("consul://127.0.0.1:8500?registry-type=service"))
.protocol(protocolConfig)
diff --git
a/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-consumer-old/pom.xml
b/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-consumer-old/pom.xml
index a406146..e97214c 100644
---
a/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-consumer-old/pom.xml
+++
b/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-consumer-old/pom.xml
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-config-spring</artifactId>
+ <artifactId>dubbo-bootstrap-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git
a/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-consumer/pom.xml
b/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-consumer/pom.xml
index a90ad77..694f339 100644
---
a/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-consumer/pom.xml
+++
b/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-consumer/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-config-spring</artifactId>
+ <artifactId>dubbo-bootstrap-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git
a/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-provider/pom.xml
b/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-provider/pom.xml
index 18e8247..c4efc1f 100644
---
a/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-provider/pom.xml
+++
b/dubbo-samples-cloud-native/servicediscovery-transfer/servicediscovery-transfer-provider/pom.xml
@@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-config-spring</artifactId>
+ <artifactId>dubbo-bootstrap-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git
a/dubbo-samples-generic/dubbo-samples-generic-call/dubbo-samples-generic-call-provider/src/main/java/org/apache/dubbo/samples/generic/call/GenericCallProvider.java
b/dubbo-samples-generic/dubbo-samples-generic-call/dubbo-samples-generic-call-provider/src/main/java/org/apache/dubbo/samples/generic/call/GenericCallProvider.java
index 3825c5d..30577cd 100644
---
a/dubbo-samples-generic/dubbo-samples-generic-call/dubbo-samples-generic-call-provider/src/main/java/org/apache/dubbo/samples/generic/call/GenericCallProvider.java
+++
b/dubbo-samples-generic/dubbo-samples-generic-call/dubbo-samples-generic-call-provider/src/main/java/org/apache/dubbo/samples/generic/call/GenericCallProvider.java
@@ -26,7 +26,7 @@ import java.util.concurrent.CountDownLatch;
public class GenericCallProvider {
public static void main(String[] args) throws Exception {
- new EmbeddedZooKeeper(2181, false).start();
+// new EmbeddedZooKeeper(2181, false).start();
ClassPathXmlApplicationContext context = new
ClassPathXmlApplicationContext("spring/generic-provider.xml");
context.start();
System.out.println("dubbo service started");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
