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 efc6525fe48 Refactor : exclude H2 dependency from agent plugins
(#23318) (#23319)
efc6525fe48 is described below
commit efc6525fe48e23031f8fa83ec03390c9688c487f
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Wed Jan 4 13:01:07 2023 +0800
Refactor : exclude H2 dependency from agent plugins (#23318) (#23319)
---
agent/plugins/metrics/type/prometheus/pom.xml | 18 ++++++++++++++++++
agent/plugins/tracing/type/pom.xml | 6 ++++++
agent/pom.xml | 2 --
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/agent/plugins/metrics/type/prometheus/pom.xml
b/agent/plugins/metrics/type/prometheus/pom.xml
index c201837cb7b..6e1b5d36118 100644
--- a/agent/plugins/metrics/type/prometheus/pom.xml
+++ b/agent/plugins/metrics/type/prometheus/pom.xml
@@ -44,6 +44,12 @@
<artifactId>shardingsphere-proxy-bootstrap</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -56,12 +62,24 @@
<artifactId>shardingsphere-proxy-backend</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-infra-context</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/agent/plugins/tracing/type/pom.xml
b/agent/plugins/tracing/type/pom.xml
index 28f588035ea..ecd92c5992b 100644
--- a/agent/plugins/tracing/type/pom.xml
+++ b/agent/plugins/tracing/type/pom.xml
@@ -45,6 +45,12 @@
<artifactId>shardingsphere-proxy-frontend-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/agent/pom.xml b/agent/pom.xml
index 9e3c015ee3f..93186ec9ae5 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -77,8 +77,6 @@
<filter>
<artifact>*:*</artifact>
<excludes>
- <!-- TODO H2 data.zip file may exclude
from the proxy dependency -->
- <exclude>org/h2/util/data.zip</exclude>
<exclude>mozilla/public-suffix-list.txt</exclude>
</excludes>
</filter>