Merge branch 'apache:3.2.0' into 3.2.0

songxiaosheng · Jan 17, 2024 · 6645706 · 6645706
2 parents e7d3c62 + a1e91a1
commit 6645706
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Apache Dubbo
-Copyright 2018-2022 The Apache Software Foundation
+Copyright 2018-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/dubbo-extensions-dependencies-bom/pom.xml b/dubbo-extensions-dependencies-bom/pom.xml
@@ -108,7 +108,7 @@
         <jaxb_version>2.2.7</jaxb_version>
         <activation_version>1.2.0</activation_version>
         <cxf_version>3.1.15</cxf_version>
-        <avro_version>1.8.2</avro_version>
+        <avro_version>1.11.3</avro_version>
         <fastjson_version>1.2.83</fastjson_version>
         <fst_version>2.48-jdk-6</fst_version>
         <fury_version>0.2.0</fury_version>

diff --git a/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml
@@ -25,21 +25,25 @@
     </parent>
     <artifactId>dubbo-rpc-rmi</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <description>The rmi rpc module of dubbo project</description>
     <properties>
         <skip_maven_deploy>false</skip_maven_deploy>
+        <dubbo.version>3.2.9</dubbo.version>
+
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-rpc-api</artifactId>
             <optional>true</optional>
+            <version>${dubbo.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-cluster</artifactId>
             <optional>true</optional>
+            <version>${dubbo.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>