You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/11/02 01:54:38 UTC
(dubbo) branch 3.3 updated: fix(pom): #13188 Exclude unnecessary transitive dependencies for zookeeper & cleanup pom (#13230)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 539bb11ae7 fix(pom): #13188 Exclude unnecessary transitive dependencies for zookeeper & cleanup pom (#13230)
539bb11ae7 is described below
commit 539bb11ae7420a35d5a999859ed7ba38f4f0f370
Author: Sean Yang <ox...@gmail.com>
AuthorDate: Thu Nov 2 09:54:33 2023 +0800
fix(pom): #13188 Exclude unnecessary transitive dependencies for zookeeper & cleanup pom (#13230)
---
.github/workflows/build-and-test-pr.yml | 4 +-
dubbo-annotation-processor/pom.xml | 5 +-
dubbo-cluster/pom.xml | 5 +
dubbo-common/pom.xml | 11 +++
dubbo-compatible/pom.xml | 5 +
dubbo-config/dubbo-config-api/pom.xml | 7 +-
dubbo-config/dubbo-config-spring/pom.xml | 13 ++-
dubbo-config/dubbo-config-spring6/pom.xml | 14 +--
dubbo-container/dubbo-container-spring/pom.xml | 7 +-
.../dubbo-demo-annotation-provider/pom.xml | 14 ---
.../dubbo-demo-api/dubbo-demo-api-provider/pom.xml | 2 -
dubbo-demo/dubbo-demo-interface/pom.xml | 2 +-
.../dubbo-demo-native-consumer/pom.xml | 35 -------
.../dubbo-demo-native-provider/pom.xml | 37 --------
.../dubbo-demo-spring-boot-consumer/pom.xml | 40 --------
.../dubbo-demo-spring-boot-interface/pom.xml | 2 -
.../dubbo-demo-spring-boot-provider/pom.xml | 48 +---------
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 27 +++++-
dubbo-demo/dubbo-demo-triple/pom.xml | 33 +------
.../dubbo-demo-jaxrs-rest-consumer/pom.xml | 15 +--
.../dubbo-demo-jaxrs-rest-provider/pom.xml | 15 +--
.../dubbo-demo-spring-mvc-rest-consumer/pom.xml | 15 +--
.../dubbo-demo-spring-mvc-rest-provider/pom.xml | 15 +--
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 15 +--
dubbo-demo/dubbo-demo-xml/pom.xml | 1 -
dubbo-demo/pom.xml | 7 ++
dubbo-dependencies-bom/pom.xml | 105 ++++++++++++++++++++-
.../dubbo-dependencies-zookeeper-curator5/pom.xml | 81 ++++++++--------
.../dubbo-dependencies-zookeeper/pom.xml | 52 +++++++++-
dubbo-distribution/dubbo-all-shaded/pom.xml | 22 -----
dubbo-distribution/dubbo-all/pom.xml | 22 -----
dubbo-distribution/dubbo-bom/pom.xml | 33 +++++--
dubbo-kubernetes/pom.xml | 1 -
dubbo-maven-plugin/pom.xml | 15 ---
.../dubbo-metadata-definition-protobuf/pom.xml | 1 -
dubbo-metadata/dubbo-metadata-processor/pom.xml | 52 +---------
dubbo-metrics/dubbo-tracing/pom.xml | 5 +-
dubbo-monitor/dubbo-monitor-default/pom.xml | 5 +
dubbo-plugin/dubbo-auth/pom.xml | 3 +-
dubbo-plugin/dubbo-compiler/pom.xml | 4 -
dubbo-plugin/dubbo-filter-cache/pom.xml | 1 +
dubbo-plugin/dubbo-filter-validation/pom.xml | 5 +-
dubbo-plugin/dubbo-native/pom.xml | 1 -
dubbo-plugin/dubbo-plugin-access-log/pom.xml | 4 -
.../dubbo-plugin-classloader-filter/pom.xml | 4 -
.../dubbo-plugin-cluster-mergeable/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-context/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml | 4 -
.../dubbo-plugin-loadbalance-adaptive/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-loom/pom.xml | 2 -
dubbo-plugin/dubbo-plugin-mock/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-qos-trace/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-router-condition/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-router-mesh/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-router-script/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-router-tag/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-token/pom.xml | 4 -
dubbo-plugin/dubbo-plugin-tps/pom.xml | 4 -
dubbo-plugin/dubbo-security/pom.xml | 9 +-
dubbo-plugin/pom.xml | 5 +
dubbo-registry/dubbo-registry-api/pom.xml | 6 ++
dubbo-remoting/dubbo-remoting-api/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/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-rest/pom.xml | 1 -
dubbo-rpc/dubbo-rpc-triple/pom.xml | 9 +-
.../dubbo-spring-boot-actuator/pom.xml | 20 ----
.../dubbo-spring-boot-autoconfigure/pom.xml | 15 ---
.../dubbo-spring-boot-compatible/actuator/pom.xml | 7 --
.../autoconfigure/pom.xml | 14 ---
.../dubbo-spring-boot-compatible/pom.xml | 3 +-
.../dubbo-spring-boot-interceptor/pom.xml | 1 -
.../dubbo-spring-boot-starter/pom.xml | 14 ---
.../pom.xml | 54 +----------
.../dubbo-zookeeper-spring-boot-starter/pom.xml | 4 +-
dubbo-spring-boot/pom.xml | 76 ++++++++-------
dubbo-test/dubbo-dependencies-all/pom.xml | 1 -
dubbo-test/dubbo-test-check/pom.xml | 2 -
dubbo-test/dubbo-test-common/pom.xml | 8 --
dubbo-test/dubbo-test-spring/pom.xml | 41 ++------
dubbo-test/dubbo-test-spring3.2/pom.xml | 3 +-
dubbo-test/dubbo-test-spring4.1/pom.xml | 14 +--
dubbo-test/dubbo-test-spring4.2/pom.xml | 14 +--
dubbo-test/pom.xml | 2 -
dubbo-xds/pom.xml | 2 +-
pom.xml | 79 +++++-----------
91 files changed, 475 insertions(+), 830 deletions(-)
diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml
index 1c0e69e0e8..904a40fd7d 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 [...]
- 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 8a89f1bf74..23cbd6ac23 100644
--- a/dubbo-annotation-processor/pom.xml
+++ b/dubbo-annotation-processor/pom.xml
@@ -28,8 +28,8 @@
<version>1.0.0</version>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- System dependencies may cause problems in checkstyle. -->
@@ -37,7 +37,6 @@
<checkstyle_unix.skip>true</checkstyle_unix.skip>
<rat.skip>true</rat.skip>
<jacoco.skip>true</jacoco.skip>
-
<maven.deploy.skip>true</maven.deploy.skip>
<junit_jupiter_version>5.9.0</junit_jupiter_version>
diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml
index 1f0173e6df..8afb607af4 100644
--- a/dubbo-cluster/pom.xml
+++ b/dubbo-cluster/pom.xml
@@ -93,5 +93,10 @@
<version>${nashorn-core.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
index d9413ee7ad..ce9048b28d 100644
--- a/dubbo-common/pom.xml
+++ b/dubbo-common/pom.xml
@@ -100,5 +100,16 @@
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-compatible/pom.xml b/dubbo-compatible/pom.xml
index 96931a0996..417906da3c 100644
--- a/dubbo-compatible/pom.xml
+++ b/dubbo-compatible/pom.xml
@@ -58,6 +58,11 @@
<artifactId>dubbo-filter-validation</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-hessian2</artifactId>
diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml
index 6eb78848c6..6dc26ed9fc 100644
--- a/dubbo-config/dubbo-config-api/pom.xml
+++ b/dubbo-config/dubbo-config-api/pom.xml
@@ -170,6 +170,11 @@
<artifactId>zookeeper</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -258,7 +263,5 @@
<artifactId>resteasy-jackson-provider</artifactId>
<scope>test</scope>
</dependency>
-
-
</dependencies>
</project>
diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml
index 44bdc0af99..8d6b98d22b 100644
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@ -197,17 +197,22 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>junit-vintage-engine</artifactId>
- <groupId>org.junit.vintage</groupId>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
</exclusion>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
<exclusion>
+ <artifactId>log4j-to-slf4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- Zookeeper dependencies for testing -->
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-config/dubbo-config-spring6/pom.xml b/dubbo-config/dubbo-config-spring6/pom.xml
index 580d854ed4..3298274342 100644
--- a/dubbo-config/dubbo-config-spring6/pom.xml
+++ b/dubbo-config/dubbo-config-spring6/pom.xml
@@ -27,7 +27,6 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>6.0.11</spring.version>
<spring-boot.version>3.0.9</spring-boot.version>
</properties>
@@ -78,17 +77,20 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>junit-vintage-engine</artifactId>
- <groupId>org.junit.vintage</groupId>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
</exclusion>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
<exclusion>
+ <artifactId>log4j-to-slf4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml
index 880f041e32..7bf050a273 100644
--- a/dubbo-container/dubbo-container-spring/pom.xml
+++ b/dubbo-container/dubbo-container-spring/pom.xml
@@ -41,12 +41,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
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 120bb53506..74a7ac7b77 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 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
</properties>
<dependencies>
@@ -104,19 +103,6 @@
<artifactId>dubbo-serialization-fastjson2</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
</project>
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 be8bacd43d..85a5df1c7c 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 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
</properties>
<dependencies>
@@ -101,6 +100,5 @@
<artifactId>dubbo-serialization-fastjson2</artifactId>
<version>${project.version}</version>
</dependency>
-
</dependencies>
</project>
diff --git a/dubbo-demo/dubbo-demo-interface/pom.xml b/dubbo-demo/dubbo-demo-interface/pom.xml
index 802bea76a3..a328f3c46a 100644
--- a/dubbo-demo/dubbo-demo-interface/pom.xml
+++ b/dubbo-demo/dubbo-demo-interface/pom.xml
@@ -26,6 +26,7 @@
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The demo module of dubbo project</description>
+
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
</properties>
@@ -48,6 +49,5 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
-
</dependencies>
</project>
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 62c4196be0..a10763668b 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 @@
<artifactId>dubbo-native</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.36</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.33</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<profiles>
@@ -234,12 +203,8 @@
<mainClass>org.apache.dubbo.demo.graalvm.consumer.Application</mainClass>
</configuration>
</plugin>
-
</plugins>
</build>
</profile>
-
</profiles>
-
-
</project>
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 443fef8c29..6383e189a1 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 @@
<artifactId>dubbo-native</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.36</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.33</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
-
<profiles>
<profile>
<id>native</id>
@@ -232,13 +200,8 @@
<mainClass>org.apache.dubbo.demo.graalvm.provider.Application</mainClass>
</configuration>
</plugin>
-
</plugins>
</build>
-
</profile>
-
</profiles>
-
-
</project>
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 f37d467dff..6e414facec 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 @@
<artifactId>dubbo-demo-spring-boot-consumer</artifactId>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
- <spring-boot.version>2.7.16</spring-boot.version>
<skip_maven_deploy>true</skip_maven_deploy>
</properties>
@@ -96,41 +92,6 @@
<version>${spring-boot.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
- <version>${spring-boot.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- <version>${spring-boot.version}</version>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
@@ -142,7 +103,6 @@
<artifactId>dubbo-qos</artifactId>
<version>${project.version}</version>
</dependency>
-
</dependencies>
<build>
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 bf20904968..75571006f0 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 @@
<artifactId>dubbo-demo-spring-boot-interface</artifactId>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<skip_maven_deploy>true</skip_maven_deploy>
</properties>
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 df45b0a1e8..9638f9e42c 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 @@
<artifactId>dubbo-demo-spring-boot-provider</artifactId>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
- <spring-boot.version>2.7.16</spring-boot.version>
<skip_maven_deploy>true</skip_maven_deploy>
</properties>
@@ -84,46 +80,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
- <version>${spring-boot.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- <version>${spring-boot.version}</version>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
<!-- Observability -->
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -137,6 +93,10 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
index d8f6c1a7a0..f6d13b0f25 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
@@ -33,13 +33,13 @@
</modules>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<skip_maven_deploy>true</skip_maven_deploy>
<spring-boot.version>2.7.16</spring-boot.version>
+ <slf4j-log4j12_version>1.7.33</slf4j-log4j12_version>
<spring-boot-maven-plugin.version>2.7.16</spring-boot-maven-plugin.version>
<micrometer-core.version>1.11.5</micrometer-core.version>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -49,14 +49,31 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-log4j12_version}</version>
+ </dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>${micrometer-core.version}</version>
</dependency>
</dependencies>
-
</dependencyManagement>
-
-
</project>
diff --git a/dubbo-demo/dubbo-demo-triple/pom.xml b/dubbo-demo/dubbo-demo-triple/pom.xml
index 8934a4f52f..fb463ea86d 100644
--- a/dubbo-demo/dubbo-demo-triple/pom.xml
+++ b/dubbo-demo/dubbo-demo-triple/pom.xml
@@ -32,9 +32,6 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
- <source.level>1.8</source.level>
- <target.level>1.8</target.level>
- <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
</properties>
<dependencies>
@@ -153,45 +150,17 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${maven_protobuf_plugin_version}</version>
<configuration>
- <protocArtifact>com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>triple-java</pluginId>
- <outputDirectory>build/generated/source/proto/main/java</outputDirectory>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
- <goal>test-compile</goal>
</goals>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
- <configuration>
- <source>${source.level}</source>
- <target>${target.level}</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>build/generated/source/proto/main/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- Override the maven-javadoc-plugin configuration that depends on the pass -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
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 4e76a82790..2f95fa7877 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 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
</properties>
+
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -120,19 +120,6 @@
<artifactId>dubbo-serialization-jdk</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
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 eb0aa9aa8f..154002ef7f 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 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
</properties>
+
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -120,19 +120,6 @@
<artifactId>dubbo-serialization-jdk</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
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 6d9d97a333..91e117e724 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 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
</properties>
+
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -120,19 +120,6 @@
<artifactId>dubbo-serialization-jdk</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
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 60219544e0..6220394435 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 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
</properties>
+
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -120,19 +120,6 @@
<artifactId>dubbo-serialization-jdk</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
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 612da3c0f9..0d1d8a85af 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 @@
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The demo provider module of dubbo project</description>
+
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
</properties>
<dependencies>
@@ -112,19 +112,6 @@
<artifactId>dubbo-serialization-jdk</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-triple</artifactId>
diff --git a/dubbo-demo/dubbo-demo-xml/pom.xml b/dubbo-demo/dubbo-demo-xml/pom.xml
index 02b0ec085e..2afa356e33 100644
--- a/dubbo-demo/dubbo-demo-xml/pom.xml
+++ b/dubbo-demo/dubbo-demo-xml/pom.xml
@@ -44,7 +44,6 @@
<module>dubbo-demo-spring-mvc-rest-provider</module>
</modules>
-
<build>
<plugins>
<plugin>
diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml
index a5d6123dba..59ada40918 100644
--- a/dubbo-demo/pom.xml
+++ b/dubbo-demo/pom.xml
@@ -26,6 +26,7 @@
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>The demo module of dubbo project</description>
+
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
</properties>
@@ -41,4 +42,10 @@
<module>dubbo-demo-spring-boot</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 07fca6d4d3..4a0c769f52 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -158,12 +158,15 @@
<mustache_version>0.9.10</mustache_version>
<!-- Log libs -->
<slf4j_version>1.7.36</slf4j_version>
+ <!-- Do not upgrade the log4j12 version, or else reload4j and log4j will coexist -->
+ <slf4j-log4j12_version>1.7.33</slf4j-log4j12_version>
<jcl_version>1.2</jcl_version>
<log4j_version>1.2.17</log4j_version>
<logback_version>1.2.11</logback_version>
<!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
<log4j2_version>2.20.0</log4j2_version>
<commons_io_version>2.11.0</commons_io_version>
+ <commons-codec_version>1.16.0</commons-codec_version>
<embedded_redis_version>0.13.0</embedded_redis_version>
@@ -176,6 +179,13 @@
<!-- Alibaba -->
<alibaba_spring_context_support_version>1.0.11</alibaba_spring_context_support_version>
+ <!-- Test libs -->
+ <junit_jupiter_version>5.9.3</junit_jupiter_version>
+ <awaitility_version>4.2.0</awaitility_version>
+ <hamcrest_version>2.2</hamcrest_version>
+ <cglib_version>2.2.2</cglib_version>
+ <mockito_version>4.11.0</mockito_version>
+
<jaxb_version>2.2.7</jaxb_version>
<activation_version>1.2.0</activation_version>
<test_container_version>1.19.1</test_container_version>
@@ -305,8 +315,28 @@
<version>${zookeeper_version}</version>
<exclusions>
<exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logback-core</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>audience-annotations</artifactId>
+ <groupId>org.apache.yetus</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>*</artifactId>
<groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -615,6 +645,11 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j_version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-log4j12_version}</version>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -625,6 +660,11 @@
<artifactId>commons-io</artifactId>
<version>${commons_io_version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec_version}</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -751,7 +791,61 @@
<scope>test</scope>
</dependency>
- <!-- Test lib -->
+ <!-- Test libs -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit_jupiter_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit_jupiter_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junit_jupiter_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit_jupiter_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${awaitility_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <version>${mockito_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>${cglib_version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.github.codemonstur</groupId>
<artifactId>embedded-redis</artifactId>
@@ -764,6 +858,7 @@
<version>${spring_version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
@@ -967,6 +1062,12 @@
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>bom</flattenMode>
+ <pomElements>
+ <dependencyManagement>expand</dependencyManagement>
+ <properties>remove</properties>
+ <repositories>remove</repositories>
+ <profiles>remove</profiles>
+ </pomElements>
</configuration>
<executions>
<execution>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index 41913dc5fd..07f39b2da2 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -34,6 +34,7 @@
<properties>
<revision>3.3.0-beta.1-SNAPSHOT</revision>
<maven_flatten_version>1.5.0</maven_flatten_version>
+ <slf4j_version>1.7.36</slf4j_version>
<curator5_version>5.1.0</curator5_version>
<zookeeper_version>3.8.1</zookeeper_version>
</properties>
@@ -55,6 +56,20 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
<version>${curator5_version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>zookeeper</artifactId>
+ <groupId>org.apache.zookeeper</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>listenablefuture</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -62,55 +77,35 @@
<version>${zookeeper_version}</version>
<exclusions>
<exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logback-core</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>audience-annotations</artifactId>
+ <groupId>org.apache.yetus</groupId>
</exclusion>
<exclusion>
+ <artifactId>*</artifactId>
<groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-io</artifactId>
+ <groupId>commons-io</groupId>
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
-
<dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j_version}</version>
</dependency>
</dependencies>
@@ -122,7 +117,7 @@
<version>${maven_flatten_version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
- <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ <flattenMode>oss</flattenMode>
</configuration>
<executions>
<execution>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 678de29e88..cb9cd5a2a0 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -34,6 +34,7 @@
<properties>
<revision>3.3.0-beta.1-SNAPSHOT</revision>
<maven_flatten_version>1.5.0</maven_flatten_version>
+ <slf4j_version>1.7.36</slf4j_version>
<curator_version>4.3.0</curator_version>
<zookeeper_version>3.4.14</zookeeper_version>
</properties>
@@ -43,11 +44,60 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
<version>${curator_version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>zookeeper</artifactId>
+ <groupId>org.apache.zookeeper</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>listenablefuture</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper_version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spotbugs-annotations</artifactId>
+ <groupId>com.github.spotbugs</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>audience-annotations</artifactId>
+ <groupId>org.apache.yetus</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jline</artifactId>
+ <groupId>jline</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>io.netty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j_version}</version>
</dependency>
</dependencies>
@@ -59,7 +109,7 @@
<version>${maven_flatten_version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
- <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ <flattenMode>oss</flattenMode>
</configuration>
<executions>
<execution>
diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml
index fab691bf7d..2f966a58cb 100644
--- a/dubbo-distribution/dubbo-all-shaded/pom.xml
+++ b/dubbo-distribution/dubbo-all-shaded/pom.xml
@@ -469,28 +469,6 @@
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
-
- <!-- Temporarily add this part to exclude transitive dependency -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit_jupiter_version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>${junit_jupiter_version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>${cglib_version}</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
-
</dependencies>
<build>
<plugins>
diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml
index c2e4b05633..cb507d5eab 100644
--- a/dubbo-distribution/dubbo-all/pom.xml
+++ b/dubbo-distribution/dubbo-all/pom.xml
@@ -638,28 +638,6 @@
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
-
- <!-- Temporarily add this part to exclude transitive dependency -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit_jupiter_version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>${junit_jupiter_version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>${cglib_version}</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
-
</dependencies>
<build>
<plugins>
diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml
index bf3b0d3110..6e6449b420 100644
--- a/dubbo-distribution/dubbo-bom/pom.xml
+++ b/dubbo-distribution/dubbo-bom/pom.xml
@@ -66,6 +66,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-config</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -89,6 +90,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -116,6 +118,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-container</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -138,11 +141,13 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<!-- dependencies-bom -->
@@ -157,6 +162,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-distribution</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -179,6 +185,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-filter</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -203,6 +210,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -245,6 +253,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metrics</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -299,6 +308,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-monitor</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -457,12 +467,12 @@
<version>${project.version}</version>
</dependency>
-
<!-- registry -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -495,6 +505,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -537,6 +548,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -570,6 +582,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -597,6 +610,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -612,6 +626,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-compatible</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -633,21 +648,17 @@
<artifactId>dubbo-spring-boot-interceptor</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-zookeeper</artifactId>
- <type>pom</type>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starters</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-observability-spring-boot-starters</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -705,6 +716,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -751,7 +763,6 @@
</dependencies>
</dependencyManagement>
-
<build>
<plugins>
<plugin>
@@ -761,6 +772,12 @@
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>bom</flattenMode>
+ <pomElements>
+ <dependencyManagement>expand</dependencyManagement>
+ <properties>remove</properties>
+ <repositories>remove</repositories>
+ <profiles>remove</profiles>
+ </pomElements>
</configuration>
<executions>
<execution>
diff --git a/dubbo-kubernetes/pom.xml b/dubbo-kubernetes/pom.xml
index 968aa22031..7b35219234 100644
--- a/dubbo-kubernetes/pom.xml
+++ b/dubbo-kubernetes/pom.xml
@@ -77,5 +77,4 @@
</dependency>
</dependencies>
-
</project>
diff --git a/dubbo-maven-plugin/pom.xml b/dubbo-maven-plugin/pom.xml
index bff3ce7aa6..6be4d359ad 100644
--- a/dubbo-maven-plugin/pom.xml
+++ b/dubbo-maven-plugin/pom.xml
@@ -24,9 +24,6 @@
</parent>
<artifactId>dubbo-maven-plugin</artifactId>
-
- <properties>
- </properties>
<description>Dubbo Maven Plugin</description>
<packaging>maven-plugin</packaging>
@@ -44,7 +41,6 @@
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
@@ -64,7 +60,6 @@
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -106,16 +101,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>8</source>
- <target>8</target>
- </configuration>
- </plugin>
</plugins>
-
</build>
-
</project>
diff --git a/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml b/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml
index eb248b434c..44a969de0c 100644
--- a/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml
+++ b/dubbo-metadata/dubbo-metadata-definition-protobuf/pom.xml
@@ -24,7 +24,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-metadata-definition-protobuf</artifactId>
-
<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
diff --git a/dubbo-metadata/dubbo-metadata-processor/pom.xml b/dubbo-metadata/dubbo-metadata-processor/pom.xml
index 0945a6d434..9a5aeab0dd 100644
--- a/dubbo-metadata/dubbo-metadata-processor/pom.xml
+++ b/dubbo-metadata/dubbo-metadata-processor/pom.xml
@@ -54,59 +54,18 @@
<version>${project.parent.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
+ <artifactId>commons-io</artifactId>
+ <groupId>commons-io</groupId>
</exclusion>
<exclusion>
- <groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
+ <groupId>org.javassist</groupId>
</exclusion>
<exclusion>
- <groupId>com.alibaba</groupId>
- <artifactId>hessian-lite</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.esotericsoftware</groupId>
- <artifactId>kryo</artifactId>
- </exclusion>
- <exclusion>
- <groupId>de.javakaffee</groupId>
- <artifactId>kryo-serializers</artifactId>
- </exclusion>
- <exclusion>
- <groupId>de.ruedigermoeller</groupId>
- <artifactId>fst</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
+ <groupId>javax.annotation</groupId>
</exclusion>
</exclusions>
-
</dependency>
<!-- Test -->
@@ -168,7 +127,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <fork>true</fork>
<proc>none</proc>
</configuration>
</plugin>
diff --git a/dubbo-metrics/dubbo-tracing/pom.xml b/dubbo-metrics/dubbo-tracing/pom.xml
index f6e26215d9..760e3e7bfd 100644
--- a/dubbo-metrics/dubbo-tracing/pom.xml
+++ b/dubbo-metrics/dubbo-tracing/pom.xml
@@ -31,9 +31,6 @@
<description>The tracing module of dubbo project</description>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skip_maven_deploy>false</skip_maven_deploy>
</properties>
@@ -115,4 +112,4 @@
<optional>true</optional>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/dubbo-monitor/dubbo-monitor-default/pom.xml b/dubbo-monitor/dubbo-monitor-default/pom.xml
index 9ad35b2e1d..3d001020e5 100644
--- a/dubbo-monitor/dubbo-monitor-default/pom.xml
+++ b/dubbo-monitor/dubbo-monitor-default/pom.xml
@@ -77,5 +77,10 @@
<artifactId>gson</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-plugin/dubbo-auth/pom.xml b/dubbo-plugin/dubbo-auth/pom.xml
index 5ae1d98ac0..6fcc9a6ac1 100644
--- a/dubbo-plugin/dubbo-auth/pom.xml
+++ b/dubbo-plugin/dubbo-auth/pom.xml
@@ -27,7 +27,6 @@
<packaging>jar</packaging>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skip_maven_deploy>false</skip_maven_deploy>
</properties>
@@ -43,4 +42,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/dubbo-plugin/dubbo-compiler/pom.xml b/dubbo-plugin/dubbo-compiler/pom.xml
index 4fa6f61be8..0fcb560f13 100644
--- a/dubbo-plugin/dubbo-compiler/pom.xml
+++ b/dubbo-plugin/dubbo-compiler/pom.xml
@@ -69,10 +69,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgument>-proc:none</compilerArgument>
- <fork>true</fork>
- <source>${java_source_version}</source>
- <target>${java_target_version}</target>
- <encoding>${file_encoding}</encoding>
</configuration>
</plugin>
diff --git a/dubbo-plugin/dubbo-filter-cache/pom.xml b/dubbo-plugin/dubbo-filter-cache/pom.xml
index a00c2e9041..8e132e04a0 100644
--- a/dubbo-plugin/dubbo-filter-cache/pom.xml
+++ b/dubbo-plugin/dubbo-filter-cache/pom.xml
@@ -27,6 +27,7 @@
<description>The cache module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
+ <hazelcast_version>3.12.13</hazelcast_version>
</properties>
<dependencies>
<dependency>
diff --git a/dubbo-plugin/dubbo-filter-validation/pom.xml b/dubbo-plugin/dubbo-filter-validation/pom.xml
index 48ff349ad9..a07374e399 100644
--- a/dubbo-plugin/dubbo-filter-validation/pom.xml
+++ b/dubbo-plugin/dubbo-filter-validation/pom.xml
@@ -27,6 +27,9 @@
<description>The validation module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
+ <hibernate_validator_version>5.2.4.Final</hibernate_validator_version>
+ <el_api_version>2.2.5</el_api_version>
+ <jaxb_api_version>2.2.7</jaxb_api_version>
</properties>
<dependencies>
<dependency>
@@ -45,8 +48,8 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <scope>test</scope>
<version>${hibernate_validator_version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
diff --git a/dubbo-plugin/dubbo-native/pom.xml b/dubbo-plugin/dubbo-native/pom.xml
index 22baa2d4e6..e8b74f45ca 100644
--- a/dubbo-plugin/dubbo-native/pom.xml
+++ b/dubbo-plugin/dubbo-native/pom.xml
@@ -28,7 +28,6 @@
<artifactId>dubbo-native</artifactId>
<packaging>jar</packaging>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-access-log/pom.xml b/dubbo-plugin/dubbo-plugin-access-log/pom.xml
index deee17fef0..4ddf4c5cfb 100644
--- a/dubbo-plugin/dubbo-plugin-access-log/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-access-log/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-access-log</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-classloader-filter/pom.xml b/dubbo-plugin/dubbo-plugin-classloader-filter/pom.xml
index 6dd833cd63..9423bb7945 100644
--- a/dubbo-plugin/dubbo-plugin-classloader-filter/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-classloader-filter/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-classloader-filter</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-cluster-mergeable/pom.xml b/dubbo-plugin/dubbo-plugin-cluster-mergeable/pom.xml
index 5c21392607..35e33c0c25 100644
--- a/dubbo-plugin/dubbo-plugin-cluster-mergeable/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-cluster-mergeable/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-cluster-mergeable</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-context/pom.xml b/dubbo-plugin/dubbo-plugin-context/pom.xml
index ed21c7aa9e..aeb355c5a8 100644
--- a/dubbo-plugin/dubbo-plugin-context/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-context/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-context</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml b/dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml
index e7689611df..05e37ea69c 100644
--- a/dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-generic-invoke/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-generic-invoke</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-loadbalance-adaptive/pom.xml b/dubbo-plugin/dubbo-plugin-loadbalance-adaptive/pom.xml
index 9d1f889086..26fa460315 100644
--- a/dubbo-plugin/dubbo-plugin-loadbalance-adaptive/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-loadbalance-adaptive/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-loadbalance-adaptive</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-loom/pom.xml b/dubbo-plugin/dubbo-plugin-loom/pom.xml
index 1d78e65220..8a6cfc2444 100644
--- a/dubbo-plugin/dubbo-plugin-loom/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-loom/pom.xml
@@ -29,8 +29,6 @@
<artifactId>dubbo-plugin-loom</artifactId>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skip_maven_deploy>false</skip_maven_deploy>
</properties>
diff --git a/dubbo-plugin/dubbo-plugin-mock/pom.xml b/dubbo-plugin/dubbo-plugin-mock/pom.xml
index 8268ef4586..5da1b2f37d 100644
--- a/dubbo-plugin/dubbo-plugin-mock/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-mock/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-mock</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml b/dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml
index 50bdecc5ce..37e9f143f3 100644
--- a/dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-proxy-bytebuddy/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-proxy-bytebuddy</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-qos-trace/pom.xml b/dubbo-plugin/dubbo-plugin-qos-trace/pom.xml
index a9d28fa472..85b41090e5 100644
--- a/dubbo-plugin/dubbo-plugin-qos-trace/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-qos-trace/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-qos-trace</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-router-condition/pom.xml b/dubbo-plugin/dubbo-plugin-router-condition/pom.xml
index f34a1baa2c..4a865c2772 100644
--- a/dubbo-plugin/dubbo-plugin-router-condition/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-router-condition/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-router-condition</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-router-mesh/pom.xml b/dubbo-plugin/dubbo-plugin-router-mesh/pom.xml
index c1055dff90..5de51faabe 100644
--- a/dubbo-plugin/dubbo-plugin-router-mesh/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-router-mesh/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-router-mesh</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-router-script/pom.xml b/dubbo-plugin/dubbo-plugin-router-script/pom.xml
index ac3a30dfbe..ac9888a5f0 100644
--- a/dubbo-plugin/dubbo-plugin-router-script/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-router-script/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-router-script</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-router-tag/pom.xml b/dubbo-plugin/dubbo-plugin-router-tag/pom.xml
index 8bdc94bacb..a1fcf282ab 100644
--- a/dubbo-plugin/dubbo-plugin-router-tag/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-router-tag/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-router-tag</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-token/pom.xml b/dubbo-plugin/dubbo-plugin-token/pom.xml
index 0d66e62049..378c26a2c8 100644
--- a/dubbo-plugin/dubbo-plugin-token/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-token/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-token</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-plugin-tps/pom.xml b/dubbo-plugin/dubbo-plugin-tps/pom.xml
index 7517b190a2..cd8649c22b 100644
--- a/dubbo-plugin/dubbo-plugin-tps/pom.xml
+++ b/dubbo-plugin/dubbo-plugin-tps/pom.xml
@@ -27,10 +27,6 @@
<artifactId>dubbo-plugin-tps</artifactId>
<packaging>jar</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-plugin/dubbo-security/pom.xml b/dubbo-plugin/dubbo-security/pom.xml
index 583792d448..783ee16ddc 100644
--- a/dubbo-plugin/dubbo-security/pom.xml
+++ b/dubbo-plugin/dubbo-security/pom.xml
@@ -26,8 +26,6 @@
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
- <protobuf-java.version>3.22.2</protobuf-java.version>
- <grpc.version>1.55.1</grpc.version>
</properties>
<artifactId>dubbo-security</artifactId>
@@ -53,7 +51,6 @@
</dependency>
<!-- dubbo -->
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
@@ -110,11 +107,11 @@
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
- <version>0.6.1</version>
+ <version>${maven_protobuf_plugin_version}</version>
<configuration>
- <protocArtifact>com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
- <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc_version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
diff --git a/dubbo-plugin/pom.xml b/dubbo-plugin/pom.xml
index bacce976c0..c72f37aaa7 100644
--- a/dubbo-plugin/pom.xml
+++ b/dubbo-plugin/pom.xml
@@ -66,6 +66,11 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml
index eb17182ab8..dd5a180f01 100644
--- a/dubbo-registry/dubbo-registry-api/pom.xml
+++ b/dubbo-registry/dubbo-registry-api/pom.xml
@@ -118,5 +118,11 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml
index a9eace27b8..2c96dfddc1 100644
--- a/dubbo-remoting/dubbo-remoting-api/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-api/pom.xml
@@ -52,5 +52,10 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-remoting/dubbo-remoting-http/pom.xml b/dubbo-remoting/dubbo-remoting-http/pom.xml
index e184f53eed..5875b1b0d7 100644
--- a/dubbo-remoting/dubbo-remoting-http/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-http/pom.xml
@@ -59,6 +59,11 @@
<version>4.5.14</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml b/dubbo-remoting/dubbo-remoting-netty/pom.xml
index 5d7cefac95..4c65fd2dd2 100644
--- a/dubbo-remoting/dubbo-remoting-netty/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-netty/pom.xml
@@ -39,6 +39,11 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-hessian2</artifactId>
diff --git a/dubbo-remoting/dubbo-remoting-netty4/pom.xml b/dubbo-remoting/dubbo-remoting-netty4/pom.xml
index f94dce6bf3..3fbc0698c8 100644
--- a/dubbo-remoting/dubbo-remoting-netty4/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-netty4/pom.xml
@@ -67,6 +67,11 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-epoll</artifactId>
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
index a9dc670b1f..e5e0b7d785 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
@@ -68,12 +68,6 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper_version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml
index e92329b7ed..a408832bcd 100644
--- a/dubbo-rpc/dubbo-rpc-api/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-api/pom.xml
@@ -50,6 +50,10 @@
<artifactId>hessian-lite</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml
index 0570e6209c..5e8338eed6 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml
@@ -90,6 +90,11 @@
<artifactId>javax.el</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/dubbo-rpc/dubbo-rpc-rest/pom.xml b/dubbo-rpc/dubbo-rpc-rest/pom.xml
index b460c4aec3..f583a5ed8f 100644
--- a/dubbo-rpc/dubbo-rpc-rest/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-rest/pom.xml
@@ -123,7 +123,6 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-rest</artifactId>
diff --git a/dubbo-rpc/dubbo-rpc-triple/pom.xml b/dubbo-rpc/dubbo-rpc-triple/pom.xml
index da116e1449..c13ec7b15c 100644
--- a/dubbo-rpc/dubbo-rpc-triple/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-triple/pom.xml
@@ -68,6 +68,11 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
@@ -96,7 +101,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-compiler</artifactId>
<version>${project.parent.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
@@ -120,7 +125,7 @@
<version>${maven_protobuf_plugin_version}</version>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier}
</protocArtifact>
<protocPlugins>
<protocPlugin>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml
index 88c25d4e3b..c9ce0c7c71 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 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<optional>true</optional>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2_version}</version>
- <optional>true</optional>
</dependency>
<dependency>
@@ -131,13 +118,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml
index 392ecb89e4..741a05be1d 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 @@
<packaging>jar</packaging>
<description>Apache Dubbo Spring Boot Auto-Configure</description>
-
<dependencies>
<!-- Spring Boot Auto-Configuration -->
@@ -51,13 +50,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
<optional>true</optional>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Dubbo -->
@@ -86,13 +78,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
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 66f157f0b5..31748f6283 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 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
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 da3174cc7d..685b2516e9 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 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
<optional>true</optional>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
@@ -89,13 +82,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-compatible/pom.xml
index baeaaa40fe..1526635a7f 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 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
- <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
<argLine>${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 e097175e7e..f173ad97be 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 @@
</dependency>
</dependencies>
-
</project>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml
index b510c64bc6..64b5b20766 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 @@
<packaging>jar</packaging>
<description>Apache Dubbo Spring Boot Starter</description>
-
<dependencies>
<!-- Spring Boot dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<optional>true</optional>
- <exclusions>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2_version}</version>
- <optional>true</optional>
</dependency>
<dependency>
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 e6e6c6ab91..3c933c8a81 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 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper_version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
</dependency>
</dependencies>
-
-</project>
\ No newline at end of file
+</project>
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 189443c440..31cf4d47e0 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 @@
<description>Apache Dubbo Zookeeper Spring Boot Starter</description>
<properties>
+ <zookeeper_version>3.8.3</zookeeper_version>
</properties>
<dependencies>
@@ -42,7 +43,8 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <version>${zookeeper_version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml
index f9d251e202..5f8f83c774 100644
--- a/dubbo-spring-boot/pom.xml
+++ b/dubbo-spring-boot/pom.xml
@@ -42,11 +42,10 @@
<properties>
<spring-boot.version>2.7.16</spring-boot.version>
- <dubbo.version>${revision}</dubbo.version>
- <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <log4j2_version>2.20.0</log4j2_version>
<!-- Spring boot buddy is lower than the delivery dependency package version and can only show the defined dependency version -->
<byte-buddy.version>1.14.9</byte-buddy.version>
+ <slf4j-log4j12_version>1.7.33</slf4j-log4j12_version>
+ <mockito_version>4.11.0</mockito_version>
</properties>
<dependencyManagement>
@@ -59,28 +58,50 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-log4j12_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <version>${mockito_version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
- <!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit_jupiter_version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>${junit_jupiter_version}</version>
- <scope>test</scope>
- </dependency>
<!--JUnit Jupiter Engine to depend on the JUnit4 engine and JUnit 4 API -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>${junit_jupiter_version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -101,6 +122,12 @@
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-log4j12_version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -166,21 +193,6 @@
</archive>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven_compiler_version}</version>
- <configuration>
- <compilerArgs>
- <compilerArg>-parameters</compilerArg>
- </compilerArgs>
- <fork>true</fork>
- <source>${java_source_version}</source>
- <target>${java_target_version}</target>
- <encoding>${file_encoding}</encoding>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml
index 6afbac88e0..2850fef28d 100644
--- a/dubbo-test/dubbo-dependencies-all/pom.xml
+++ b/dubbo-test/dubbo-dependencies-all/pom.xml
@@ -377,7 +377,6 @@
<version>${project.version}</version>
</dependency>
-
<!-- registry -->
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-test/dubbo-test-check/pom.xml b/dubbo-test/dubbo-test-check/pom.xml
index 23a0d19685..7b6a8b037f 100644
--- a/dubbo-test/dubbo-test-check/pom.xml
+++ b/dubbo-test/dubbo-test-check/pom.xml
@@ -29,8 +29,6 @@
<artifactId>dubbo-test-check</artifactId>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<skip_maven_deploy>true</skip_maven_deploy>
<curator.test.version>4.2.0</curator.test.version>
<zookeeper.version>3.7.2</zookeeper.version>
diff --git a/dubbo-test/dubbo-test-common/pom.xml b/dubbo-test/dubbo-test-common/pom.xml
index 4a8cb97d44..be6a987ad8 100644
--- a/dubbo-test/dubbo-test-common/pom.xml
+++ b/dubbo-test/dubbo-test-common/pom.xml
@@ -28,8 +28,6 @@
<artifactId>dubbo-test-common</artifactId>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<skip_maven_deploy>true</skip_maven_deploy>
</properties>
@@ -37,12 +35,6 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/dubbo-test/dubbo-test-spring/pom.xml b/dubbo-test/dubbo-test-spring/pom.xml
index 9ac34620d5..834bb2c476 100644
--- a/dubbo-test/dubbo-test-spring/pom.xml
+++ b/dubbo-test/dubbo-test-spring/pom.xml
@@ -29,7 +29,6 @@
<properties>
<skip_maven_deploy>true</skip_maven_deploy>
- <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
<spring_version>3.2.18.RELEASE</spring_version>
<!--<spring_version>4.0.9.RELEASE</spring_version>-->
<!--<spring_version>4.1.9.RELEASE</spring_version>-->
@@ -131,79 +130,57 @@
<artifactId>dubbo-serialization-jdk</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
</dependency>
-
<!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>${junit_jupiter_version}</version>
- <!--<scope>test</scope>-->
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
- <version>${junit_jupiter_version}</version>
- <!--<scope>test</scope>-->
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
- <version>${hamcrest_version}</version>
- <!--<scope>test</scope>-->
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>${junit_jupiter_version}</version>
-<!-- <scope>test</scope>-->
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito_version}</version>
- <!--<scope>test</scope>-->
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
- <version>${mockito_version}</version>
- <!--<scope>test</scope>-->
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>${cglib_version}</version>
- <!--<scope>test</scope>-->
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
-<!-- <scope>test</scope>-->
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
-<!-- <scope>test</scope>-->
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
-<!-- <scope>test</scope>-->
+ <scope>compile</scope>
</dependency>
</dependencies>
diff --git a/dubbo-test/dubbo-test-spring3.2/pom.xml b/dubbo-test/dubbo-test-spring3.2/pom.xml
index 0156c22e75..78f8c9d2ff 100644
--- a/dubbo-test/dubbo-test-spring3.2/pom.xml
+++ b/dubbo-test/dubbo-test-spring3.2/pom.xml
@@ -97,7 +97,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
- <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
<argLine>${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 bf3a219186..64c9b36511 100644
--- a/dubbo-test/dubbo-test-spring4.1/pom.xml
+++ b/dubbo-test/dubbo-test-spring4.1/pom.xml
@@ -51,11 +51,12 @@
<artifactId>dubbo-test-spring</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- </dependency> <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <!-- <scope>test</scope>-->
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <!-- <scope>test</scope>-->
+ </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
@@ -96,7 +97,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
- <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
<argLine>${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 cc90e8aef9..d4c0ac2555 100644
--- a/dubbo-test/dubbo-test-spring4.2/pom.xml
+++ b/dubbo-test/dubbo-test-spring4.2/pom.xml
@@ -51,11 +51,12 @@
<artifactId>dubbo-test-spring</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- </dependency> <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <!-- <scope>test</scope>-->
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <!-- <scope>test</scope>-->
+ </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
@@ -96,7 +97,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
- <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
<argLine>${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 d4c487812b..180d478462 100644
--- a/dubbo-test/pom.xml
+++ b/dubbo-test/pom.xml
@@ -39,8 +39,6 @@
</modules>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
<skip_maven_deploy>true</skip_maven_deploy>
</properties>
diff --git a/dubbo-xds/pom.xml b/dubbo-xds/pom.xml
index 88d128e7ae..21b287adef 100644
--- a/dubbo-xds/pom.xml
+++ b/dubbo-xds/pom.xml
@@ -106,7 +106,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${maven_protobuf_plugin_version}</version>
<configuration>
- <protocArtifact>com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf-protoc_version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc_version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
diff --git a/pom.xml b/pom.xml
index 56bf7e3271..e406541a66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,30 +87,25 @@
</issueManagement>
<properties>
- <!-- Test libs -->
- <junit_jupiter_version>5.9.3</junit_jupiter_version>
- <awaitility_version>4.2.0</awaitility_version>
- <hazelcast_version>3.12.13</hazelcast_version>
- <hamcrest_version>2.2</hamcrest_version>
- <hibernate_validator_version>5.2.4.Final</hibernate_validator_version>
- <el_api_version>2.2.5</el_api_version>
- <jaxb_api_version>2.2.7</jaxb_api_version>
- <cglib_version>2.2.2</cglib_version>
- <mockito_version>4.11.0</mockito_version>
<!-- Build args -->
- <argline>-server -Xms256m -Xmx512m -Dfile.encoding=UTF-8
- -Djava.net.preferIPv4Stack=true -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.outputTimestamp>2020-04-01T08:04:00Z</project.build.outputTimestamp>
+ <argline>-server -Xms256m -Xmx512m -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Dfile.encoding=UTF-8
+ -Djava.net.preferIPv4Stack=true
</argline>
- <skip_maven_deploy>false</skip_maven_deploy>
+ <arguments />
+ <jacocoArgLine />
+ <profile.name>oss</profile.name>
<updateReleaseInfo>true</updateReleaseInfo>
- <project.build.sourceEncoding>${file_encoding}</project.build.sourceEncoding>
- <project.build.outputTimestamp>2020-04-01T08:04:00Z</project.build.outputTimestamp>
+ <skip_maven_deploy>false</skip_maven_deploy>
+ <checkstyle.skip>true</checkstyle.skip>
+ <checkstyle_unix.skip>true</checkstyle_unix.skip>
+ <rat.skip>true</rat.skip>
+ <jacoco.skip>true</jacoco.skip>
- <profile.name>oss</profile.name>
- <!-- for maven compiler plugin -->
- <java_source_version>1.8</java_source_version>
- <java_target_version>1.8</java_target_version>
- <file_encoding>UTF-8</file_encoding>
<!-- Maven plugins -->
<maven_jar_version>3.3.0</maven_jar_version>
<maven_surefire_version>3.0.0</maven_surefire_version>
@@ -128,15 +123,10 @@
<dubbo_annotation_processor_version>1.0.0</dubbo_annotation_processor_version>
<maven_os_plugin_version>1.7.1</maven_os_plugin_version>
<maven_protobuf_plugin_version>0.6.1</maven_protobuf_plugin_version>
- <arguments />
- <checkstyle.skip>true</checkstyle.skip>
- <checkstyle_unix.skip>true</checkstyle_unix.skip>
- <rat.skip>true</rat.skip>
- <jacoco.skip>true</jacoco.skip>
- <jprotoc_version>1.2.2</jprotoc_version>
- <protobuf-java_version>3.22.3</protobuf-java_version>
+ <protobuf-protoc_version>3.22.3</protobuf-protoc_version>
<grpc_version>1.54.0</grpc_version>
+
<revision>3.3.0-beta.1-SNAPSHOT</revision>
</properties>
@@ -180,7 +170,6 @@
</dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-annotation-processor</artifactId>
@@ -192,49 +181,31 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>${junit_jupiter_version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit_jupiter_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
- <version>${junit_jupiter_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>${awaitility_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
- <version>${hamcrest_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
- <version>${mockito_version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>${cglib_version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -324,7 +295,6 @@
<configuration>
<configLocation>codestyle/checkstyle.xml</configLocation>
<suppressionsLocation>codestyle/checkstyle-suppressions.xml</suppressionsLocation>
- <encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<skip>${checkstyle.skip}</skip>
@@ -387,7 +357,6 @@
<phase>validate</phase>
<configuration>
<configLocation>codestyle/checkstyle_unix.xml</configLocation>
- <encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<skip>${checkstyle_unix.skip}</skip>
@@ -483,7 +452,7 @@
<docencoding>UTF-8</docencoding>
<source>${maven_source_version}</source>
<links>
- <link>http://docs.oracle.com/javase/8/docs/api</link>
+ <link>https://docs.oracle.com/javase/8/docs/api</link>
</links>
<doclint>none</doclint>
<excludePackageNames>
@@ -559,7 +528,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
- <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
<argLine>${argline} ${jacocoArgLine}
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.math=ALL-UNNAMED
@@ -584,7 +554,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
- <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
<argLine>${argline} ${jacocoArgLine}
</argLine>
<systemProperties>
@@ -703,7 +674,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
- <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
<argLine>${argline} ${jacocoArgLine}</argLine>
<systemProperties>
<!-- common shared -->
@@ -727,9 +699,6 @@
<compilerArg>-parameters</compilerArg>
</compilerArgs>
<fork>true</fork>
- <source>${java_source_version}</source>
- <target>${java_target_version}</target>
- <encoding>${file_encoding}</encoding>
</configuration>
</plugin>
<plugin>