Merge branch 'refs/heads/3.3' into 3.4

# Conflicts: # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-plugin/dubbo-rest-jaxrs/pom.xml # dubbo-plugin/dubbo-rest-spring/pom.xml # pom.xml
apache · Jan 11, 2025 · 43fd279 · 43fd279
2 parents f328bb6 f0dd47a
commit 43fd279
Show file tree

Hide file tree

Showing 607 changed files with 20,895 additions and 7,210 deletions.
diff --git a/.artifacts b/.artifacts
@@ -35,11  35,8 @@ dubbo-configcenter-apollo
 dubbo-configcenter-nacos
 dubbo-configcenter-zookeeper
 dubbo-core-spi
-dubbo-dependencies
 dubbo-dependencies-all
 dubbo-dependencies-bom
-dubbo-dependencies-zookeeper-curator5
-dubbo-distribution
 dubbo-filter-cache
 dubbo-filter-validation
 dubbo-kubernetes
@@ -75,6  72,7 @@ dubbo-remoting
 dubbo-remoting-api
 dubbo-remoting-http12
 dubbo-remoting-http3
 dubbo-remoting-websocket
 dubbo-remoting-netty
 dubbo-remoting-netty4
 dubbo-remoting-zookeeper-curator5
@@ -90,12  88,13 @@ dubbo-serialization-fastjson2
 dubbo-serialization-hessian2
 dubbo-spring-boot
 dubbo-spring-boot-actuator
 dubbo-spring-boot-actuator-autoconfigure
 dubbo-spring-boot-actuator-compatible
 dubbo-spring-boot-autoconfigure
 dubbo-spring-boot-3-autoconfigure
 dubbo-spring-boot-autoconfigure-compatible
 dubbo-spring-boot-actuator-autoconfigure-compatible
 dubbo-spring-boot-compatible
-dubbo-observability-spring-boot-starters
 dubbo-tracing-brave-zipkin-spring-boot-starter
 dubbo-tracing-otel-zipkin-spring-boot-starter
 dubbo-tracing-otel-otlp-spring-boot-starter
@@ -104,7  103,6 @@ dubbo-spring-boot-starter
 dubbo-spring-boot-starters
 dubbo-spring-boot-interceptor
 dubbo-nacos-spring-boot-starter
-dubbo-zookeeper-spring-boot-starter
 dubbo-zookeeper-curator5-spring-boot-starter
 dubbo-sentinel-spring-boot-starter
 dubbo-seata-spring-boot-starter
@@ -114,4  112,6 @@ dubbo-xds
 dubbo-plugin-loom
 dubbo-rest-jaxrs
 dubbo-rest-spring
 dubbo-rest-openapi
 dubbo-triple-servlet
 dubbo-triple-websocket
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,4  5,4 @@
 - [x] Make sure there is a [GitHub_issue](https://github.com/apache/dubbo/issues) field for the change.
 - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
 - [x] Write necessary unit-test to verify your logic correction. If the new feature or significant change is committed, please remember to add sample in [dubbo samples](https://github.com/apache/dubbo-samples) project.
-- [x] Make sure gitHub actions can pass. [Why the workflow is failing and how to fix it?](./CONTRIBUTING.md)
 - [x] Make sure gitHub actions can pass. [Why the workflow is failing and how to fix it?](../CONTRIBUTING.md)