You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/10 14:50:09 UTC
[shardingsphere] branch master updated: Refactor pom of agent module (#22791)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 178f8105423 Refactor pom of agent module (#22791)
178f8105423 is described below
commit 178f8105423898f74b8b60692eefa951a394d6df
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Dec 10 22:50:02 2022 +0800
Refactor pom of agent module (#22791)
* Import agent-core module in all agent impl modules
* Import agent-core module in all agent impl modules
* Import agent-core module in all agent impl modules
---
agent/bootstrap/pom.xml | 5 -----
agent/core/pom.xml | 11 +++++------
agent/plugins/logging/pom.xml | 7 -------
agent/plugins/metrics/pom.xml | 7 -------
agent/plugins/metrics/prometheus/pom.xml | 4 ++--
agent/plugins/pom.xml | 24 ++++++++----------------
agent/plugins/tracing/jaeger/pom.xml | 3 ++-
agent/plugins/tracing/opentelemetry/pom.xml | 2 ++
agent/plugins/tracing/pom.xml | 18 ------------------
agent/plugins/tracing/test/pom.xml | 2 +-
agent/plugins/tracing/zipkin/pom.xml | 4 ++++
11 files changed, 24 insertions(+), 63 deletions(-)
diff --git a/agent/bootstrap/pom.xml b/agent/bootstrap/pom.xml
index e795b4aa869..46877b2f1c6 100644
--- a/agent/bootstrap/pom.xml
+++ b/agent/bootstrap/pom.xml
@@ -32,11 +32,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-core</artifactId>
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
index ffc4ecf1bd5..467680d2e51 100644
--- a/agent/core/pom.xml
+++ b/agent/core/pom.xml
@@ -32,12 +32,6 @@
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-api</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -45,6 +39,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
diff --git a/agent/plugins/logging/pom.xml b/agent/plugins/logging/pom.xml
index 81f5cc7bd28..cfa95d351b8 100644
--- a/agent/plugins/logging/pom.xml
+++ b/agent/plugins/logging/pom.xml
@@ -36,13 +36,6 @@
<logging.target.directory>${project.basedir}/../target/plugins</logging.target.directory>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-api</artifactId>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/agent/plugins/metrics/pom.xml b/agent/plugins/metrics/pom.xml
index 09e79502f22..8d1e1fe796e 100644
--- a/agent/plugins/metrics/pom.xml
+++ b/agent/plugins/metrics/pom.xml
@@ -36,11 +36,4 @@
<properties>
<metrics.target.directory>${project.basedir}/../target/plugins</metrics.target.directory>
</properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-api</artifactId>
- </dependency>
- </dependencies>
</project>
diff --git a/agent/plugins/metrics/prometheus/pom.xml b/agent/plugins/metrics/prometheus/pom.xml
index eea9eef8f56..928b242082a 100644
--- a/agent/plugins/metrics/prometheus/pom.xml
+++ b/agent/plugins/metrics/prometheus/pom.xml
@@ -42,13 +42,13 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-proxy-backend</artifactId>
+ <artifactId>shardingsphere-proxy-frontend-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-proxy-frontend-core</artifactId>
+ <artifactId>shardingsphere-proxy-backend</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/agent/plugins/pom.xml b/agent/plugins/pom.xml
index af4d7840edd..0ffd212d305 100644
--- a/agent/plugins/pom.xml
+++ b/agent/plugins/pom.xml
@@ -34,22 +34,14 @@
<module>logging</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-proxy-frontend-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-agent-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
diff --git a/agent/plugins/tracing/jaeger/pom.xml b/agent/plugins/tracing/jaeger/pom.xml
index 625d168f878..659b01360e3 100644
--- a/agent/plugins/tracing/jaeger/pom.xml
+++ b/agent/plugins/tracing/jaeger/pom.xml
@@ -34,10 +34,11 @@
<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>
diff --git a/agent/plugins/tracing/opentelemetry/pom.xml b/agent/plugins/tracing/opentelemetry/pom.xml
index 2835c0a0599..7e9552cb44c 100644
--- a/agent/plugins/tracing/opentelemetry/pom.xml
+++ b/agent/plugins/tracing/opentelemetry/pom.xml
@@ -37,6 +37,8 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-tracing-test</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/agent/plugins/tracing/pom.xml b/agent/plugins/tracing/pom.xml
index 6f2f51fec31..96d47d8ca2a 100644
--- a/agent/plugins/tracing/pom.xml
+++ b/agent/plugins/tracing/pom.xml
@@ -40,24 +40,6 @@
<tracing.target.directory>${project.basedir}/../target/plugins</tracing.target.directory>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-tracing-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-api</artifactId>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/agent/plugins/tracing/test/pom.xml b/agent/plugins/tracing/test/pom.xml
index 71d04fc9487..edfef877b62 100644
--- a/agent/plugins/tracing/test/pom.xml
+++ b/agent/plugins/tracing/test/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-proxy-frontend-core</artifactId>
- <scope>compile</scope>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/agent/plugins/tracing/zipkin/pom.xml b/agent/plugins/tracing/zipkin/pom.xml
index 07d8bf527d7..036b3d8fde4 100644
--- a/agent/plugins/tracing/zipkin/pom.xml
+++ b/agent/plugins/tracing/zipkin/pom.xml
@@ -31,10 +31,14 @@
<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>