Skip to content

Commit 65dc351

Browse files
wcy666103wcy666103
authored
Reorganize the dependency in dubbo-demo (#15384)
* first commit * second commit
1 parent c1ae4b9 commit 65dc351

14 files changed

Lines changed: 37 additions & 201 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ Get more details by visiting the links below to get your hands dirty with some w
5656
| 3.2.16 | 1.8 ～ 17 | [dependency list](https://github.com/apache/dubbo/blob/dubbo-3.2.5/dubbo-dependencies-bom/pom.xml#L94) | **- Stable version (active)** <br/> **- Features** <br/> &nbsp;&nbsp;- Out-of-box metrics and tracing support.<br/> &nbsp;&nbsp;- Threadpool Isolation<br/> &nbsp;&nbsp;- 30% performance<br/> &nbsp;&nbsp;- Native Image |
5757
| 3.1.11 | 1.8 ～ 17 | [dependency list](https://github.com/apache/dubbo/blob/dubbo-3.2.11/dubbo-dependencies-bom/pom.xml#L90) | **Stable version (not active)** |
5858

59-
| **Dubbo2** | **JDK** | **Dependencies** | **Description** |
60-
| --- | --- | --- | --- |
59+
| **Dubbo2** | **JDK** | **Dependencies** | **Description** |
60+
| --- | --- |---------------------------------------------------------------------------------------------------------| --- |
6161
| 2.7.23 | 1.8 | [dependency list](https://github.com/apache/dubbo/blob/dubbo-2.7.23/dubbo-dependencies-bom/pom.xml#L92) | EOL |
62-
| 2.6.x, 2.5.x | 1.6 ～ 1.7 | | EOL |
62+
| 2.6.x, 2.5.x | 1.6 ～ 1.7 | [dependency list](https://github.com/apache/dubbo/blob/dubbo-2.6.12/dependencies-bom/pom.xml#L90) | EOL |
6363

6464
## Contributing
6565
See [CONTRIBUTING](https://github.com/apache/dubbo/blob/master/CONTRIBUTING.md) for details on submitting patches and the contribution workflow.

‎dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,41 +41,11 @@
4141
<artifactId>dubbo-config-api</artifactId>
4242
<version>${project.version}</version>
4343
</dependency>
44-
<dependency>
45-
<groupId>org.apache.dubbo</groupId>
46-
<artifactId>dubbo-registry-multicast</artifactId>
47-
<version>${project.version}</version>
48-
</dependency>
4944
<dependency>
5045
<groupId>org.apache.dubbo</groupId>
5146
<artifactId>dubbo-registry-zookeeper</artifactId>
5247
<version>${project.version}</version>
5348
</dependency>
54-
<dependency>
55-
<groupId>org.apache.dubbo</groupId>
56-
<artifactId>dubbo-registry-nacos</artifactId>
57-
<version>${project.version}</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.apache.dubbo</groupId>
61-
<artifactId>dubbo-configcenter-zookeeper</artifactId>
62-
<version>${project.version}</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.apache.dubbo</groupId>
66-
<artifactId>dubbo-configcenter-nacos</artifactId>
67-
<version>${project.version}</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.apache.dubbo</groupId>
71-
<artifactId>dubbo-metadata-report-zookeeper</artifactId>
72-
<version>${project.version}</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.apache.dubbo</groupId>
76-
<artifactId>dubbo-metadata-report-nacos</artifactId>
77-
<version>${project.version}</version>
78-
</dependency>
7949
<dependency>
8050
<groupId>org.apache.dubbo</groupId>
8151
<artifactId>dubbo-rpc-dubbo</artifactId>
@@ -91,11 +61,6 @@
9161
<artifactId>dubbo-serialization-hessian2</artifactId>
9262
<version>${project.version}</version>
9363
</dependency>
94-
<dependency>
95-
<groupId>org.apache.dubbo</groupId>
96-
<artifactId>dubbo-serialization-fastjson2</artifactId>
97-
<version>${project.version}</version>
98-
</dependency>
9964
<dependency>
10065
<groupId>org.apache.logging.log4j</groupId>
10166
<artifactId>log4j-slf4j-impl</artifactId>

‎dubbo-demo/dubbo-demo-api/dubbo-demo-api-interface/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<artifactId>dubbo-demo-api-interface</artifactId>
2828

2929
<properties>
30-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3130
<skip_maven_deploy>true</skip_maven_deploy>
3231
</properties>
3332

‎dubbo-demo/dubbo-demo-api/dubbo-demo-api-interface/src/main/java/org/apache/dubbo/api/demo/DemoService.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@ public interface DemoService {
2222

2323
String sayHello(String name);
2424

25+
/**
26+
* Asynchronous method example.
27+
* <p>
28+
* This method returns a {@link CompletableFuture<String>} to demonstrate Dubbo's asynchronous invocation capability.
29+
* Developers are recommended to refer to the official sample project for complete usage:
30+
* <a href="https://github.com/lqscript/dubbo-samples/tree/master/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future">
31+
* Dubbo Async Invocation Sample</a>
32+
* </p>
33+
*
34+
* @param name Input name parameter
35+
* @return Asynchronous result wrapped in CompletableFuture
36+
*/
2537
default CompletableFuture<String> sayHelloAsync(String name) {
2638
return CompletableFuture.completedFuture(sayHello(name));
2739
}

‎dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml‎

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -43,41 +43,6 @@
4343
<artifactId>dubbo-config-api</artifactId>
4444
<version>${project.version}</version>
4545
</dependency>
46-
<dependency>
47-
<groupId>org.apache.dubbo</groupId>
48-
<artifactId>dubbo-registry-multicast</artifactId>
49-
<version>${project.version}</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.apache.dubbo</groupId>
53-
<artifactId>dubbo-registry-zookeeper</artifactId>
54-
<version>${project.version}</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.apache.dubbo</groupId>
58-
<artifactId>dubbo-registry-nacos</artifactId>
59-
<version>${project.version}</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.apache.dubbo</groupId>
63-
<artifactId>dubbo-configcenter-zookeeper</artifactId>
64-
<version>${project.version}</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.apache.dubbo</groupId>
68-
<artifactId>dubbo-configcenter-nacos</artifactId>
69-
<version>${project.version}</version>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.apache.dubbo</groupId>
73-
<artifactId>dubbo-metadata-report-zookeeper</artifactId>
74-
<version>${project.version}</version>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.apache.dubbo</groupId>
78-
<artifactId>dubbo-metadata-report-nacos</artifactId>
79-
<version>${project.version}</version>
80-
</dependency>
8146
<dependency>
8247
<groupId>org.apache.dubbo</groupId>
8348
<artifactId>dubbo-rpc-dubbo</artifactId>
@@ -90,12 +55,12 @@
9055
</dependency>
9156
<dependency>
9257
<groupId>org.apache.dubbo</groupId>
93-
<artifactId>dubbo-serialization-hessian2</artifactId>
58+
<artifactId>dubbo-registry-zookeeper</artifactId>
9459
<version>${project.version}</version>
9560
</dependency>
9661
<dependency>
9762
<groupId>org.apache.dubbo</groupId>
98-
<artifactId>dubbo-serialization-fastjson2</artifactId>
63+
<artifactId>dubbo-serialization-hessian2</artifactId>
9964
<version>${project.version}</version>
10065
</dependency>
10166
<dependency>

‎dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import org.apache.dubbo.api.demo.DemoService;
2020
import org.apache.dubbo.rpc.RpcContext;
2121

22-
import java.util.concurrent.CompletableFuture;
23-
2422
import org.slf4j.Logger;
2523
import org.slf4j.LoggerFactory;
2624

@@ -34,9 +32,4 @@ public String sayHello(String name) {
3432
return "Hello " + name + ", response from provider: "
3533
+ RpcContext.getServiceContext().getLocalAddress();
3634
}
37-
38-
@Override
39-
public CompletableFuture<String> sayHelloAsync(String name) {
40-
return null;
41-
}
4235
}

‎dubbo-demo/dubbo-demo-spring-boot-idl/dubbo-demo-spring-boot-idl-consumer/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<artifactId>dubbo-demo-spring-boot-idl-consumer</artifactId>
2727

2828
<properties>
29-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3029
<skip_maven_deploy>true</skip_maven_deploy>
3130
</properties>
3231

‎dubbo-demo/dubbo-demo-spring-boot-idl/dubbo-demo-spring-boot-idl-provider/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<artifactId>dubbo-demo-spring-boot-idl-provider</artifactId>
2727

2828
<properties>
29-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3029
<skip_maven_deploy>true</skip_maven_deploy>
3130
</properties>
3231

‎dubbo-demo/dubbo-demo-spring-boot-idl/pom.xml‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -48,108 +48,35 @@
4848
<artifactId>spring-boot-starter</artifactId>
4949
<version>${spring-boot.version}</version>
5050
</dependency>
51-
<dependency>
52-
<groupId>org.apache.dubbo</groupId>
53-
<artifactId>dubbo-filter-cache</artifactId>
54-
<version>${project.version}</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.apache.dubbo</groupId>
58-
<artifactId>dubbo-config-api</artifactId>
59-
<version>${project.version}</version>
60-
</dependency>
6151
<dependency>
6252
<groupId>org.apache.dubbo</groupId>
6353
<artifactId>dubbo-config-spring</artifactId>
6454
<version>${project.version}</version>
6555
</dependency>
66-
<dependency>
67-
<groupId>org.apache.dubbo</groupId>
68-
<artifactId>dubbo-common</artifactId>
69-
<version>${project.version}</version>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.apache.dubbo</groupId>
73-
<artifactId>dubbo-registry-api</artifactId>
74-
<version>${project.version}</version>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.apache.dubbo</groupId>
78-
<artifactId>dubbo-registry-multicast</artifactId>
79-
<version>${project.version}</version>
80-
</dependency>
8156
<dependency>
8257
<groupId>org.apache.dubbo</groupId>
8358
<artifactId>dubbo-registry-zookeeper</artifactId>
8459
<version>${project.version}</version>
8560
</dependency>
86-
<dependency>
87-
<groupId>org.apache.dubbo</groupId>
88-
<artifactId>dubbo-registry-nacos</artifactId>
89-
<version>${project.version}</version>
90-
</dependency>
91-
<dependency>
92-
<groupId>com.alibaba.nacos</groupId>
93-
<artifactId>nacos-client</artifactId>
94-
</dependency>
9561
<dependency>
9662
<groupId>org.apache.dubbo</groupId>
9763
<artifactId>dubbo-configcenter-zookeeper</artifactId>
9864
<version>${project.version}</version>
9965
</dependency>
100-
<dependency>
101-
<groupId>org.apache.dubbo</groupId>
102-
<artifactId>dubbo-configcenter-nacos</artifactId>
103-
<version>${project.version}</version>
104-
</dependency>
10566
<dependency>
10667
<groupId>org.apache.dubbo</groupId>
10768
<artifactId>dubbo-metadata-report-zookeeper</artifactId>
10869
<version>${project.version}</version>
10970
</dependency>
110-
<dependency>
111-
<groupId>org.apache.dubbo</groupId>
112-
<artifactId>dubbo-metadata-report-nacos</artifactId>
113-
<version>${project.version}</version>
114-
</dependency>
115-
<dependency>
116-
<groupId>org.apache.dubbo</groupId>
117-
<artifactId>dubbo-rpc-triple</artifactId>
118-
<version>${project.parent.version}</version>
119-
</dependency>
120-
<dependency>
121-
<groupId>org.apache.dubbo</groupId>
122-
<artifactId>dubbo-remoting-netty4</artifactId>
123-
<version>${project.version}</version>
124-
</dependency>
125-
<dependency>
126-
<groupId>org.apache.dubbo</groupId>
127-
<artifactId>dubbo-rpc-dubbo</artifactId>
128-
<version>${project.version}</version>
129-
</dependency>
13071
<dependency>
13172
<groupId>org.apache.dubbo</groupId>
13273
<artifactId>dubbo-serialization-hessian2</artifactId>
13374
<version>${project.version}</version>
13475
</dependency>
135-
<dependency>
136-
<groupId>org.apache.dubbo</groupId>
137-
<artifactId>dubbo-serialization-fastjson2</artifactId>
138-
<version>${project.version}</version>
139-
</dependency>
14076
<dependency>
14177
<groupId>com.google.protobuf</groupId>
14278
<artifactId>protobuf-java</artifactId>
14379
</dependency>
144-
<dependency>
145-
<groupId>org.bouncycastle</groupId>
146-
<artifactId>bcpkix-jdk15on</artifactId>
147-
</dependency>
148-
<dependency>
149-
<groupId>org.apache.dubbo</groupId>
150-
<artifactId>dubbo-remoting-http3</artifactId>
151-
<version>${project.version}</version>
152-
</dependency>
15380
<dependency>
15481
<groupId>org.apache.logging.log4j</groupId>
15582
<artifactId>log4j-slf4j-impl</artifactId>

‎dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@
4949
<version>${project.version}</version>
5050
</dependency>
5151

52-
<dependency>
53-
<groupId>org.apache.dubbo</groupId>
54-
<artifactId>dubbo-metadata-report-zookeeper</artifactId>
55-
<version>${project.version}</version>
56-
</dependency>
57-
5852
<dependency>
5953
<groupId>org.apache.dubbo</groupId>
6054
<artifactId>dubbo-config-spring</artifactId>
@@ -63,20 +57,8 @@
6357

6458
<dependency>
6559
<groupId>org.apache.dubbo</groupId>
66-
<artifactId>dubbo-remoting-netty4</artifactId>
67-
<version>${project.version}</version>
68-
</dependency>
69-
70-
<dependency>
71-
<groupId>org.apache.dubbo</groupId>
72-
<artifactId>dubbo-serialization-hessian2</artifactId>
73-
<version>${project.version}</version>
74-
</dependency>
75-
76-
<dependency>
77-
<groupId>org.apache.dubbo</groupId>
78-
<artifactId>dubbo-serialization-fastjson2</artifactId>
79-
<version>${project.version}</version>
60+
<artifactId>dubbo-metadata-report-zookeeper</artifactId>
61+
<version>${project.parent.version}</version>
8062
</dependency>
8163

8264
<!-- Observability -->

0 commit comments

Comments
 (0)