Fix Dubbo 3.3 support: replace dubbo-dependencies-zookeeper with direct deps

dubbo-dependencies-zookeeper was removed in Dubbo 3.3. Replace with:
- dubbo-registry-zookeeper (exists in all 3.x versions)
- curator-x-discovery (overridable via run.sh property for 3.3+)
- zookeeper 3.5.9 (for embedded ZK server compatibility)

Locally verified: 3.0.4, 3.1.11, 3.2.19, 3.3.4 all passed.

Author: wu-sheng

CHANGES.md

@@ -18,7 +18,7 @@ Release Notes.
 * Extend Spring Kafka plugin to support Spring Kafka 2.4 -> 2.9 and 3.0 -> 3.3.
 * Enhance test/plugin/run.sh to support extra Maven properties per version in support-version.list (format: version,key=value).
 * Extend OkHttp plugin to support OkHttp 4.10 -> 4.12.
-* Extend Dubbo 3.x plugin to support Dubbo 3.1 -> 3.2.
+* Extend Dubbo 3.x plugin to support Dubbo 3.1 -> 3.3. Replace dubbo-dependencies-zookeeper (removed in 3.3) with direct dependencies in test scenario.
 
 All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/249?closed=1)
 

docs/en/setup/service-agent/java-agent/Supported-list.md

@@ -60,7 +60,7 @@ metrics based on the tracing data.
 * RPC Frameworks
   * [Dubbo](https://github.com/alibaba/dubbo) 2.5.4 -> 2.6.0
   * [Dubbox](https://github.com/dangdangdotcom/dubbox) 2.8.4
-  * [Apache Dubbo](https://github.com/apache/dubbo) 2.7.x -> 3.2.x
+  * [Apache Dubbo](https://github.com/apache/dubbo) 2.7.x -> 3.3.x
   * [Motan](https://github.com/weibocom/motan) 0.2.x -> 1.1.0
   * [gRPC](https://github.com/grpc/grpc-java) 1.x
   * [Apache ServiceComb Java Chassis](https://github.com/apache/servicecomb-java-chassis) 1.x, 2.x

test/plugin/scenarios/dubbo-3.x-scenario/pom.xml

@@ -33,6 +33,8 @@
 
         <test.framework>dubbo</test.framework>
         <test.framework.version>3.0.0</test.framework.version>
+        <curator.version>5.1.0</curator.version>
+        <zookeeper.version>3.5.9</zookeeper.version>
     </properties>
 
     <name>skywalking-dubbo-3.x-scenario</name>
@@ -63,9 +65,18 @@
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper</artifactId>
+            <artifactId>dubbo-registry-zookeeper</artifactId>
             <version>${test.framework.version}</version>
-            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-x-discovery</artifactId>
+            <version>${curator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>${zookeeper.version}</version>
         </dependency>
     </dependencies>
 

test/plugin/scenarios/dubbo-3.x-scenario/support-version.list

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# dubbo-dependencies-zookeeper module not published for 3.3+, needs pom change
 3.0.4
 3.1.11
 3.2.19
+3.3.4,curator.version=5.7.1