You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@dubbo.apache.org by vi...@apache.org on 2018/12/25 09:27:05 UTC

[incubator-dubbo-samples] branch master updated (d4e1a15 -> 1eb0b9e)

This is an automated email from the ASF dual-hosted git repository.

victory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git.


    from d4e1a15  Update README.md
     new 26df37f  update dubbo version to 2.6.5
     new e2a99eb  Merge branch 'master' of github.com:dubbo/dubbo-samples
     new 1eb0b9e  fix sample issue

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dubbo-samples-annotation/pom.xml                                 | 9 ++++++++-
 dubbo-samples-docker/pom.xml                                     | 4 ++--
 dubbo-samples-echo/src/main/resources/spring/echo-provider.xml   | 4 ++--
 dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml | 4 ++--
 pom.xml                                                          | 4 ++--
 5 files changed, 16 insertions(+), 9 deletions(-)


Re: [incubator-dubbo-samples] branch master updated (d4e1a15 -> 1eb0b9e)

Posted by Huxing Zhang <hu...@apache.org>.
Hi,

Messages like this should be sent to notification@, not dev@,

I have leave a message to INFRA[1]

[1] https://issues.apache.org/jira/browse/INFRA-17180

On Tue, Dec 25, 2018 at 5:27 PM <vi...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> victory pushed a change to branch master
> in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git.
>
>
>     from d4e1a15  Update README.md
>      new 26df37f  update dubbo version to 2.6.5
>      new e2a99eb  Merge branch 'master' of github.com:dubbo/dubbo-samples
>      new 1eb0b9e  fix sample issue
>
> The 3 revisions listed above as "new" are entirely new to this
> repository and will be described in separate emails.  The revisions
> listed as "add" were already present in the repository and have only
> been added to this reference.
>
>
> Summary of changes:
>  dubbo-samples-annotation/pom.xml                                 | 9 ++++++++-
>  dubbo-samples-docker/pom.xml                                     | 4 ++--
>  dubbo-samples-echo/src/main/resources/spring/echo-provider.xml   | 4 ++--
>  dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml | 4 ++--
>  pom.xml                                                          | 4 ++--
>  5 files changed, 16 insertions(+), 9 deletions(-)
>


-- 
Best Regards!
Huxing

[incubator-dubbo-samples] 01/03: update dubbo version to 2.6.5

Posted by vi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

victory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git

commit 26df37f1d2e48cdf183f9876c5ef50aee66b6b41
Author: cvictory <sh...@gmail.com>
AuthorDate: Wed Nov 21 11:45:13 2018 +0800

    update dubbo version to 2.6.5
---
 dubbo-samples-docker/pom.xml                                   | 4 ++--
 dubbo-samples-echo/src/main/resources/spring/echo-provider.xml | 4 ++--
 pom.xml                                                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dubbo-samples-docker/pom.xml b/dubbo-samples-docker/pom.xml
index cd13133..add7699 100644
--- a/dubbo-samples-docker/pom.xml
+++ b/dubbo-samples-docker/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dubbo</artifactId>
-            <version>2.6.4</version>
+            <version>2.6.5</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -127,4 +127,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/dubbo-samples-echo/src/main/resources/spring/echo-provider.xml b/dubbo-samples-echo/src/main/resources/spring/echo-provider.xml
index b840950..30b7052 100644
--- a/dubbo-samples-echo/src/main/resources/spring/echo-provider.xml
+++ b/dubbo-samples-echo/src/main/resources/spring/echo-provider.xml
@@ -23,7 +23,7 @@
        http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
 
     <!-- provider's application name, used for tracing dependency relationship -->
-    <dubbo:application name="demo-provider"/>
+    <dubbo:application name="demo-provider" />
 
     <!-- use multicast registry center to export service -->
     <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
@@ -37,4 +37,4 @@
     <!-- declare the service interface to be exported -->
     <dubbo:service interface="org.apache.dubbo.samples.echo.api.DemoService" ref="demoService"/>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/pom.xml b/pom.xml
index f6db953..4684404 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,8 @@
         <source.level>1.8</source.level>
         <target.level>1.8</target.level>
         <spring.version>4.3.16.RELEASE</spring.version>
-        <dubbo.version>2.6.4</dubbo.version>
-        <dubbo.rpc.version>2.6.4</dubbo.rpc.version>
+        <dubbo.version>2.6.5</dubbo.version>
+        <dubbo.rpc.version>2.6.5</dubbo.rpc.version>
         <curator.version>2.12.0</curator.version>
         <validation-api.version>1.1.0.Final</validation-api.version>
         <hibernate-validator.version>4.2.0.Final</hibernate-validator.version>


[incubator-dubbo-samples] 03/03: fix sample issue

Posted by vi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

victory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git

commit 1eb0b9e881bde0f5fec76a893c665f547f4ae72c
Author: cvictory <sh...@gmail.com>
AuthorDate: Tue Dec 25 17:26:49 2018 +0800

    fix sample issue
---
 dubbo-samples-annotation/pom.xml                                 | 9 ++++++++-
 dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dubbo-samples-annotation/pom.xml b/dubbo-samples-annotation/pom.xml
index 8383f11..1211662 100644
--- a/dubbo-samples-annotation/pom.xml
+++ b/dubbo-samples-annotation/pom.xml
@@ -27,4 +27,11 @@
 
     <artifactId>dubbo-samples-annotation</artifactId>
 
-</project>
\ No newline at end of file
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba.spring</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml b/dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml
index 5db3bf7..21c1401 100644
--- a/dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml
+++ b/dubbo-samples-merge/src/main/resources/spring/merge-consumer.xml
@@ -26,6 +26,6 @@
 
     <dubbo:registry address="zookeeper://127.0.0.1:2181"/>
 
-    <dubbo:reference id="mergeService" interface="org.apache.dubbo.samples.merge.api.MergeService" group="*"/>
+    <dubbo:reference id="mergeService" interface="org.apache.dubbo.samples.merge.api.MergeService" group="*" merger="true"/>
 
-</beans>
\ No newline at end of file
+</beans>


[incubator-dubbo-samples] 02/03: Merge branch 'master' of github.com:dubbo/dubbo-samples

Posted by vi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

victory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git

commit e2a99ebd67771a76be289470e7d52e3786932160
Merge: 26df37f d4e1a15
Author: cvictory <sh...@gmail.com>
AuthorDate: Mon Dec 24 14:39:49 2018 +0800

    Merge branch 'master' of github.com:dubbo/dubbo-samples

 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)