You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/03/09 12:49:40 UTC
[shardingsphere] branch master updated: Remove useless dbcp2 dependency in agent IT (#15944)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 5952c8e Remove useless dbcp2 dependency in agent IT (#15944)
5952c8e is described below
commit 5952c8ed1f9f5ad963f94176d75b7ddd6e2d129a
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Mar 9 20:48:24 2022 +0800
Remove useless dbcp2 dependency in agent IT (#15944)
---
.../shardingsphere-integration-agent-test-plugins/pom.xml | 4 +---
.../shardingsphere-integration-agent-test-common/pom.xml | 6 +++---
.../shardingsphere-integration-agent-test-jaeger/pom.xml | 12 ++++--------
.../shardingsphere-integration-agent-test-metrics/pom.xml | 12 ++++--------
.../pom.xml | 12 ++++--------
.../shardingsphere-integration-agent-test-zipkin/pom.xml | 12 ++++--------
6 files changed, 20 insertions(+), 38 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/pom.xml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/pom.xml
index 2ca526b..3409745 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/pom.xml
@@ -28,7 +28,7 @@
<artifactId>shardingsphere-integration-agent-test-plugins</artifactId>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
-
+
<modules>
<module>shardingsphere-integration-agent-test-metrics</module>
<module>shardingsphere-integration-agent-test-common</module>
@@ -36,6 +36,4 @@
<module>shardingsphere-integration-agent-test-jaeger</module>
<module>shardingsphere-integration-agent-test-opentelemetry</module>
</modules>
-
</project>
-
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/pom.xml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/pom.xml
index 9864564..dc1cf8a 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-common/pom.xml
@@ -27,12 +27,12 @@
</parent>
<artifactId>shardingsphere-integration-agent-test-common</artifactId>
<name>${project.artifactId}</name>
-
+
<properties>
<gson.version>2.8.0</gson.version>
<okhttp.version>3.7.0</okhttp.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
@@ -50,7 +50,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/pom.xml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/pom.xml
index d19c9aa..8856793 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/pom.xml
@@ -27,11 +27,11 @@
</parent>
<artifactId>shardingsphere-integration-agent-test-jaeger</artifactId>
<name>${project.artifactId}</name>
-
+
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -59,12 +59,8 @@
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- </dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>it.env.jaeger</id>
@@ -115,7 +111,7 @@
</build>
</profile>
</profiles>
-
+
<build>
<plugins>
<plugin>
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml
index b1f56d5..d2cc67e 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/pom.xml
@@ -27,11 +27,11 @@
</parent>
<artifactId>shardingsphere-integration-agent-test-metrics</artifactId>
<name>${project.artifactId}</name>
-
+
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -60,17 +60,13 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- </dependency>
- <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>${hikari-cp.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>it.env.metrics</id>
@@ -149,7 +145,7 @@
</build>
</profile>
</profiles>
-
+
<build>
<plugins>
<plugin>
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/pom.xml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/pom.xml
index 255e259..3754f32 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/pom.xml
@@ -27,12 +27,12 @@
</parent>
<artifactId>shardingsphere-integration-agent-test-opentelemetry</artifactId>
<name>${project.artifactId}</name>
-
+
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<gson.version>2.8.0</gson.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -61,10 +61,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
@@ -76,7 +72,7 @@
<scope>compile</scope>
</dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>it.env.opentelemetry</id>
@@ -155,7 +151,7 @@
</build>
</profile>
</profiles>
-
+
<build>
<plugins>
<plugin>
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/pom.xml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/pom.xml
index e9f1441..adf4525 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/pom.xml
@@ -27,11 +27,11 @@
</parent>
<artifactId>shardingsphere-integration-agent-test-zipkin</artifactId>
<name>${project.artifactId}</name>
-
+
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -59,12 +59,8 @@
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- </dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>it.env.zipkin</id>
@@ -115,7 +111,7 @@
</build>
</profile>
</profiles>
-
+
<build>
<plugins>
<plugin>