bump spring boot to 3.2.3 and jdk to 17

chickenlj · Mar 13, 2024 · 4382298 · 4382298
1 parent d2f8592
commit 4382298
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 25 deletions.
diff --git a/1-basic/dubbo-samples-spring-boot-idl/README.md b/1-basic/dubbo-samples-spring-boot-idl/README.md
@@ -4,6 +4,11 @@ This example uses triple as the underlying RPC protocol and IDL to define servic
 
 # How to run
 
+## Start Zookeeper
+This example replies on Zookeeper as service discovery registry center, so you need to run the Zookeeper server first, there are two ways to do so:
+1. [Download zookeeper binary and start it directly](https://dubbo-next.staged.apache.org/zh-cn/overview/reference/integrations/zookeeper/#本地下载)
+2. [Start zookeeper using docker](https://dubbo-next.staged.apache.org/zh-cn/overview/reference/integrations/zookeeper/#docker)
+
 ## Compile
 
 Step into 'dubbo-samples-spring-boot-idl' directory, run the following command:

diff --git a/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-provider/pom.xml b/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-provider/pom.xml
@@ -34,7 +34,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-zookeeper-spring-boot-starter</artifactId>
+            <artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
         </dependency>
 
         <!-- spring starter -->

diff --git a/1-basic/dubbo-samples-spring-boot-idl/pom.xml b/1-basic/dubbo-samples-spring-boot-idl/pom.xml
@@ -36,13 +36,12 @@
     <description>Dubbo Samples Spring Boot</description>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <dubbo.version>3.3.0-beta.1</dubbo.version>
-        <spring-boot.version>2.7.8</spring-boot.version>
-        <zookeeper.version>3.8.3</zookeeper.version>
+        <spring-boot.version>3.2.3</spring-boot.version>
         <protobuf-java.version>3.19.6</protobuf-java.version>
         <protoc.version>3.22.3</protoc.version>
     </properties>
@@ -79,25 +78,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.zookeeper</groupId>
-                <artifactId>zookeeper</artifactId>
-                <version>${zookeeper.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>logback-classic</artifactId>
-                        <groupId>ch.qos.logback</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>logback-core</artifactId>
-                        <groupId>ch.qos.logback</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>*</artifactId>
-                        <groupId>io.netty</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/1-basic/dubbo-samples-spring-boot/README.md b/1-basic/dubbo-samples-spring-boot/README.md
@@ -6,11 +6,19 @@ Please refer to
 * [the official documentation](https://dubbo.apache.org/zh-cn/overview/quickstart/java/spring-boot/) for more details of developing Dubbo with Spring Boot.
 * [dubbo-samples-spring-boot-idl](../dubbo-samples-spring-boot-idl) for how to use IDL(Protobuf) together with triple protocol.
 
+
 ## Modules
 * interface, provides Dubbo service definition
 * provider, implements Dubbo service
 * consumer, consumes Dubbo service
 
+# How to run
+
+## Start Zookeeper
+This example replies on Zookeeper as service discovery registry center, so you need to run the Zookeeper server first, there are two ways to do so:
+1. [Download zookeeper binary and start it directly](https://dubbo-next.staged.apache.org/zh-cn/overview/reference/integrations/zookeeper/#本地下载)
+2. [Start zookeeper using docker](https://dubbo-next.staged.apache.org/zh-cn/overview/reference/integrations/zookeeper/#docker)
+
 ## Install dependencies
 Step into 'dubbo-samples-spring-boot' directory, run the following command:
 

diff --git a/1-basic/dubbo-samples-spring-boot/pom.xml b/1-basic/dubbo-samples-spring-boot/pom.xml
@@ -41,7 +41,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <dubbo.version>3.3.0-beta.1</dubbo.version>
-        <spring-boot.version>3.2.0</spring-boot.version>
+        <spring-boot.version>3.2.3</spring-boot.version>
     </properties>
 
     <modules>