Update dubbo-samples-rpc-advanced version (apache#1074)

heliang666s · Mar 18, 2024 · c11491a · c11491a
1 parent 1beda0f
commit c11491a
Show file tree

Hide file tree

Showing 19 changed files with 183 additions and 198 deletions.
diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-api-a/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-api-a/pom.xml
@@ -34,8 +34,8 @@
     <description>Dubbo RPC Advanced Task - App A's API</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>
     </properties>
 </project>
diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-api-b/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-api-b/pom.xml
@@ -34,8 +34,8 @@
     <description>Dubbo RPC Advanced Task - App B's API</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>
     </properties>
 </project>
diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-api-c/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-api-c/pom.xml
@@ -34,8 +34,8 @@
     <description>Dubbo RPC Advanced Task - App C's API</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>
     </properties>
 </project>
diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-api-d/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-api-d/pom.xml
@@ -34,8 +34,8 @@
     <description>Dubbo RPC Advanced Task - App D's API</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>
     </properties>
 </project>
diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-a/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-a/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.5</version>
+        <version>3.2.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -33,12 +33,11 @@
     <description>Dubbo RPC Basic Task - App A</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>
-        <nacos.version>2.2.0</nacos.version>
+        <dubbo.version>3.3.0-beta.1</dubbo.version>
     </properties>
 
     <dependencies>
@@ -61,9 +60,9 @@
 
         <!-- registry dependency -->
         <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>${nacos.version}</version>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+            <version>${dubbo.version}</version>
         </dependency>
 
         <!-- dubbo dependency-->

diff --git a/...s-rpc-advanced/dubbo-samples-rpc-advanced-app-a/src/main/resources/application.properties b/...s-rpc-advanced/dubbo-samples-rpc-advanced-app-a/src/main/resources/application.properties
diff --git a/...-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-a/src/main/resources/application.yml b/...-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-a/src/main/resources/application.yml
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dubbo:
+  application:
+    name: a
+    qos-enable: true
+    qos-port: 20991
+  protocol:
+    name: dubbo
+    port: 20881
+  registry:
+    address: nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
+  provider:
+    token: "true"
diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v1/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.5</version>
+        <version>3.2.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -33,12 +33,11 @@
     <description>Dubbo RPC Basic Task - App B - Version 1</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>
-        <nacos.version>2.2.0</nacos.version>
+        <dubbo.version>3.3.0-beta.1</dubbo.version>
     </properties>
 
     <dependencies>
@@ -56,9 +55,9 @@
 
         <!-- registry dependency -->
         <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>${nacos.version}</version>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+            <version>${dubbo.version}</version>
         </dependency>
 
         <!-- dubbo dependency-->

diff --git a/...pc-advanced/dubbo-samples-rpc-advanced-app-b-v1/src/main/resources/application.properties b/...pc-advanced/dubbo-samples-rpc-advanced-app-b-v1/src/main/resources/application.properties
diff --git a/...mples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v1/src/main/resources/application.yml b/...mples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v1/src/main/resources/application.yml
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dubbo:
+  application:
+    name: b
+    qos-enable: true
+    qos-port: 20992
+  protocol:
+    name: dubbo
+    port: 20882
+  registry:
+    address: nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
+  provider:
+    token: "true"
diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v2/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.5</version>
+        <version>3.2.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -33,12 +33,11 @@
     <description>Dubbo RPC Basic Task - App B - Version 2</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>
-        <nacos.version>2.2.0</nacos.version>
+        <dubbo.version>3.3.0-beta.1</dubbo.version>
     </properties>
 
     <dependencies>
@@ -56,9 +55,9 @@
 
         <!-- registry dependency -->
         <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>${nacos.version}</version>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+            <version>${dubbo.version}</version>
         </dependency>
 
         <!-- dubbo dependency-->

diff --git a/...pc-advanced/dubbo-samples-rpc-advanced-app-b-v2/src/main/resources/application.properties b/...pc-advanced/dubbo-samples-rpc-advanced-app-b-v2/src/main/resources/application.properties
diff --git a/...mples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v2/src/main/resources/application.yml b/...mples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v2/src/main/resources/application.yml
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dubbo:
+  application:
+    name: b
+    qos-enable: true
+    qos-port: 20993
+  protocol:
+    name: dubbo
+    port: 20883
+  registry:
+    address: nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos
+  provider:
+    token: "true"
diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-c/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-c/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.5</version>
+        <version>3.2.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -33,12 +33,11 @@
     <description>Dubbo RPC Basic Task - App C</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>
-        <nacos.version>2.2.0</nacos.version>
+        <dubbo.version>3.3.0-beta.1</dubbo.version>
     </properties>
 
     <dependencies>
@@ -51,9 +50,9 @@
 
         <!-- registry dependency -->
         <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>${nacos.version}</version>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+            <version>${dubbo.version}</version>
         </dependency>
 
         <!-- dubbo dependency-->