Skip to content

Commit c3e3025

Browse files
LuoLiangDSGALuoLiangDSGA
committed
升级dubbo版本
1 parent 0027019 commit c3e3025

File tree

12 files changed

+161
-127
lines changed

12 files changed

+161
-127
lines changed

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

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,22 @@
3636
<artifactId>spring-boot-starter-logging</artifactId>
3737
</dependency>
3838
<dependency>
39-
<groupId>com.alibaba.boot</groupId>
39+
<groupId>org.apache.dubbo</groupId>
4040
<artifactId>dubbo-spring-boot-starter</artifactId>
41-
</dependency>
41+
<version>${dubbo.version}</version>
42+
</dependency>µ
43+
<!-- Zookeeper dependencies -->
4244
<dependency>
43-
<groupId>com.alibaba.boot</groupId>
44-
<artifactId>dubbo-spring-boot-actuator</artifactId>
45+
<groupId>org.apache.dubbo</groupId>
46+
<artifactId>dubbo-dependencies-zookeeper</artifactId>
47+
<version>${dubbo.version}</version>
48+
<type>pom</type>
49+
<exclusions>
50+
<exclusion>
51+
<groupId>org.slf4j</groupId>
52+
<artifactId>slf4j-log4j12</artifactId>
53+
</exclusion>
54+
</exclusions>
4555
</dependency>
4656
<dependency>
4757
<groupId>org.projectlombok</groupId>
@@ -52,10 +62,6 @@
5262
<artifactId>dubbo-api</artifactId>
5363
<version>${parent.version}</version>
5464
</dependency>
55-
<dependency>
56-
<groupId>com.alibaba</groupId>
57-
<artifactId>dubbo-serialization-kryo</artifactId>
58-
</dependency>
5965
</dependencies>
6066

6167
<build>
@@ -65,24 +71,24 @@
6571
<artifactId>spring-boot-maven-plugin</artifactId>
6672
</plugin>
6773
<!--<plugin>-->
68-
<!--<groupId>com.spotify</groupId>-->
69-
<!--<artifactId>dockerfile-maven-plugin</artifactId>-->
70-
<!--<executions>-->
71-
<!--<execution>-->
72-
<!--<id>default</id>-->
73-
<!--<goals>-->
74-
<!--<goal>build</goal>-->
75-
<!--<goal>push</goal>-->
76-
<!--</goals>-->
77-
<!--</execution>-->
78-
<!--</executions>-->
79-
<!--<configuration>-->
80-
<!--<repository>dubbo-consumer</repository>-->
81-
<!--<tag>latest</tag>-->
82-
<!--<buildArgs>-->
83-
<!--<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>-->
84-
<!--</buildArgs>-->
85-
<!--</configuration>-->
74+
<!--<groupId>com.spotify</groupId>-->
75+
<!--<artifactId>dockerfile-maven-plugin</artifactId>-->
76+
<!--<executions>-->
77+
<!--<execution>-->
78+
<!--<id>default</id>-->
79+
<!--<goals>-->
80+
<!--<goal>build</goal>-->
81+
<!--<goal>push</goal>-->
82+
<!--</goals>-->
83+
<!--</execution>-->
84+
<!--</executions>-->
85+
<!--<configuration>-->
86+
<!--<repository>dubbo-consumer</repository>-->
87+
<!--<tag>latest</tag>-->
88+
<!--<buildArgs>-->
89+
<!--<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>-->
90+
<!--</buildArgs>-->
91+
<!--</configuration>-->
8692
<!--</plugin>-->
8793
</plugins>
8894
</build>

‎boot-dubbo/dubbo-consumer/src/main/java/org/boot/dubbo/consumer/controller/DefaultController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.boot.dubbo.consumer.controller;
22

33
import org.boot.dubbo.consumer.service.ConsumerService;
4+
import org.springframework.beans.factory.annotation.Autowired;
45
import org.springframework.web.bind.annotation.RequestMapping;
56
import org.springframework.web.bind.annotation.RestController;
67

@@ -15,7 +16,7 @@
1516
@RestController
1617
@RequestMapping("/user")
1718
public class DefaultController {
18-
@Resource
19+
@Autowired
1920
private ConsumerService consumerService;
2021

2122
@RequestMapping("/sayHello")

‎boot-dubbo/dubbo-consumer/src/main/java/org/boot/dubbo/consumer/service/impl/ConsumerServiceImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.alibaba.dubbo.config.annotation.Reference;
44
import lombok.extern.slf4j.Slf4j;
5+
import org.apache.dubbo.config.annotation.DubboReference;
56
import org.boot.dubbo.api.service.HelloService;
67
import org.boot.dubbo.consumer.service.ConsumerService;
78
import org.springframework.stereotype.Service;
@@ -15,7 +16,7 @@
1516
@Service
1617
@Slf4j
1718
public class ConsumerServiceImpl implements ConsumerService {
18-
@Reference(version = "1.0.0",
19+
@DubboReference(version = "1.0.0",
1920
application = "${dubbo.application.id}")
2021
private HelloService helloService;
2122

‎boot-dubbo/dubbo-consumer/src/main/resources/application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dubbo:
1717
#服务注册配置
1818
registry:
1919
id: zk-registry
20-
address: zookeeper://192.168.95.100:2181
20+
address: zookeeper://localhost:2181
2121
logging:
2222
level:
2323
org.boot.dubbo.consumer: debug

‎boot-dubbo/dubbo-provider/pom.xml‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,26 @@
3636
<artifactId>spring-boot-starter-logging</artifactId>
3737
</dependency>
3838
<dependency>
39-
<groupId>com.alibaba.boot</groupId>
40-
<artifactId>dubbo-spring-boot-actuator</artifactId>
39+
<groupId>org.apache.dubbo</groupId>
40+
<artifactId>dubbo-spring-boot-starter</artifactId>
41+
<version>${dubbo.version}</version>
4142
</dependency>
43+
<!-- Zookeeper dependencies -->
4244
<dependency>
43-
<groupId>org.springframework.boot</groupId>
44-
<artifactId>spring-boot-starter-test</artifactId>
45+
<groupId>org.apache.dubbo</groupId>
46+
<artifactId>dubbo-dependencies-zookeeper</artifactId>
47+
<version>${dubbo.version}</version>
48+
<type>pom</type>
49+
<exclusions>
50+
<exclusion>
51+
<groupId>org.slf4j</groupId>
52+
<artifactId>slf4j-log4j12</artifactId>
53+
</exclusion>
54+
</exclusions>
4555
</dependency>
4656
<dependency>
47-
<groupId>com.alibaba.boot</groupId>
48-
<artifactId>dubbo-spring-boot-starter</artifactId>
57+
<groupId>org.springframework.boot</groupId>
58+
<artifactId>spring-boot-starter-test</artifactId>
4959
</dependency>
5060
<dependency>
5161
<groupId>org.projectlombok</groupId>
@@ -56,10 +66,6 @@
5666
<artifactId>dubbo-api</artifactId>
5767
<version>${parent.version}</version>
5868
</dependency>
59-
<dependency>
60-
<groupId>com.alibaba</groupId>
61-
<artifactId>dubbo-serialization-kryo</artifactId>
62-
</dependency>
6369
</dependencies>
6470

6571
<build>

‎boot-dubbo/dubbo-provider/src/main/java/org/boot/dubbo/provider/common/serialization/SerializationOptimizerImpl.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package org.boot.dubbo.provider.common.serialization;
22

3-
import com.alibaba.dubbo.common.serialize.support.SerializationOptimizer;
3+
import org.apache.dubbo.common.serialize.support.SerializationOptimizer;
44

55
import java.io.InputStream;
66
import java.util.Collection;
77
import java.util.LinkedList;
8-
import java.util.List;
98

109
/**
1110
* @author luoliang
1211
* @date 2018/7/19
1312
*/
1413
public class SerializationOptimizerImpl implements SerializationOptimizer {
1514
@Override
16-
public Collection<Class> getSerializableClasses() {
17-
List<Class> classes = new LinkedList<>();
15+
public Collection<Class<?>> getSerializableClasses() {
16+
Collection<Class<?>> classes = new LinkedList<>();
1817
classes.add(InputStream.class);
1918

2019
return classes;

‎boot-dubbo/dubbo-provider/src/main/java/org/boot/dubbo/provider/service/HelloServiceImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.alibaba.dubbo.config.annotation.Service;
44
import lombok.extern.slf4j.Slf4j;
5+
import org.apache.dubbo.config.annotation.DubboService;
56
import org.boot.dubbo.api.service.HelloService;
67

78
import java.io.InputStream;
@@ -12,7 +13,7 @@
1213
* @author luoliang
1314
* @date 2018/1/8
1415
**/
15-
@Service(version = "1.0.0",
16+
@DubboService(version = "1.0.0",
1617
application = "${dubbo.application.id}",
1718
protocol = "${dubbo.protocol.id}",
1819
registry = "${dubbo.registry.id}")

‎boot-dubbo/dubbo-provider/src/main/resources/application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dubbo:
1212
owner: LuoLiang
1313
registry:
1414
id: zk-registry
15-
address: zookeeper://192.168.95.100:2181
15+
address: zookeeper://localhost:2181
1616
protocol:
1717
id: dubbo
1818
name: dubbo

‎boot-dubbo/pom.xml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>2.0.3.RELEASE</version>
7+
<version>2.2.5.RELEASE</version>
88
<relativePath/> <!-- lookup parent from repository -->
99
</parent>
1010

@@ -28,34 +28,32 @@
2828
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2929
<java.version>1.8</java.version>
3030
<dubbo-spring-boot-starter.version>0.2.0</dubbo-spring-boot-starter.version>
31-
<springboot.version>2.0.3.RELEASE</springboot.version>
3231
<fastjson-version>1.2.31</fastjson-version>
3332
<dockerfile-maven.version>1.4.3</dockerfile-maven.version>
34-
<dubbo.version>2.6.2</dubbo.version>
33+
<dubbo.version>2.7.7</dubbo.version>
34+
<spring-boot.version>2.2.5.RELEASE</spring-boot.version>
3535
</properties>
3636

3737
<dependencyManagement>
3838
<dependencies>
39-
<dependency>
40-
<groupId>com.alibaba.boot</groupId>
41-
<artifactId>dubbo-spring-boot-starter</artifactId>
42-
<version>${dubbo-spring-boot-starter.version}</version>
43-
</dependency>
39+
<!-- Spring Boot -->
4440
<dependency>
4541
<groupId>org.springframework.boot</groupId>
46-
<artifactId>spring-boot-starter-logging</artifactId>
47-
<version>${springboot.version}</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>com.alibaba.boot</groupId>
51-
<artifactId>dubbo-spring-boot-actuator</artifactId>
52-
<version>${dubbo-spring-boot-starter.version}</version>
42+
<artifactId>spring-boot-dependencies</artifactId>
43+
<version>${spring-boot.version}</version>
44+
<type>pom</type>
45+
<scope>import</scope>
5346
</dependency>
47+
48+
<!-- Apache Dubbo -->
5449
<dependency>
55-
<groupId>com.alibaba</groupId>
56-
<artifactId>dubbo-serialization-kryo</artifactId>
50+
<groupId>org.apache.dubbo</groupId>
51+
<artifactId>dubbo-dependencies-bom</artifactId>
5752
<version>${dubbo.version}</version>
53+
<type>pom</type>
54+
<scope>import</scope>
5855
</dependency>
56+
5957
</dependencies>
6058
</dependencyManagement>
6159

‎boot-uri/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
</exclusions>
3737
</dependency>
3838

39-
<dependency>
40-
<groupId>org.springframework.boot</groupId>
41-
<artifactId>spring-boot-starter-web</artifactId>
42-
</dependency>
39+
<!-- <dependency>-->
40+
<!-- <groupId>org.springframework.boot</groupId>-->
41+
<!-- <artifactId>spring-boot-starter-web</artifactId>-->
42+
<!-- </dependency>-->
4343
</dependencies>
4444

4545
<build>

0 commit comments

Comments
 (0)