diff --git a/1-basic/dubbo-samples-api-idl/pom.xml b/1-basic/dubbo-samples-api-idl/pom.xml index fa52e6c6b1..8c1e158356 100644 --- a/1-basic/dubbo-samples-api-idl/pom.xml +++ b/1-basic/dubbo-samples-api-idl/pom.xml @@ -35,9 +35,10 @@ 17 UTF-8 - 3.3.1 - 3.19.6 - 3.22.3 + 3.3.7-SNAPSHOT + + 4.33.4 + 4.33.4 2.20.0 diff --git a/1-basic/dubbo-samples-spring-boot-idl/pom.xml b/1-basic/dubbo-samples-spring-boot-idl/pom.xml index 5176743a03..bdb383defb 100644 --- a/1-basic/dubbo-samples-spring-boot-idl/pom.xml +++ b/1-basic/dubbo-samples-spring-boot-idl/pom.xml @@ -40,10 +40,11 @@ 17 UTF-8 - 3.3.1 + 3.3.7-SNAPSHOT 3.2.3 - 3.19.6 - 3.22.3 + + 4.33.4 + 4.33.4 diff --git a/10-task/dubbo-samples-benchmark/pom.xml b/10-task/dubbo-samples-benchmark/pom.xml index 8cdda60d19..284d9c7e02 100644 --- a/10-task/dubbo-samples-benchmark/pom.xml +++ b/10-task/dubbo-samples-benchmark/pom.xml @@ -43,6 +43,7 @@ 1.8 1.8 1.37 + 4.33.4 @@ -107,7 +108,7 @@ com.google.protobuf protobuf-java - 4.26.0 + ${protobuf-java.version} diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml index 0a1d696184..781fa61677 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml @@ -36,6 +36,7 @@ 4.13.1 3.7.0 + 4.33.4 @@ -86,6 +87,7 @@ com.google.protobuf protobuf-java + ${protobuf-java.version} diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml index 55dc067a28..bce33df52c 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml @@ -36,6 +36,7 @@ 4.13.1 3.7.0 + 4.33.4 @@ -72,21 +73,22 @@ - - org.apache.dubbo - dubbo - + + org.apache.dubbo + dubbo + - - org.springframework - spring-context-support - ${spring.version} - + + org.springframework + spring-context-support + ${spring.version} + - - com.google.protobuf - protobuf-java - + + com.google.protobuf + protobuf-java + ${protobuf-java.version} + org.apache.curator curator-x-discovery diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/pom.xml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/pom.xml index 7d040b0d03..36e1787b64 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/pom.xml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/pom.xml @@ -35,6 +35,7 @@ 4.13.1 3.7.0 + 4.33.4 @@ -106,8 +107,9 @@ - com.google.protobuf - protobuf-java + com.google.protobuf + protobuf-java + ${protobuf-java.version} diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/pom.xml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/pom.xml index 69e2c3952a..00c846abde 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/pom.xml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/pom.xml @@ -35,6 +35,7 @@ 4.13.1 3.7.0 + 4.33.4 @@ -75,8 +76,9 @@ - com.google.protobuf - protobuf-java + com.google.protobuf + protobuf-java + ${protobuf-java.version} diff --git a/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer/pom.xml b/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer/pom.xml index 67cedfc46b..54961561ee 100644 --- a/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer/pom.xml +++ b/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer/pom.xml @@ -36,7 +36,7 @@ 3.3.1 3.2.2 - 3.19.6 + 4.33.4 3.10.1 0.10.1 diff --git a/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider/pom.xml b/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider/pom.xml index 1c5575885e..3ced150d0f 100644 --- a/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider/pom.xml +++ b/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider/pom.xml @@ -36,7 +36,7 @@ 3.3.1 3.2.2 - 3.19.6 + 4.33.4 3.10.1 0.10.1 diff --git a/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-consumer/pom.xml b/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-consumer/pom.xml index b8bea98626..ddbd7d001e 100644 --- a/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-consumer/pom.xml +++ b/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-consumer/pom.xml @@ -37,7 +37,7 @@ 3.3.1 3.2.3 - 3.19.6 + 4.33.4 3.10.1 0.9.28 diff --git a/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-provider/pom.xml b/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-provider/pom.xml index 5ec19a4615..a79a504f3e 100644 --- a/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-provider/pom.xml +++ b/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-provider/pom.xml @@ -37,7 +37,7 @@ 3.3.1 3.2.3 - 3.19.6 + 4.33.4 3.10.1 0.9.28 diff --git a/2-advanced/dubbo-samples-triple-grpc/pom.xml b/2-advanced/dubbo-samples-triple-grpc/pom.xml index 65e723d08d..189e9bc046 100644 --- a/2-advanced/dubbo-samples-triple-grpc/pom.xml +++ b/2-advanced/dubbo-samples-triple-grpc/pom.xml @@ -33,9 +33,11 @@ 1.8 UTF-8 - 3.3.1 - 1.58.0 - 3.22.2 + 3.3.7-SNAPSHOT + 1.78.0 + + 4.33.4 + 4.33.4 2.20.0 3.7.0 diff --git a/2-advanced/dubbo-samples-triple-http3/pom.xml b/2-advanced/dubbo-samples-triple-http3/pom.xml index a3738adc04..a12118df13 100644 --- a/2-advanced/dubbo-samples-triple-http3/pom.xml +++ b/2-advanced/dubbo-samples-triple-http3/pom.xml @@ -41,7 +41,7 @@ 1.7.1 0.6.1 - 3.22.3 + 4.33.4 @@ -106,12 +106,14 @@ - com.google.protobuf - protobuf-java + com.google.protobuf + protobuf-java + ${protobuf-java.version} - com.google.protobuf - protobuf-java-util + com.google.protobuf + protobuf-java-util + ${protobuf-java.version} io.netty @@ -179,7 +181,7 @@ ${maven_protobuf_plugin_version} - com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier} triple-java diff --git a/2-advanced/dubbo-samples-triple-no-idl/pom.xml b/2-advanced/dubbo-samples-triple-no-idl/pom.xml index 814ae9d919..86fe5af1f2 100644 --- a/2-advanced/dubbo-samples-triple-no-idl/pom.xml +++ b/2-advanced/dubbo-samples-triple-no-idl/pom.xml @@ -34,7 +34,7 @@ UTF-8 3.3.1 - 3.19.6 + 4.33.4 2.20.0 3.7.0 diff --git a/2-advanced/dubbo-samples-triple-servlet/pom.xml b/2-advanced/dubbo-samples-triple-servlet/pom.xml index 676550a36c..7ad612df4c 100644 --- a/2-advanced/dubbo-samples-triple-servlet/pom.xml +++ b/2-advanced/dubbo-samples-triple-servlet/pom.xml @@ -41,7 +41,7 @@ 1.7.1 0.6.1 - 3.22.3 + 4.33.4 @@ -116,10 +116,12 @@ com.google.protobuf protobuf-java + ${protobuf-java.version} com.google.protobuf protobuf-java-util + ${protobuf-java.version} @@ -177,7 +179,7 @@ ${maven_protobuf_plugin_version} - com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier} triple-java diff --git a/2-advanced/dubbo-samples-triple-streaming/pom.xml b/2-advanced/dubbo-samples-triple-streaming/pom.xml index dffad2cd7e..f70c41061f 100644 --- a/2-advanced/dubbo-samples-triple-streaming/pom.xml +++ b/2-advanced/dubbo-samples-triple-streaming/pom.xml @@ -37,10 +37,11 @@ 1.8 UTF-8 - 3.3.1 + 3.3.7-SNAPSHOT 3.2.3 - 3.22.2 - 3.19.6 + + 4.33.4 + 4.33.4 2.20.0 3.7.0 @@ -114,14 +115,15 @@ 6.1.5 test - - com.google.protobuf - protobuf-java - - - org.apache.dubbo - dubbo-zookeeper-curator5-spring-boot-starter - + + com.google.protobuf + protobuf-java + ${protobuf-java.version} + + + org.apache.dubbo + dubbo-zookeeper-curator5-spring-boot-starter + diff --git a/3-extensions/protocol/dubbo-samples-triple/pom.xml b/3-extensions/protocol/dubbo-samples-triple/pom.xml index 0a517a35c5..efe33d1dec 100644 --- a/3-extensions/protocol/dubbo-samples-triple/pom.xml +++ b/3-extensions/protocol/dubbo-samples-triple/pom.xml @@ -39,7 +39,7 @@ 1.8 UTF-8 - 3.3.1 + 3.3.7-SNAPSHOT 1.5.22.RELEASE 1.78.0 diff --git a/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-consumer/pom.xml b/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-consumer/pom.xml index 3b8e895362..633abfb668 100644 --- a/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-consumer/pom.xml +++ b/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-consumer/pom.xml @@ -32,12 +32,13 @@ 1.8 UTF-8 - 3.3.1 + 3.3.7-SNAPSHOT 4.3.30.RELEASE 4.13.1 - 1.58.0 - 3.24.3 - 3.24.3 + 1.78.0 + + 4.33.4 + 4.33.4 3.7.0 diff --git a/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-provider/pom.xml b/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-provider/pom.xml index 08bc113422..800a837f79 100644 --- a/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-provider/pom.xml +++ b/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-provider/pom.xml @@ -30,11 +30,12 @@ 1.8 UTF-8 - 3.3.1 + 3.3.7-SNAPSHOT 4.3.30.RELEASE - 1.58.0 - 3.24.3 - 3.24.3 + 1.78.0 + + 4.33.4 + 4.33.4 4.13.1 2.17.2 diff --git a/3-extensions/registry/dubbo-samples-xds/dubbo-samples-xds-consumer/pom.xml b/3-extensions/registry/dubbo-samples-xds/dubbo-samples-xds-consumer/pom.xml index 570048c4ee..3f759b1db9 100644 --- a/3-extensions/registry/dubbo-samples-xds/dubbo-samples-xds-consumer/pom.xml +++ b/3-extensions/registry/dubbo-samples-xds/dubbo-samples-xds-consumer/pom.xml @@ -38,6 +38,7 @@ 4.13.1 3.7.0 + 4.33.4 @@ -118,6 +119,7 @@ com.google.protobuf protobuf-java-util + ${protobuf-java.version} diff --git a/3-extensions/registry/dubbo-samples-xds/dubbo-samples-xds-provider/pom.xml b/3-extensions/registry/dubbo-samples-xds/dubbo-samples-xds-provider/pom.xml index 12e10b5d9c..ced7e2244c 100644 --- a/3-extensions/registry/dubbo-samples-xds/dubbo-samples-xds-provider/pom.xml +++ b/3-extensions/registry/dubbo-samples-xds/dubbo-samples-xds-provider/pom.xml @@ -38,6 +38,7 @@ 4.13.1 3.7.0 + 4.33.4 @@ -118,6 +119,7 @@ com.google.protobuf protobuf-java-util + ${protobuf-java.version} diff --git a/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml b/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml index dcb7c5f871..1fbadf2ea5 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml +++ b/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml @@ -41,7 +41,7 @@ 3.3.1 4.3.30.RELEASE - 3.24.3 + 4.33.4 4.13.1 diff --git a/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-api/pom.xml b/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-api/pom.xml index 33693a3f6f..d98b130b30 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-api/pom.xml +++ b/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-api/pom.xml @@ -31,6 +31,7 @@ com.google.protobuf protobuf-java + ${protobuf-java.version} @@ -57,7 +58,7 @@ ${basedir}/src/main/resources/protobuf - com.google.protobuf:protoc:3.24.3:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier} diff --git a/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/pom.xml b/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/pom.xml index e88e457649..fb56cfeb81 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/pom.xml +++ b/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-implement/pom.xml @@ -35,6 +35,7 @@ com.google.protobuf protobuf-java + ${protobuf-java.version} diff --git a/3-extensions/serialization/dubbo-samples-protobuf/pom.xml b/3-extensions/serialization/dubbo-samples-protobuf/pom.xml index 4c1d4c3641..1b6af0987b 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf/pom.xml +++ b/3-extensions/serialization/dubbo-samples-protobuf/pom.xml @@ -34,6 +34,9 @@ 4.3.30.RELEASE 2.20.0 0.0.2 + 4.33.4 + + 4.33.4 @@ -149,7 +152,7 @@ protobuf-maven-plugin 0.5.1 - com.google.protobuf:protoc:3.24.3:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier} build/generated/source/proto/main/java false diff --git a/3-extensions/serialization/dubbo-samples-protobuf/protobuf-consumer/pom.xml b/3-extensions/serialization/dubbo-samples-protobuf/protobuf-consumer/pom.xml index 1130987157..70c22c8a2e 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf/protobuf-consumer/pom.xml +++ b/3-extensions/serialization/dubbo-samples-protobuf/protobuf-consumer/pom.xml @@ -31,7 +31,7 @@ 1.8 UTF-8 - 3.24.3 + 4.33.4 2.20.0 4.13.1 diff --git a/3-extensions/serialization/dubbo-samples-protobuf/protobuf-provider/pom.xml b/3-extensions/serialization/dubbo-samples-protobuf/protobuf-provider/pom.xml index e953145123..0d8d73d873 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf/protobuf-provider/pom.xml +++ b/3-extensions/serialization/dubbo-samples-protobuf/protobuf-provider/pom.xml @@ -32,7 +32,7 @@ 1.8 UTF-8 - 3.24.3 + 4.33.4 4.13.1