diff --git a/.artifacts b/.artifacts index ef7445d61111..e2b74e243199 100644 --- a/.artifacts +++ b/.artifacts @@ -35,10 +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 @@ -105,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 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml deleted file mode 100644 index 40795e00a34a..000000000000 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ /dev/null @@ -1,214 +0,0 @@ - - - - 4.0.0 - - org.apache - apache - 31 - - - - org.apache.dubbo - dubbo-dependencies-zookeeper-curator5 - ${revision} - pom - - - 1.6.0 - 1.7.36 - 5.1.0 - 3.8.4 - 2.43.0 - check - 1.0.0 - 2.38.0 - - 3.3.2-SNAPSHOT - - - - - org.apache.curator - curator-x-discovery - ${curator5_version} - - - org.apache.zookeeper - zookeeper - - - org.slf4j - slf4j-api - - - com.google.guava - listenablefuture - - - - - org.apache.zookeeper - zookeeper - ${zookeeper_version} - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - org.apache.yetus - audience-annotations - - - io.netty - * - - - org.slf4j - slf4j-api - - - commons-io - commons-io - - - - - org.slf4j - slf4j-api - ${slf4j_version} - - - - - - - org.codehaus.mojo - flatten-maven-plugin - ${maven_flatten_version} - - true - oss - - - - flatten - - flatten - - process-resources - - - flatten.clean - - clean - - clean - - - - - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - sign - - verify - - - - - - - - java11+ - - [11,) - - - - - - com.diffplug.spotless - spotless-maven-plugin - ${spotless-maven-plugin.version} - - - - ${palantirJavaFormat.version} - - - - dubbo-importorder.txt - - - checkstyle-header.txt - - - - - false - true - - - - true - - - - - com.alibaba - dubbo-shared-resources - ${dubbo-shared-resources.version} - - - - - - ${spotless.action} - - process-sources - - - - - - - - skip-spotless - - true - - - - diff --git a/dubbo-dependencies/pom.xml b/dubbo-dependencies/pom.xml deleted file mode 100644 index afc7ab7ab44b..000000000000 --- a/dubbo-dependencies/pom.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - 4.0.0 - - org.apache.dubbo - dubbo-parent - ${revision} - ../pom.xml - - - dubbo-dependencies - pom - - dubbo-dependencies-zookeeper-curator5 - - - - 2.43.0 - check - 1.0.0 - 2.38.0 - - - - - - org.codehaus.mojo - flatten-maven-plugin - ${maven_flatten_version} - - true - bom - - - - flatten - - flatten - - process-resources - - - flatten.clean - - clean - - clean - - - - - - - - - java11+ - - [11,) - - - - - - com.diffplug.spotless - spotless-maven-plugin - ${spotless-maven-plugin.version} - - - - ${palantirJavaFormat.version} - - - - dubbo-importorder.txt - - - checkstyle-header.txt - - - - - false - true - - - - true - - - - - com.alibaba - dubbo-shared-resources - ${dubbo-shared-resources.version} - - - - - - ${spotless.action} - - process-sources - - - - - - - - - diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml index 9a93aac9fc01..e5392a5c8671 100644 --- a/dubbo-distribution/dubbo-bom/pom.xml +++ b/dubbo-distribution/dubbo-bom/pom.xml @@ -112,26 +112,6 @@ dubbo-configcenter-nacos ${project.version} - - - - org.apache.dubbo - dubbo-dependencies - ${project.version} - - - org.apache.dubbo - dubbo-dependencies-zookeeper - ${project.version} - pom - - - org.apache.dubbo - dubbo-dependencies-zookeeper-curator5 - ${project.version} - pom - - org.apache.dubbo @@ -552,11 +532,6 @@ dubbo-nacos-spring-boot-starter ${project.version} - - org.apache.dubbo - dubbo-zookeeper-spring-boot-starter - ${project.version} - org.apache.dubbo dubbo-zookeeper-curator5-spring-boot-starter diff --git a/dubbo-spring-boot-project/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml b/dubbo-spring-boot-project/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml index f15ce669ee58..0b57007fe87b 100644 --- a/dubbo-spring-boot-project/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml +++ b/dubbo-spring-boot-project/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml @@ -29,21 +29,14 @@ jar Apache Dubbo Zookeeper Curator5 Spring Boot Starter - - 5.1.0 - 3.8.4 - - org.apache.curator curator-x-discovery - ${curator5_version} org.apache.zookeeper zookeeper - ${zookeeper_version} io.netty diff --git a/dubbo-spring-boot-project/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml b/dubbo-spring-boot-project/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml deleted file mode 100644 index 7ca946f46be9..000000000000 --- a/dubbo-spring-boot-project/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - org.apache.dubbo - dubbo-spring-boot-starters - ${revision} - ../pom.xml - - - dubbo-zookeeper-spring-boot-starter - ${revision} - jar - Apache Dubbo Zookeeper Spring Boot Starter - - - 3.8.4 - - - - - org.apache.curator - curator-x-discovery - - - org.apache.zookeeper - zookeeper - ${zookeeper_version} - - - - diff --git a/dubbo-spring-boot-project/dubbo-spring-boot-starters/pom.xml b/dubbo-spring-boot-project/dubbo-spring-boot-starters/pom.xml index de6dd545b2b3..d3bcc63bcb0c 100644 --- a/dubbo-spring-boot-project/dubbo-spring-boot-starters/pom.xml +++ b/dubbo-spring-boot-project/dubbo-spring-boot-starters/pom.xml @@ -31,7 +31,6 @@ 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 diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml index 83c80c43eb32..ed04de0efe6d 100644 --- a/dubbo-test/dubbo-dependencies-all/pom.xml +++ b/dubbo-test/dubbo-dependencies-all/pom.xml @@ -423,11 +423,6 @@ dubbo-nacos-spring-boot-starter ${project.version} - - org.apache.dubbo - dubbo-zookeeper-spring-boot-starter - ${project.version} - org.apache.dubbo dubbo-zookeeper-curator5-spring-boot-starter diff --git a/pom.xml b/pom.xml index 69dd78eb2f4b..6ee873c6d7b8 100644 --- a/pom.xml +++ b/pom.xml @@ -85,8 +85,6 @@ dubbo-compatible dubbo-dependencies-bom dubbo-distribution - dubbo-configcenter - dubbo-dependencies dubbo-metadata dubbo-metrics dubbo-test