diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 1c0e69e0e8d7..904a40fd7da2 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -193,7 +193,7 @@ jobs: openssl rsautl -decrypt -in ${{ github.workspace }}/.tmp/encrypted-sonarcloud-token -out ${{ github.workspace }}/.tmp/decrypted-sonarcloud-token -inkey ${{ github.workspace }}/.tmp/rsa/rsa_private.pem - name: "Test with Maven with SonarCloud Scan" if: ${{ github.repository == 'apache/dubbo' }} - timeout-minutes: 70 + timeout-minutes: 90 env: # Needed to get some information about the pull request, if any GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -202,7 +202,7 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_dubbo -DtrimStackTrace=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper -Dsonar.coverage.jacoco.xmlReportPaths=dubbo-test/dubbo-dependencies-all/target/site/jacoco-aggregate/jacoco.xml -Dsonar.login=${SONAR_TOKEN} - name: "Test with Maven without SonarCloud Scan" if: ${{ github.repository != 'apache/dubbo' }} - timeout-minutes: 70 + timeout-minutes: 90 run: | ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -DtrimStackTrace=false -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - name: "Upload coverage result" diff --git a/dubbo-annotation-processor/pom.xml b/dubbo-annotation-processor/pom.xml index 8a89f1bf7416..23cbd6ac2392 100644 --- a/dubbo-annotation-processor/pom.xml +++ b/dubbo-annotation-processor/pom.xml @@ -28,8 +28,8 @@ 1.0.0 - 8 - 8 + 1.8 + 1.8 UTF-8 @@ -37,7 +37,6 @@ true true true - true 5.9.0 diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml index 1f0173e6df52..8afb607af4b9 100644 --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@ -93,5 +93,10 @@ ${nashorn-core.version} test + + org.slf4j + slf4j-log4j12 + test + diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml index d9413ee7ad77..ce9048b28ded 100644 --- a/dubbo-common/pom.xml +++ b/dubbo-common/pom.xml @@ -100,5 +100,16 @@ javax.annotation javax.annotation-api + + + cglib + cglib-nodep + test + + + org.slf4j + slf4j-log4j12 + test + diff --git a/dubbo-compatible/pom.xml b/dubbo-compatible/pom.xml index 96931a09966f..417906da3c93 100644 --- a/dubbo-compatible/pom.xml +++ b/dubbo-compatible/pom.xml @@ -58,6 +58,11 @@ dubbo-filter-validation ${project.parent.version} + + org.slf4j + slf4j-log4j12 + 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..6dc26ed9fc83 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -170,6 +170,11 @@ zookeeper test + + org.slf4j + slf4j-log4j12 + test + org.apache.dubbo @@ -258,7 +263,5 @@ resteasy-jackson-provider test - - diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml index 44bdc0af9943..8d6b98d22bed 100644 --- a/dubbo-config/dubbo-config-spring/pom.xml +++ b/dubbo-config/dubbo-config-spring/pom.xml @@ -197,17 +197,22 @@ test - junit-vintage-engine - org.junit.vintage + logback-classic + ch.qos.logback - + log4j-to-slf4j org.apache.logging.log4j - log4j-api + + org.slf4j + slf4j-log4j12 + test + + org.apache.dubbo diff --git a/dubbo-config/dubbo-config-spring6/pom.xml b/dubbo-config/dubbo-config-spring6/pom.xml index 580d854ed4ae..329827434250 100644 --- a/dubbo-config/dubbo-config-spring6/pom.xml +++ b/dubbo-config/dubbo-config-spring6/pom.xml @@ -27,7 +27,6 @@ 17 17 - UTF-8 6.0.11 3.0.9 @@ -78,17 +77,20 @@ test - junit-vintage-engine - org.junit.vintage + logback-classic + ch.qos.logback - + log4j-to-slf4j org.apache.logging.log4j - log4j-api - + + org.slf4j + slf4j-log4j12 + test + diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml index 0274adf04209..3e0c748b6b54 100644 --- a/dubbo-config/pom.xml +++ b/dubbo-config/pom.xml @@ -59,7 +59,7 @@ jdk-version-ge-17 - 17 + [17,) dubbo-config-spring6 diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml index 880f041e3265..7bf050a2732d 100644 --- a/dubbo-container/dubbo-container-spring/pom.xml +++ b/dubbo-container/dubbo-container-spring/pom.xml @@ -41,12 +41,7 @@ org.slf4j - slf4j-api - test - - - log4j - log4j + slf4j-log4j12 test 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..74a7ac7b7751 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 @@ -104,19 +103,6 @@ dubbo-serialization-fastjson2 ${project.version} - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - log4j - log4j - diff --git a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml index be8bacd43d05..85a5df1c7c6f 100644 --- a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml @@ -32,7 +32,6 @@ true - 1.7.33 @@ -101,6 +100,5 @@ dubbo-serialization-fastjson2 ${project.version} - diff --git a/dubbo-demo/dubbo-demo-interface/pom.xml b/dubbo-demo/dubbo-demo-interface/pom.xml index 802bea76a314..a328f3c46a65 100644 --- a/dubbo-demo/dubbo-demo-interface/pom.xml +++ b/dubbo-demo/dubbo-demo-interface/pom.xml @@ -26,6 +26,7 @@ jar ${project.artifactId} The demo module of dubbo project + true @@ -48,6 +49,5 @@ org.springframework spring-web - 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..a10763668bd4 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 @@ -146,37 +146,6 @@ dubbo-native ${project.version} - - - log4j - log4j - 1.2.17 - compile - - - * - * - - - - - org.slf4j - slf4j-api - 1.7.36 - compile - - - org.slf4j - slf4j-log4j12 - 1.7.33 - compile - - - * - * - - - @@ -234,12 +203,8 @@ org.apache.dubbo.demo.graalvm.consumer.Application - - - - 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..6383e189a1c1 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 @@ -143,40 +143,8 @@ dubbo-native ${project.version} - - - log4j - log4j - 1.2.17 - compile - - - * - * - - - - - org.slf4j - slf4j-api - 1.7.36 - compile - - - org.slf4j - slf4j-log4j12 - 1.7.33 - compile - - - * - * - - - - native @@ -232,13 +200,8 @@ org.apache.dubbo.demo.graalvm.provider.Application - - - - - 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..6e414facece8 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 @@ -28,10 +28,6 @@ dubbo-demo-spring-boot-consumer - 8 - 8 - 1.7.33 - 2.7.16 true @@ -96,41 +92,6 @@ ${spring-boot.version} - - org.springframework.boot - spring-boot-autoconfigure - ${spring-boot.version} - - - - org.springframework.boot - spring-boot-starter-logging - ${spring-boot.version} - - - - org.apache.logging.log4j - log4j-api - - - - - - org.slf4j - slf4j-api - - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - - log4j - log4j - - org.apache.dubbo dubbo-tracing-otel-zipkin-spring-boot-starter @@ -142,7 +103,6 @@ dubbo-qos ${project.version} - diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-interface/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-interface/pom.xml index bf2090496809..75571006f0d7 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-interface/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-interface/pom.xml @@ -28,8 +28,6 @@ dubbo-demo-spring-boot-interface - 8 - 8 true 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..9638f9e42c6c 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 @@ -28,10 +28,6 @@ dubbo-demo-spring-boot-provider - 8 - 8 - 1.7.33 - 2.7.16 true @@ -84,46 +80,6 @@ ${project.version} - - org.springframework.boot - spring-boot-starter - ${spring-boot.version} - - - - org.springframework.boot - spring-boot-autoconfigure - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-logging - ${spring-boot.version} - - - - org.apache.logging.log4j - log4j-api - - - - - - org.slf4j - slf4j-api - - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - - log4j - log4j - - org.apache.dubbo @@ -137,6 +93,10 @@ ${project.version} + + org.springframework.boot + spring-boot-starter + diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml index d8f6c1a7a00f..f6d13b0f259e 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml @@ -33,13 +33,13 @@ - 8 - 8 true 2.7.16 + 1.7.33 2.7.16 1.11.5 + @@ -49,14 +49,31 @@ pom import + + org.springframework.boot + spring-boot-starter-logging + ${spring-boot.version} + + + logback-classic + ch.qos.logback + + + log4j-to-slf4j + org.apache.logging.log4j + + + + + org.slf4j + slf4j-log4j12 + ${slf4j-log4j12_version} + io.micrometer micrometer-core ${micrometer-core.version} - - - diff --git a/dubbo-demo/dubbo-demo-triple/pom.xml b/dubbo-demo/dubbo-demo-triple/pom.xml index 8934a4f52fb9..fb463ea86d89 100644 --- a/dubbo-demo/dubbo-demo-triple/pom.xml +++ b/dubbo-demo/dubbo-demo-triple/pom.xml @@ -32,9 +32,6 @@ true - 1.8 - 1.8 - 3.11.0 @@ -153,45 +150,17 @@ protobuf-maven-plugin ${maven_protobuf_plugin_version} - com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier} triple-java - build/generated/source/proto/main/java compile - test-compile - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${source.level} - ${target.level} - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - build/generated/source/proto/main/java - - - - - org.apache.maven.plugins 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..2f95fa7877b4 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,8 +34,8 @@ true - 1.7.33 + org.springframework @@ -120,19 +120,6 @@ dubbo-serialization-jdk ${project.version} - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - log4j - log4j - org.springframework 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..154002ef7fee 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,8 +34,8 @@ true - 1.7.33 + org.springframework @@ -120,19 +120,6 @@ dubbo-serialization-jdk ${project.version} - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - log4j - log4j - org.springframework 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..91e117e724d5 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,8 +34,8 @@ true - 1.7.33 + org.springframework @@ -120,19 +120,6 @@ dubbo-serialization-jdk ${project.version} - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - log4j - log4j - org.springframework 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..622039443584 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,8 +34,8 @@ true - 1.7.33 + org.springframework @@ -120,19 +120,6 @@ dubbo-serialization-jdk ${project.version} - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - log4j - log4j - org.springframework 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..0d1d8a85afa0 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 @@ -27,9 +27,9 @@ jar ${project.artifactId} The demo provider module of dubbo project + true - 1.7.33 @@ -112,19 +112,6 @@ dubbo-serialization-jdk ${project.version} - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - log4j - log4j - org.apache.dubbo dubbo-rpc-triple diff --git a/dubbo-demo/dubbo-demo-xml/pom.xml b/dubbo-demo/dubbo-demo-xml/pom.xml index 02b0ec085ece..2afa356e33a3 100644 --- a/dubbo-demo/dubbo-demo-xml/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/pom.xml @@ -44,7 +44,6 @@ dubbo-demo-spring-mvc-rest-provider - diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml index a5d6123dba83..59ada4091856 100644 --- a/dubbo-demo/pom.xml +++ b/dubbo-demo/pom.xml @@ -26,6 +26,7 @@ pom ${project.artifactId} The demo module of dubbo project + true @@ -41,4 +42,10 @@ dubbo-demo-spring-boot + + + org.slf4j + slf4j-log4j12 + + diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 07fca6d4d377..4a0c769f5283 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -158,12 +158,15 @@ 0.9.10 1.7.36 + + 1.7.33 1.2 1.2.17 1.2.11 2.20.0 2.11.0 + 1.16.0 0.13.0 @@ -176,6 +179,13 @@ 1.0.11 + + 5.9.3 + 4.2.0 + 2.2 + 2.2.2 + 4.11.0 + 2.2.7 1.2.0 1.19.1 @@ -305,8 +315,28 @@ ${zookeeper_version} + slf4j-log4j12 + org.slf4j + + + log4j + log4j + + + logback-core + ch.qos.logback + + + logback-classic + ch.qos.logback + + + audience-annotations + org.apache.yetus + + + * io.netty - netty @@ -615,6 +645,11 @@ slf4j-api ${slf4j_version} + + org.slf4j + slf4j-log4j12 + ${slf4j-log4j12_version} + commons-logging commons-logging @@ -625,6 +660,11 @@ commons-io ${commons_io_version} + + commons-codec + commons-codec + ${commons-codec_version} + log4j log4j @@ -751,7 +791,61 @@ test - + + + org.junit.jupiter + junit-jupiter-engine + ${junit_jupiter_version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit_jupiter_version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit_jupiter_version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit_jupiter_version} + test + + + org.awaitility + awaitility + ${awaitility_version} + test + + + org.hamcrest + hamcrest + ${hamcrest_version} + test + + + org.mockito + mockito-core + ${mockito_version} + test + + + org.mockito + mockito-inline + ${mockito_version} + test + + + cglib + cglib-nodep + ${cglib_version} + test + com.github.codemonstur embedded-redis @@ -764,6 +858,7 @@ ${spring_version} test + com.google.code.gson gson @@ -967,6 +1062,12 @@ true bom + + expand + remove + remove + remove + diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 41913dc5fd99..07f39b2da258 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -34,6 +34,7 @@ 3.3.0-beta.1-SNAPSHOT 1.5.0 + 1.7.36 5.1.0 3.8.1 @@ -55,6 +56,20 @@ org.apache.curator curator-x-discovery ${curator5_version} + + + zookeeper + org.apache.zookeeper + + + slf4j-api + org.slf4j + + + listenablefuture + com.google.guava + + org.apache.zookeeper @@ -62,55 +77,35 @@ ${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 + + + slf4j-api + org.slf4j + + + commons-io + commons-io - - - 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 + org.slf4j + slf4j-api + ${slf4j_version} @@ -122,7 +117,7 @@ ${maven_flatten_version} true - resolveCiFriendliesOnly + oss diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index 678de29e88a0..cb9cd5a2a08e 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -34,6 +34,7 @@ 3.3.0-beta.1-SNAPSHOT 1.5.0 + 1.7.36 4.3.0 3.4.14 @@ -43,11 +44,60 @@ org.apache.curator curator-x-discovery ${curator_version} + + + zookeeper + org.apache.zookeeper + + + slf4j-api + org.slf4j + + + listenablefuture + com.google.guava + + 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 + + + slf4j-api + org.slf4j + + + + + org.slf4j + slf4j-api + ${slf4j_version} @@ -59,7 +109,7 @@ ${maven_flatten_version} true - resolveCiFriendliesOnly + oss diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml index fab691bf7d96..2f966a58cb90 100644 --- a/dubbo-distribution/dubbo-all-shaded/pom.xml +++ b/dubbo-distribution/dubbo-all-shaded/pom.xml @@ -469,28 +469,6 @@ com.alibaba.fastjson2 fastjson2 - - - - org.junit.jupiter - junit-jupiter-engine - ${junit_jupiter_version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit_jupiter_version} - test - - - cglib - cglib-nodep - ${cglib_version} - test - true - - diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml index c2e4b0563352..cb507d5eab29 100644 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@ -638,28 +638,6 @@ com.alibaba.fastjson2 fastjson2 - - - - org.junit.jupiter - junit-jupiter-engine - ${junit_jupiter_version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit_jupiter_version} - test - - - cglib - cglib-nodep - ${cglib_version} - test - true - - diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml index bf3b0d31106c..6e6449b42062 100644 --- a/dubbo-distribution/dubbo-bom/pom.xml +++ b/dubbo-distribution/dubbo-bom/pom.xml @@ -66,6 +66,7 @@ org.apache.dubbo dubbo-config ${project.version} + pom org.apache.dubbo @@ -89,6 +90,7 @@ org.apache.dubbo dubbo-configcenter ${project.version} + pom org.apache.dubbo @@ -116,6 +118,7 @@ org.apache.dubbo dubbo-container ${project.version} + pom org.apache.dubbo @@ -138,11 +141,13 @@ org.apache.dubbo dubbo-dependencies-zookeeper ${project.version} + pom org.apache.dubbo dubbo-dependencies-zookeeper-curator5 ${project.version} + pom @@ -157,6 +162,7 @@ org.apache.dubbo dubbo-distribution ${project.version} + pom org.apache.dubbo @@ -179,6 +185,7 @@ org.apache.dubbo dubbo-filter ${project.version} + pom org.apache.dubbo @@ -203,6 +210,7 @@ org.apache.dubbo dubbo-metadata ${project.version} + pom org.apache.dubbo @@ -245,6 +253,7 @@ org.apache.dubbo dubbo-metrics ${project.version} + pom org.apache.dubbo @@ -299,6 +308,7 @@ org.apache.dubbo dubbo-monitor ${project.version} + pom org.apache.dubbo @@ -457,12 +467,12 @@ ${project.version} - org.apache.dubbo dubbo-registry ${project.version} + pom org.apache.dubbo @@ -495,6 +505,7 @@ org.apache.dubbo dubbo-remoting ${project.version} + pom org.apache.dubbo @@ -537,6 +548,7 @@ org.apache.dubbo dubbo-rpc ${project.version} + pom org.apache.dubbo @@ -570,6 +582,7 @@ org.apache.dubbo dubbo-serialization ${project.version} + pom org.apache.dubbo @@ -597,6 +610,7 @@ org.apache.dubbo dubbo-spring-boot ${project.version} + pom org.apache.dubbo @@ -612,6 +626,7 @@ org.apache.dubbo dubbo-spring-boot-compatible ${project.version} + pom org.apache.dubbo @@ -633,21 +648,17 @@ dubbo-spring-boot-interceptor ${project.version} - - org.apache.dubbo - dubbo-dependencies-zookeeper - pom - ${project.version} - org.apache.dubbo dubbo-spring-boot-starters ${project.version} + pom org.apache.dubbo dubbo-observability-spring-boot-starters ${project.version} + pom org.apache.dubbo @@ -705,6 +716,7 @@ org.apache.dubbo dubbo-test ${project.version} + pom org.apache.dubbo @@ -751,7 +763,6 @@ - @@ -761,6 +772,12 @@ true bom + + expand + remove + remove + remove + diff --git a/dubbo-kubernetes/pom.xml b/dubbo-kubernetes/pom.xml index 968aa2203155..7b3521923491 100644 --- a/dubbo-kubernetes/pom.xml +++ b/dubbo-kubernetes/pom.xml @@ -77,5 +77,4 @@ - diff --git a/dubbo-maven-plugin/pom.xml b/dubbo-maven-plugin/pom.xml index bff3ce7aa64e..6be4d359ad32 100644 --- a/dubbo-maven-plugin/pom.xml +++ b/dubbo-maven-plugin/pom.xml @@ -24,9 +24,6 @@ dubbo-maven-plugin - - - Dubbo Maven Plugin maven-plugin @@ -44,7 +41,6 @@ provided - org.apache.maven.plugin-tools maven-plugin-annotations @@ -64,7 +60,6 @@ ${project.version} - commons-io commons-io @@ -106,16 +101,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - diff --git a/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml b/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml index eb248b434c6c..44a969de0cbe 100644 --- a/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml +++ b/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml @@ -24,7 +24,6 @@ 4.0.0 dubbo-metadata-definition-protobuf - com.google.protobuf diff --git a/dubbo-metadata/dubbo-metadata-processor/pom.xml b/dubbo-metadata/dubbo-metadata-processor/pom.xml index 0945a6d43438..9a5aeab0dd3c 100644 --- a/dubbo-metadata/dubbo-metadata-processor/pom.xml +++ b/dubbo-metadata/dubbo-metadata-processor/pom.xml @@ -54,59 +54,18 @@ ${project.parent.version} - javax.annotation - javax.annotation-api - - - - org.slf4j - slf4j-api - - - - commons-logging - commons-logging - - - log4j - log4j - - - - org.apache.logging.log4j - log4j-api - - - - org.apache.logging.log4j - log4j-core + commons-io + commons-io - org.javassist javassist + org.javassist - com.alibaba - hessian-lite - - - com.esotericsoftware - kryo - - - de.javakaffee - kryo-serializers - - - de.ruedigermoeller - fst - - - commons-io - commons-io + javax.annotation-api + javax.annotation - @@ -168,7 +127,6 @@ org.apache.maven.plugins maven-compiler-plugin - true none diff --git a/dubbo-metrics/dubbo-tracing/pom.xml b/dubbo-metrics/dubbo-tracing/pom.xml index f6e26215d9c9..760e3e7bfd65 100644 --- a/dubbo-metrics/dubbo-tracing/pom.xml +++ b/dubbo-metrics/dubbo-tracing/pom.xml @@ -31,9 +31,6 @@ The tracing module of dubbo project - 11 - 11 - UTF-8 false @@ -115,4 +112,4 @@ true - \ No newline at end of file + diff --git a/dubbo-monitor/dubbo-monitor-default/pom.xml b/dubbo-monitor/dubbo-monitor-default/pom.xml index 9ad35b2e1d83..3d001020e549 100644 --- a/dubbo-monitor/dubbo-monitor-default/pom.xml +++ b/dubbo-monitor/dubbo-monitor-default/pom.xml @@ -77,5 +77,10 @@ gson test + + org.slf4j + slf4j-log4j12 + test + diff --git a/dubbo-plugin/dubbo-auth/pom.xml b/dubbo-plugin/dubbo-auth/pom.xml index 5ae1d98ac07a..6fcc9a6ac1fe 100644 --- a/dubbo-plugin/dubbo-auth/pom.xml +++ b/dubbo-plugin/dubbo-auth/pom.xml @@ -27,7 +27,6 @@ jar - UTF-8 false @@ -43,4 +42,4 @@ ${project.version} - \ No newline at end of file + diff --git a/dubbo-plugin/dubbo-compiler/pom.xml b/dubbo-plugin/dubbo-compiler/pom.xml index 4fa6f61be8bc..0fcb560f13df 100644 --- a/dubbo-plugin/dubbo-compiler/pom.xml +++ b/dubbo-plugin/dubbo-compiler/pom.xml @@ -69,10 +69,6 @@ maven-compiler-plugin -proc:none - true - ${java_source_version} - ${java_target_version} - ${file_encoding} diff --git a/dubbo-plugin/dubbo-filter-cache/pom.xml b/dubbo-plugin/dubbo-filter-cache/pom.xml index a00c2e9041c0..8e132e04a0bb 100644 --- a/dubbo-plugin/dubbo-filter-cache/pom.xml +++ b/dubbo-plugin/dubbo-filter-cache/pom.xml @@ -27,6 +27,7 @@ The cache module of dubbo project false + 3.12.13 diff --git a/dubbo-plugin/dubbo-filter-validation/pom.xml b/dubbo-plugin/dubbo-filter-validation/pom.xml index 48ff349ad9d5..a07374e39994 100644 --- a/dubbo-plugin/dubbo-filter-validation/pom.xml +++ b/dubbo-plugin/dubbo-filter-validation/pom.xml @@ -27,6 +27,9 @@ The validation module of dubbo project false + 5.2.4.Final + 2.2.5 + 2.2.7 @@ -45,8 +48,8 @@ org.hibernate hibernate-validator - test ${hibernate_validator_version} + test javax.el diff --git a/dubbo-plugin/dubbo-native/pom.xml b/dubbo-plugin/dubbo-native/pom.xml index 22baa2d4e6e1..e8b74f45ca4f 100644 --- a/dubbo-plugin/dubbo-native/pom.xml +++ b/dubbo-plugin/dubbo-native/pom.xml @@ -28,7 +28,6 @@ dubbo-native jar - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-access-log/pom.xml b/dubbo-plugin/dubbo-plugin-access-log/pom.xml index deee17fef0b4..4ddf4c5cfbf0 100644 --- a/dubbo-plugin/dubbo-plugin-access-log/pom.xml +++ b/dubbo-plugin/dubbo-plugin-access-log/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-access-log jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-classloader-filter/pom.xml b/dubbo-plugin/dubbo-plugin-classloader-filter/pom.xml index 6dd833cd630d..9423bb794541 100644 --- a/dubbo-plugin/dubbo-plugin-classloader-filter/pom.xml +++ b/dubbo-plugin/dubbo-plugin-classloader-filter/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-classloader-filter jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-cluster-mergeable/pom.xml b/dubbo-plugin/dubbo-plugin-cluster-mergeable/pom.xml index 5c2139260782..35e33c0c2575 100644 --- a/dubbo-plugin/dubbo-plugin-cluster-mergeable/pom.xml +++ b/dubbo-plugin/dubbo-plugin-cluster-mergeable/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-cluster-mergeable jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-context/pom.xml b/dubbo-plugin/dubbo-plugin-context/pom.xml index ed21c7aa9eaf..aeb355c5a855 100644 --- a/dubbo-plugin/dubbo-plugin-context/pom.xml +++ b/dubbo-plugin/dubbo-plugin-context/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-context jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml b/dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml index e7689611df9f..05e37ea69c60 100644 --- a/dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml +++ b/dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-generic-invoke jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-loadbalance-adaptive/pom.xml b/dubbo-plugin/dubbo-plugin-loadbalance-adaptive/pom.xml index 9d1f8890862d..26fa4603155f 100644 --- a/dubbo-plugin/dubbo-plugin-loadbalance-adaptive/pom.xml +++ b/dubbo-plugin/dubbo-plugin-loadbalance-adaptive/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-loadbalance-adaptive jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-loom/pom.xml b/dubbo-plugin/dubbo-plugin-loom/pom.xml index 1d78e6522029..8a6cfc24449d 100644 --- a/dubbo-plugin/dubbo-plugin-loom/pom.xml +++ b/dubbo-plugin/dubbo-plugin-loom/pom.xml @@ -29,8 +29,6 @@ dubbo-plugin-loom - UTF-8 - UTF-8 false diff --git a/dubbo-plugin/dubbo-plugin-mock/pom.xml b/dubbo-plugin/dubbo-plugin-mock/pom.xml index 8268ef458648..5da1b2f37d0a 100644 --- a/dubbo-plugin/dubbo-plugin-mock/pom.xml +++ b/dubbo-plugin/dubbo-plugin-mock/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-mock jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml b/dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml index 50bdecc5cece..37e9f143f389 100644 --- a/dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml +++ b/dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-proxy-bytebuddy jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-qos-trace/pom.xml b/dubbo-plugin/dubbo-plugin-qos-trace/pom.xml index a9d28fa47292..85b41090e562 100644 --- a/dubbo-plugin/dubbo-plugin-qos-trace/pom.xml +++ b/dubbo-plugin/dubbo-plugin-qos-trace/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-qos-trace jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-router-condition/pom.xml b/dubbo-plugin/dubbo-plugin-router-condition/pom.xml index f34a1baa2c64..4a865c277226 100644 --- a/dubbo-plugin/dubbo-plugin-router-condition/pom.xml +++ b/dubbo-plugin/dubbo-plugin-router-condition/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-router-condition jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-router-mesh/pom.xml b/dubbo-plugin/dubbo-plugin-router-mesh/pom.xml index c1055dff9034..5de51faabe4a 100644 --- a/dubbo-plugin/dubbo-plugin-router-mesh/pom.xml +++ b/dubbo-plugin/dubbo-plugin-router-mesh/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-router-mesh jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-router-script/pom.xml b/dubbo-plugin/dubbo-plugin-router-script/pom.xml index ac3a30dfbe2e..ac9888a5f098 100644 --- a/dubbo-plugin/dubbo-plugin-router-script/pom.xml +++ b/dubbo-plugin/dubbo-plugin-router-script/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-router-script jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-router-tag/pom.xml b/dubbo-plugin/dubbo-plugin-router-tag/pom.xml index 8bdc94bacb5b..a1fcf282ab40 100644 --- a/dubbo-plugin/dubbo-plugin-router-tag/pom.xml +++ b/dubbo-plugin/dubbo-plugin-router-tag/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-router-tag jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-token/pom.xml b/dubbo-plugin/dubbo-plugin-token/pom.xml index 0d66e62049f2..378c26a2c871 100644 --- a/dubbo-plugin/dubbo-plugin-token/pom.xml +++ b/dubbo-plugin/dubbo-plugin-token/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-token jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-plugin-tps/pom.xml b/dubbo-plugin/dubbo-plugin-tps/pom.xml index 7517b190a2d6..cd8649c22bd8 100644 --- a/dubbo-plugin/dubbo-plugin-tps/pom.xml +++ b/dubbo-plugin/dubbo-plugin-tps/pom.xml @@ -27,10 +27,6 @@ dubbo-plugin-tps jar - - UTF-8 - - org.apache.dubbo diff --git a/dubbo-plugin/dubbo-security/pom.xml b/dubbo-plugin/dubbo-security/pom.xml index 583792d448af..783ee16ddc2a 100644 --- a/dubbo-plugin/dubbo-security/pom.xml +++ b/dubbo-plugin/dubbo-security/pom.xml @@ -26,8 +26,6 @@ false - 3.22.2 - 1.55.1 dubbo-security @@ -53,7 +51,6 @@ - io.grpc grpc-protobuf @@ -110,11 +107,11 @@ org.xolstice.maven.plugins protobuf-maven-plugin - 0.6.1 + ${maven_protobuf_plugin_version} - com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${grpc_version}:exe:${os.detected.classifier} diff --git a/dubbo-plugin/pom.xml b/dubbo-plugin/pom.xml index 3d38c11f9e98..a4d6347355fe 100644 --- a/dubbo-plugin/pom.xml +++ b/dubbo-plugin/pom.xml @@ -31,6 +31,7 @@ dubbo-qos dubbo-auth + dubbo-compiler dubbo-reactive dubbo-security dubbo-spring-security @@ -65,6 +66,11 @@ ${project.parent.version} test + + org.slf4j + slf4j-log4j12 + test + diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index eb17182ab877..dd5a180f01b1 100644 --- a/dubbo-registry/dubbo-registry-api/pom.xml +++ b/dubbo-registry/dubbo-registry-api/pom.xml @@ -118,5 +118,11 @@ ${project.parent.version} test + + + org.slf4j + slf4j-log4j12 + test + diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml index a9eace27b847..2c96dfddc125 100644 --- a/dubbo-remoting/dubbo-remoting-api/pom.xml +++ b/dubbo-remoting/dubbo-remoting-api/pom.xml @@ -52,5 +52,10 @@ ${project.parent.version} test + + org.slf4j + slf4j-log4j12 + test + diff --git a/dubbo-remoting/dubbo-remoting-http/pom.xml b/dubbo-remoting/dubbo-remoting-http/pom.xml index e184f53eedd3..5875b1b0d72a 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 + + org.slf4j + slf4j-log4j12 + test + com.squareup.okhttp3 diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml b/dubbo-remoting/dubbo-remoting-netty/pom.xml index 5d7cefac9598..4c65fd2dd23f 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 + + org.slf4j + slf4j-log4j12 + 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..3fbc0698c8a0 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 + + org.slf4j + slf4j-log4j12 + 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..a408832bcd9d 100644 --- a/dubbo-rpc/dubbo-rpc-api/pom.xml +++ b/dubbo-rpc/dubbo-rpc-api/pom.xml @@ -50,6 +50,10 @@ hessian-lite test - + + org.slf4j + slf4j-log4j12 + test + diff --git a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml index 0570e6209ca9..5e8338eed63e 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml +++ b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml @@ -90,6 +90,11 @@ javax.el test + + org.slf4j + slf4j-log4j12 + test + diff --git a/dubbo-rpc/dubbo-rpc-rest/pom.xml b/dubbo-rpc/dubbo-rpc-rest/pom.xml index b460c4aec3c6..f583a5ed8f28 100644 --- a/dubbo-rpc/dubbo-rpc-rest/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rest/pom.xml @@ -123,7 +123,6 @@ test - org.apache.dubbo dubbo-metadata-rest diff --git a/dubbo-rpc/dubbo-rpc-triple/pom.xml b/dubbo-rpc/dubbo-rpc-triple/pom.xml index 1c2845323913..da1397c6ae49 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 + + org.slf4j + slf4j-log4j12 + test + org.apache.commons commons-compress @@ -91,6 +96,12 @@ dubbo-native ${project.parent.version} + + org.apache.dubbo + dubbo-compiler + ${project.parent.version} + provided + @@ -113,7 +124,7 @@ ${maven_protobuf_plugin_version} - com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier} diff --git a/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml index 88c25d4e3bd5..c9ce0c7c7193 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml @@ -43,19 +43,6 @@ org.springframework.boot spring-boot-starter-web true - - - - org.apache.logging.log4j - log4j-api - - - - - org.apache.logging.log4j - log4j-api - ${log4j2_version} - true @@ -131,13 +118,6 @@ org.springframework.boot spring-boot-starter-test test - - - - org.apache.logging.log4j - log4j-api - - diff --git a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml index 392ecb89e4b3..741a05be1deb 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml @@ -30,7 +30,6 @@ jar Apache Dubbo Spring Boot Auto-Configure - @@ -51,13 +50,6 @@ org.springframework.boot spring-boot-starter-logging true - - - - org.apache.logging.log4j - log4j-api - - @@ -86,13 +78,6 @@ org.springframework.boot spring-boot-starter-test test - - - - org.apache.logging.log4j - log4j-api - - diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/pom.xml index 66f157f0b546..31748f628380 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-compatible/actuator/pom.xml @@ -101,13 +101,6 @@ org.springframework.boot spring-boot-starter-test test - - - - org.apache.logging.log4j - log4j-api - - diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/pom.xml index da3174cc7d6f..685b2516e95d 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/pom.xml @@ -48,13 +48,6 @@ org.springframework.boot spring-boot-starter-logging true - - - - org.apache.logging.log4j - log4j-api - - @@ -89,13 +82,6 @@ org.springframework.boot spring-boot-starter-test test - - - - org.apache.logging.log4j - log4j-api - - diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-compatible/pom.xml index baeaaa40fe01..1526635a7f73 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-compatible/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-compatible/pom.xml @@ -60,7 +60,8 @@ maven-surefire-plugin true - once + 1 + false ${argline} ${jacocoArgLine} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED diff --git a/dubbo-spring-boot/dubbo-spring-boot-interceptor/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-interceptor/pom.xml index e097175e7eec..f173ad97be04 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-interceptor/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-interceptor/pom.xml @@ -49,5 +49,4 @@ - diff --git a/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml index b510c64bc6b0..64b5b207664b 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml @@ -30,26 +30,12 @@ jar Apache Dubbo Spring Boot Starter - org.springframework.boot spring-boot-starter true - - - - org.apache.logging.log4j - log4j-api - - - - - org.apache.logging.log4j - log4j-api - ${log4j2_version} - true diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml index e6e6c6ab918f..3c933c8a8153 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml @@ -58,58 +58,6 @@ org.apache.zookeeper zookeeper ${zookeeper_version} - - - io.netty - netty-handler - - - 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 - - \ No newline at end of file + diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml index 189443c44045..31cf4d47e0aa 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml @@ -32,6 +32,7 @@ Apache Dubbo Zookeeper Spring Boot Starter + 3.8.3 @@ -42,7 +43,8 @@ org.apache.zookeeper zookeeper + ${zookeeper_version} - \ No newline at end of file + diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml index f9d251e20294..5f8f83c774ca 100644 --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@ -42,11 +42,10 @@ 2.7.16 - ${revision} - - 2.20.0 1.14.9 + 1.7.33 + 4.11.0 @@ -59,28 +58,50 @@ pom import + + org.springframework.boot + spring-boot-starter-logging + ${spring-boot.version} + + + logback-classic + ch.qos.logback + + + log4j-to-slf4j + org.apache.logging.log4j + + + log4j-over-slf4j + org.slf4j + + + + + org.slf4j + slf4j-log4j12 + ${slf4j-log4j12_version} + + + org.mockito + mockito-core + ${mockito_version} + test + + + org.mockito + mockito-inline + ${mockito_version} + test + - - - org.junit.jupiter - junit-jupiter-engine - ${junit_jupiter_version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit_jupiter_version} - test - org.junit.vintage junit-vintage-engine - ${junit_jupiter_version} test @@ -101,6 +122,12 @@ ${project.parent.version} test + + org.slf4j + slf4j-log4j12 + ${slf4j-log4j12_version} + test + @@ -166,21 +193,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven_compiler_version} - - - -parameters - - true - ${java_source_version} - ${java_target_version} - ${file_encoding} - - diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml index 6afbac88e005..2850fef28d9f 100644 --- a/dubbo-test/dubbo-dependencies-all/pom.xml +++ b/dubbo-test/dubbo-dependencies-all/pom.xml @@ -377,7 +377,6 @@ ${project.version} - org.apache.dubbo diff --git a/dubbo-test/dubbo-test-check/pom.xml b/dubbo-test/dubbo-test-check/pom.xml index 23a0d19685f3..7b6a8b037fcd 100644 --- a/dubbo-test/dubbo-test-check/pom.xml +++ b/dubbo-test/dubbo-test-check/pom.xml @@ -29,8 +29,6 @@ dubbo-test-check - 8 - 8 true 4.2.0 3.7.2 diff --git a/dubbo-test/dubbo-test-common/pom.xml b/dubbo-test/dubbo-test-common/pom.xml index 4a8cb97d446a..be6a987ad86a 100644 --- a/dubbo-test/dubbo-test-common/pom.xml +++ b/dubbo-test/dubbo-test-common/pom.xml @@ -28,8 +28,6 @@ dubbo-test-common - 8 - 8 true @@ -37,12 +35,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..834bb2c4768e 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 @@ -131,79 +130,57 @@ dubbo-serialization-jdk ${project.version} - - org.slf4j - slf4j-api - org.slf4j slf4j-log4j12 - ${slf4j-log4j12.version} - - - log4j - log4j - org.junit.jupiter junit-jupiter-engine - ${junit_jupiter_version} - + compile org.junit.jupiter junit-jupiter-params - ${junit_jupiter_version} - + compile org.hamcrest hamcrest - ${hamcrest_version} - + compile org.junit.jupiter junit-jupiter-api - ${junit_jupiter_version} - + compile org.mockito mockito-core - ${mockito_version} - + compile org.mockito mockito-inline - ${mockito_version} - - - - cglib - cglib-nodep - ${cglib_version} - + compile org.apache.curator curator-framework - + compile org.apache.curator curator-recipes - + compile org.apache.zookeeper zookeeper - + compile diff --git a/dubbo-test/dubbo-test-spring3.2/pom.xml b/dubbo-test/dubbo-test-spring3.2/pom.xml index 0156c22e75a5..78f8c9d2ff2c 100644 --- a/dubbo-test/dubbo-test-spring3.2/pom.xml +++ b/dubbo-test/dubbo-test-spring3.2/pom.xml @@ -97,7 +97,8 @@ maven-surefire-plugin true - once + 1 + false ${argline} ${jacocoArgLine} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED diff --git a/dubbo-test/dubbo-test-spring4.1/pom.xml b/dubbo-test/dubbo-test-spring4.1/pom.xml index bf3a21918696..64c9b365114e 100644 --- a/dubbo-test/dubbo-test-spring4.1/pom.xml +++ b/dubbo-test/dubbo-test-spring4.1/pom.xml @@ -51,11 +51,12 @@ dubbo-test-spring ${project.version} test - - org.apache.curator - curator-framework - - + + + org.apache.curator + curator-framework + + org.apache.curator curator-recipes @@ -96,7 +97,8 @@ maven-surefire-plugin true - once + 1 + false ${argline} ${jacocoArgLine} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED diff --git a/dubbo-test/dubbo-test-spring4.2/pom.xml b/dubbo-test/dubbo-test-spring4.2/pom.xml index cc90e8aef9ac..d4c0ac25556c 100644 --- a/dubbo-test/dubbo-test-spring4.2/pom.xml +++ b/dubbo-test/dubbo-test-spring4.2/pom.xml @@ -51,11 +51,12 @@ dubbo-test-spring ${project.version} test - - org.apache.curator - curator-framework - - + + + org.apache.curator + curator-framework + + org.apache.curator curator-recipes @@ -96,7 +97,8 @@ maven-surefire-plugin true - once + 1 + false ${argline} ${jacocoArgLine} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index d4c487812b68..180d47846249 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -39,8 +39,6 @@ - 8 - 8 true diff --git a/dubbo-xds/pom.xml b/dubbo-xds/pom.xml index 88d128e7aea0..21b287adefd7 100644 --- a/dubbo-xds/pom.xml +++ b/dubbo-xds/pom.xml @@ -106,7 +106,7 @@ protobuf-maven-plugin ${maven_protobuf_plugin_version} - com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier} grpc-java io.grpc:protoc-gen-grpc-java:${grpc_version}:exe:${os.detected.classifier} diff --git a/pom.xml b/pom.xml index 56bf7e32710b..e406541a66ad 100644 --- a/pom.xml +++ b/pom.xml @@ -87,30 +87,25 @@ - - 5.9.3 - 4.2.0 - 3.12.13 - 2.2 - 5.2.4.Final - 2.2.5 - 2.2.7 - 2.2.2 - 4.11.0 - -server -Xms256m -Xmx512m -Dfile.encoding=UTF-8 - -Djava.net.preferIPv4Stack=true -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m + 1.8 + 1.8 + UTF-8 + UTF-8 + 2020-04-01T08:04:00Z + -server -Xms256m -Xmx512m -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Dfile.encoding=UTF-8 + -Djava.net.preferIPv4Stack=true - false + + + oss true - ${file_encoding} - 2020-04-01T08:04:00Z + false + true + true + true + true - oss - - 1.8 - 1.8 - UTF-8 3.3.0 3.0.0 @@ -128,15 +123,10 @@ 1.0.0 1.7.1 0.6.1 - - true - true - true - true - 1.2.2 - 3.22.3 + 3.22.3 1.54.0 + 3.3.0-beta.1-SNAPSHOT @@ -180,7 +170,6 @@ - org.apache.dubbo dubbo-annotation-processor @@ -192,49 +181,31 @@ org.junit.jupiter junit-jupiter-engine - ${junit_jupiter_version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit_jupiter_version} test org.junit.jupiter junit-jupiter-params - ${junit_jupiter_version} test org.awaitility awaitility - ${awaitility_version} test org.hamcrest hamcrest - ${hamcrest_version} test org.mockito mockito-core - ${mockito_version} test org.mockito mockito-inline - ${mockito_version} - test - - - cglib - cglib-nodep - ${cglib_version} test @@ -324,7 +295,6 @@ codestyle/checkstyle.xml codestyle/checkstyle-suppressions.xml - UTF-8 true true ${checkstyle.skip} @@ -387,7 +357,6 @@ validate codestyle/checkstyle_unix.xml - UTF-8 true true ${checkstyle_unix.skip} @@ -483,7 +452,7 @@ UTF-8 ${maven_source_version} - http://docs.oracle.com/javase/8/docs/api + https://docs.oracle.com/javase/8/docs/api none @@ -559,7 +528,8 @@ maven-surefire-plugin true - once + 1 + false ${argline} ${jacocoArgLine} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED @@ -584,7 +554,8 @@ maven-surefire-plugin true - once + 1 + false ${argline} ${jacocoArgLine} @@ -703,7 +674,8 @@ maven-surefire-plugin true - once + 1 + false ${argline} ${jacocoArgLine} @@ -727,9 +699,6 @@ -parameters true - ${java_source_version} - ${java_target_version} - ${file_encoding}