You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/12/23 12:17:56 UTC
[shardingsphere] branch master updated: Reduce agent dependencies (#23069)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 421b0dafbd2 Reduce agent dependencies (#23069)
421b0dafbd2 is described below
commit 421b0dafbd2266bdc9efa70dab643e34b4314e9c
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 23 20:17:44 2022 +0800
Reduce agent dependencies (#23069)
---
agent/core/pom.xml | 6 ------
agent/plugins/logging/base/pom.xml | 9 ---------
agent/plugins/metrics/core/pom.xml | 4 ++--
agent/plugins/tracing/type/jaeger/pom.xml | 13 -------------
agent/plugins/tracing/type/opentelemetry/pom.xml | 13 -------------
agent/plugins/tracing/type/opentracing/pom.xml | 7 -------
agent/plugins/tracing/type/pom.xml | 15 +++++++++++++++
agent/plugins/tracing/type/zipkin/pom.xml | 13 -------------
8 files changed, 17 insertions(+), 63 deletions(-)
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
index 2ce97a49cef..c30a5a3939e 100644
--- a/agent/core/pom.xml
+++ b/agent/core/pom.xml
@@ -33,12 +33,6 @@
<artifactId>shardingsphere-agent-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-util</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.yaml</groupId>
diff --git a/agent/plugins/logging/base/pom.xml b/agent/plugins/logging/base/pom.xml
index 09fb5ae942d..cfbad00fd4c 100644
--- a/agent/plugins/logging/base/pom.xml
+++ b/agent/plugins/logging/base/pom.xml
@@ -26,13 +26,4 @@
</parent>
<artifactId>shardingsphere-agent-logging-base</artifactId>
<name>${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-common</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
</project>
diff --git a/agent/plugins/metrics/core/pom.xml b/agent/plugins/metrics/core/pom.xml
index a8dbd1eaa41..b85e90379a3 100644
--- a/agent/plugins/metrics/core/pom.xml
+++ b/agent/plugins/metrics/core/pom.xml
@@ -36,9 +36,9 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-sharding-distsql-statement</artifactId>
+ <artifactId>shardingsphere-distsql-statement</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/agent/plugins/tracing/type/jaeger/pom.xml b/agent/plugins/tracing/type/jaeger/pom.xml
index 6de09e58519..45cbef7639b 100644
--- a/agent/plugins/tracing/type/jaeger/pom.xml
+++ b/agent/plugins/tracing/type/jaeger/pom.xml
@@ -32,19 +32,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-proxy-frontend-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-tracing-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml b/agent/plugins/tracing/type/opentelemetry/pom.xml
index 039a0fa30f7..05e2b4dbf90 100644
--- a/agent/plugins/tracing/type/opentelemetry/pom.xml
+++ b/agent/plugins/tracing/type/opentelemetry/pom.xml
@@ -33,19 +33,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-proxy-frontend-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-tracing-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
diff --git a/agent/plugins/tracing/type/opentracing/pom.xml b/agent/plugins/tracing/type/opentracing/pom.xml
index 29c60e02750..4d40248d301 100644
--- a/agent/plugins/tracing/type/opentracing/pom.xml
+++ b/agent/plugins/tracing/type/opentracing/pom.xml
@@ -28,13 +28,6 @@
<name>${project.artifactId}</name>
<dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-proxy-frontend-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
diff --git a/agent/plugins/tracing/type/pom.xml b/agent/plugins/tracing/type/pom.xml
index 844f26e9a6e..8d0130d5510 100644
--- a/agent/plugins/tracing/type/pom.xml
+++ b/agent/plugins/tracing/type/pom.xml
@@ -39,6 +39,21 @@
<target.directory>${project.basedir}/../../target/plugins</target.directory>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-proxy-frontend-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-agent-tracing-test</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/agent/plugins/tracing/type/zipkin/pom.xml b/agent/plugins/tracing/type/zipkin/pom.xml
index 9030b7947b6..710cedf5fe5 100644
--- a/agent/plugins/tracing/type/zipkin/pom.xml
+++ b/agent/plugins/tracing/type/zipkin/pom.xml
@@ -33,19 +33,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-proxy-frontend-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-tracing-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave</artifactId>