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

albumenj 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 6ddb0a743 Update dubbo-samples-callback springboot3 and JDK17 (#1125)
6ddb0a743 is described below

commit 6ddb0a7431ef7be6d31831f2395a8134d6fbc3e9
Author: SSSugarman <[email protected]>
AuthorDate: Sun Apr 7 14:06:04 2024 +0800

    Update dubbo-samples-callback springboot3 and JDK17 (#1125)
    
    Co-authored-by: hujiajia <[email protected]>
---
 .../dubbo-samples-callback/case-versions.conf      |  6 ++--
 .../dubbo-samples-callback-consumer/pom.xml        |  5 +--
 .../dubbo-samples-callback-provider/pom.xml        |  5 +--
 2-advanced/dubbo-samples-callback/pom.xml          | 39 +++-------------------
 4 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/2-advanced/dubbo-samples-callback/case-versions.conf 
b/2-advanced/dubbo-samples-callback/case-versions.conf
index 0a8a7738f..82aeb4560 100644
--- a/2-advanced/dubbo-samples-callback/case-versions.conf
+++ b/2-advanced/dubbo-samples-callback/case-versions.conf
@@ -20,6 +20,6 @@
 # Supported component versions of the test case
 
 # Spring app
-dubbo.version=2.7*, 3.*
-spring-boot.version=2.*
-java.version= [>= 8]
+dubbo.version=3.3.*
+spring.version=6.*
+java.version= [>= 17]
diff --git 
a/2-advanced/dubbo-samples-callback/dubbo-samples-callback-consumer/pom.xml 
b/2-advanced/dubbo-samples-callback/dubbo-samples-callback-consumer/pom.xml
index 3e8879f49..1f660ae46 100644
--- a/2-advanced/dubbo-samples-callback/dubbo-samples-callback-consumer/pom.xml
+++ b/2-advanced/dubbo-samples-callback/dubbo-samples-callback-consumer/pom.xml
@@ -35,11 +35,12 @@
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-spring-boot-starter</artifactId>
+            <version>3.3.0-beta.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+            <version>3.2.3</version>
         </dependency>
 
         <!-- spring starter -->
diff --git 
a/2-advanced/dubbo-samples-callback/dubbo-samples-callback-provider/pom.xml 
b/2-advanced/dubbo-samples-callback/dubbo-samples-callback-provider/pom.xml
index a408d2f3b..3587c63b3 100644
--- a/2-advanced/dubbo-samples-callback/dubbo-samples-callback-provider/pom.xml
+++ b/2-advanced/dubbo-samples-callback/dubbo-samples-callback-provider/pom.xml
@@ -36,11 +36,12 @@
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-spring-boot-starter</artifactId>
+            <version>3.3.0-beta.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-            <type>pom</type>
+            
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+            <version>3.2.3</version>
         </dependency>
 
         <!-- spring starter -->
diff --git a/2-advanced/dubbo-samples-callback/pom.xml 
b/2-advanced/dubbo-samples-callback/pom.xml
index db8473b10..957c3380d 100644
--- a/2-advanced/dubbo-samples-callback/pom.xml
+++ b/2-advanced/dubbo-samples-callback/pom.xml
@@ -35,12 +35,12 @@
     <description>Dubbo Samples Callback</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.2.6</dubbo.version>
-        <spring-boot.version>2.7.8</spring-boot.version>
+        <dubbo.version>3.3.0-beta.1</dubbo.version>
+        <spring-boot.version>3.2.3</spring-boot.version>
         <junit.version>4.13.1</junit.version>
     </properties>
 
@@ -72,37 +72,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-bom</artifactId>
-                <version>${dubbo.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
-                <version>${dubbo.version}</version>
-                <type>pom</type>
-                <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>log4j</artifactId>
-                        <groupId>log4j</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>slf4j-log4j12</artifactId>
-                        <groupId>org.slf4j</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to