From 35259a7a24594a619e3e1915a83a2beae230641f Mon Sep 17 00:00:00 2001 From: oxsean Date: Thu, 19 Oct 2023 00:05:24 +0800 Subject: [PATCH] fix(pom): Exclude unnecessary transitive dependencies for zookeeper Closes #13188 --- .licenserc.yaml | 2 + dubbo-cluster/pom.xml | 5 ++ dubbo-compatible/pom.xml | 5 ++ dubbo-config/dubbo-config-api/pom.xml | 5 ++ .../dubbo-demo-annotation-consumer/pom.xml | 13 +++++ .../dubbo-demo-annotation-provider/pom.xml | 2 - .../dubbo-demo-native-consumer/pom.xml | 1 - .../dubbo-demo-native-provider/pom.xml | 1 - .../dubbo-demo-spring-boot-consumer/pom.xml | 10 +++- .../dubbo-demo-spring-boot-provider/pom.xml | 10 +++- .../dubbo-demo-jaxrs-rest-consumer/pom.xml | 2 - .../dubbo-demo-jaxrs-rest-provider/pom.xml | 2 - .../pom.xml | 2 - .../pom.xml | 2 - .../dubbo-demo-xml-provider/pom.xml | 2 - dubbo-dependencies-bom/pom.xml | 19 ++++++- .../pom.xml | 55 ++++--------------- .../dubbo-dependencies-zookeeper/pom.xml | 26 +++++++++ dubbo-plugin/dubbo-plugin-access-log/pom.xml | 5 ++ dubbo-remoting/dubbo-remoting-http/pom.xml | 5 ++ dubbo-remoting/dubbo-remoting-netty/pom.xml | 5 ++ dubbo-remoting/dubbo-remoting-netty4/pom.xml | 5 ++ .../dubbo-remoting-zookeeper/pom.xml | 6 -- dubbo-rpc/dubbo-rpc-api/pom.xml | 6 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 5 ++ dubbo-rpc/dubbo-rpc-triple/pom.xml | 5 ++ dubbo-test/dubbo-test-common/pom.xml | 6 -- dubbo-test/dubbo-test-spring/pom.xml | 2 - 28 files changed, 136 insertions(+), 78 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index 4a1d226ff182..a0a85495ed01 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -170,6 +170,8 @@ dependency: license: MIT - name: org.slf4j:slf4j-log4j12 license: MIT + - name: org.slf4j:slf4j-reload4j + license: MIT - name: org.jboss.resteasy:resteasy-jaxrs license: Apache-2.0 - name: org.jboss.resteasy:resteasy-client diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml index 1f0173e6df52..f6e08ed26bb2 100644 --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@ -93,5 +93,10 @@ ${nashorn-core.version} test + + log4j + log4j + test + diff --git a/dubbo-compatible/pom.xml b/dubbo-compatible/pom.xml index 96931a09966f..cd3bffc3f197 100644 --- a/dubbo-compatible/pom.xml +++ b/dubbo-compatible/pom.xml @@ -58,6 +58,11 @@ dubbo-filter-validation ${project.parent.version} + + log4j + log4j + true + org.apache.dubbo dubbo-serialization-hessian2 diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index 6eb78848c6ac..17a8a4734e04 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -170,6 +170,11 @@ zookeeper test + + log4j + log4j + test + org.apache.dubbo diff --git a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml index 217f3edbc25d..ae3cd6cce438 100644 --- a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml @@ -31,6 +31,7 @@ true + 1.7.36 @@ -103,6 +104,18 @@ dubbo-serialization-fastjson2 ${project.version} + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + diff --git a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml index 120bb5350607..38527301cab0 100644 --- a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml @@ -31,7 +31,6 @@ true - 1.7.33 @@ -111,7 +110,6 @@ org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} log4j diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml index 62c4196be0b5..219cfa6cd702 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml @@ -168,7 +168,6 @@ org.slf4j slf4j-log4j12 - 1.7.33 compile diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml index 443fef8c29da..af84baa8c2f7 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml @@ -165,7 +165,6 @@ org.slf4j slf4j-log4j12 - 1.7.33 compile diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml index f37d467dffa8..8b138481c249 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml @@ -30,7 +30,6 @@ 8 8 - 1.7.33 2.7.16 true @@ -112,6 +111,14 @@ org.apache.logging.log4j log4j-api + + org.apache.logging.log4j + log4j-to-slf4j + + + logback-classic + ch.qos.logback + @@ -123,7 +130,6 @@ org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml index df45b0a1e839..d2468c3acf34 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml @@ -30,7 +30,6 @@ 8 8 - 1.7.33 2.7.16 true @@ -105,6 +104,14 @@ org.apache.logging.log4j log4j-api + + org.apache.logging.log4j + log4j-to-slf4j + + + logback-classic + ch.qos.logback + @@ -116,7 +123,6 @@ org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-consumer/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-consumer/pom.xml index 4e76a827908a..2c388e608297 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-consumer/pom.xml @@ -34,7 +34,6 @@ true - 1.7.33 @@ -127,7 +126,6 @@ org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} log4j diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-provider/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-provider/pom.xml index eb0aa9aa8f30..473d840e6a44 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-provider/pom.xml @@ -34,7 +34,6 @@ true - 1.7.33 @@ -127,7 +126,6 @@ org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} log4j diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml index 6d9d97a33370..1a049f394e7c 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml @@ -34,7 +34,6 @@ true - 1.7.33 @@ -127,7 +126,6 @@ org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} log4j diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml index 60219544e08f..caa3bf08479c 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml @@ -34,7 +34,6 @@ true - 1.7.33 @@ -127,7 +126,6 @@ org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} log4j diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml index 612da3c0f97b..fb76992bd09b 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml @@ -29,7 +29,6 @@ The demo provider module of dubbo project true - 1.7.33 @@ -119,7 +118,6 @@ org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} log4j diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 07fca6d4d377..2cccebda8ddd 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -305,8 +305,20 @@ ${zookeeper_version} + slf4j-log4j12 + org.slf4j + + + log4j + log4j + + + audience-annotations + org.apache.yetus + + + * io.netty - netty @@ -615,6 +627,11 @@ slf4j-api ${slf4j_version} + + org.slf4j + slf4j-log4j12 + ${slf4j_version} + commons-logging commons-logging diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 41913dc5fd99..986d0fbd4723 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -62,56 +62,23 @@ ${zookeeper_version} - io.netty - netty-handler + logback-classic + ch.qos.logback + + + logback-core + ch.qos.logback + + + audience-annotations + org.apache.yetus + * io.netty - netty-transport-native-epoll - - - com.github.spotbugs - spotbugs-annotations - true - - - - commons-cli - commons-cli - - - - org.eclipse.jetty - jetty-server - - - - org.eclipse.jetty - jetty-servlet - - - - org.eclipse.jetty - jetty-client - - - - jline - jline - - - - io.dropwizard.metrics - metrics-core - - - - org.xerial.snappy - snappy-java - diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index 678de29e88a0..e56edb95e71f 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -48,6 +48,32 @@ org.apache.zookeeper zookeeper ${zookeeper_version} + + + slf4j-log4j12 + org.slf4j + + + log4j + log4j + + + spotbugs-annotations + com.github.spotbugs + + + audience-annotations + org.apache.yetus + + + jline + jline + + + * + io.netty + + diff --git a/dubbo-plugin/dubbo-plugin-access-log/pom.xml b/dubbo-plugin/dubbo-plugin-access-log/pom.xml index deee17fef0b4..ad563c0580ad 100644 --- a/dubbo-plugin/dubbo-plugin-access-log/pom.xml +++ b/dubbo-plugin/dubbo-plugin-access-log/pom.xml @@ -42,5 +42,10 @@ dubbo-config-api ${project.version} + + log4j + log4j + test + diff --git a/dubbo-remoting/dubbo-remoting-http/pom.xml b/dubbo-remoting/dubbo-remoting-http/pom.xml index e184f53eedd3..71bfcca03494 100644 --- a/dubbo-remoting/dubbo-remoting-http/pom.xml +++ b/dubbo-remoting/dubbo-remoting-http/pom.xml @@ -59,6 +59,11 @@ 4.5.14 test + + log4j + log4j + test + com.squareup.okhttp3 diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml b/dubbo-remoting/dubbo-remoting-netty/pom.xml index 5d7cefac9598..8a626a6035c4 100644 --- a/dubbo-remoting/dubbo-remoting-netty/pom.xml +++ b/dubbo-remoting/dubbo-remoting-netty/pom.xml @@ -39,6 +39,11 @@ org.jboss.netty netty + + log4j + log4j + test + org.apache.dubbo dubbo-serialization-hessian2 diff --git a/dubbo-remoting/dubbo-remoting-netty4/pom.xml b/dubbo-remoting/dubbo-remoting-netty4/pom.xml index f94dce6bf36f..70fee3be9fec 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/pom.xml +++ b/dubbo-remoting/dubbo-remoting-netty4/pom.xml @@ -67,6 +67,11 @@ ${project.parent.version} test + + log4j + log4j + test + io.netty netty-transport-classes-epoll diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml index a9dc670b1f88..e5e0b7d785ed 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml +++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml @@ -68,12 +68,6 @@ org.apache.zookeeper zookeeper ${zookeeper_version} - - - org.slf4j - slf4j-log4j12 - - diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml index e92329b7edbe..045d3d9bf48b 100644 --- a/dubbo-rpc/dubbo-rpc-api/pom.xml +++ b/dubbo-rpc/dubbo-rpc-api/pom.xml @@ -50,6 +50,10 @@ hessian-lite test - + + log4j + log4j + test + diff --git a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml index 0570e6209ca9..1e66f662c3a0 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml +++ b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml @@ -90,6 +90,11 @@ javax.el test + + log4j + log4j + test + diff --git a/dubbo-rpc/dubbo-rpc-triple/pom.xml b/dubbo-rpc/dubbo-rpc-triple/pom.xml index 1c2845323913..a6732c3a66f7 100644 --- a/dubbo-rpc/dubbo-rpc-triple/pom.xml +++ b/dubbo-rpc/dubbo-rpc-triple/pom.xml @@ -68,6 +68,11 @@ ${project.parent.version} test + + log4j + log4j + test + org.apache.commons commons-compress diff --git a/dubbo-test/dubbo-test-common/pom.xml b/dubbo-test/dubbo-test-common/pom.xml index 4a8cb97d446a..0bd785ecc933 100644 --- a/dubbo-test/dubbo-test-common/pom.xml +++ b/dubbo-test/dubbo-test-common/pom.xml @@ -37,12 +37,6 @@ org.apache.zookeeper zookeeper - - - org.slf4j - slf4j-log4j12 - - diff --git a/dubbo-test/dubbo-test-spring/pom.xml b/dubbo-test/dubbo-test-spring/pom.xml index 9ac34620d595..4b3450619289 100644 --- a/dubbo-test/dubbo-test-spring/pom.xml +++ b/dubbo-test/dubbo-test-spring/pom.xml @@ -29,7 +29,6 @@ true - 1.7.33 3.2.18.RELEASE @@ -138,7 +137,6 @@ org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} log4j