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 2020/12/21 04:35:34 UTC
[shardingsphere] branch master updated: Add pom name for
shardingsphere-agent modules (#8698)
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 3a897c0 Add pom name for shardingsphere-agent modules (#8698)
3a897c0 is described below
commit 3a897c012c5a0eb1f089d1794bb32bc43fa20333
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Dec 21 12:35:07 2020 +0800
Add pom name for shardingsphere-agent modules (#8698)
---
shardingsphere-agent/pom.xml | 18 +++++++++---------
.../shardingsphere-agent-bootstrap/pom.xml | 9 +++++----
.../shardingsphere-agent-core/pom.xml | 6 +++---
.../shardingsphere-agent-distribution/pom.xml | 10 +++++-----
.../shardingsphere-agent-plugins/pom.xml | 10 +++++-----
.../shardingsphere-agent-plugin-metrics/pom.xml | 10 ++++++----
.../shardingsphere-agent-metrics-api/pom.xml | 11 ++++-------
.../shardingsphere-agent-metrics-bootstrap/pom.xml | 12 +++++++-----
.../shardingsphere-agent-plugin-tracers/pom.xml | 19 +++++++++----------
.../shardingsphere-agent-tracer-jaeger/pom.xml | 10 +++++-----
10 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/shardingsphere-agent/pom.xml b/shardingsphere-agent/pom.xml
index 1827ccd..858ee02 100644
--- a/shardingsphere-agent/pom.xml
+++ b/shardingsphere-agent/pom.xml
@@ -25,22 +25,22 @@
<artifactId>shardingsphere</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
-
<artifactId>shardingsphere-agent</artifactId>
<packaging>pom</packaging>
-
- <properties>
- <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
- <shade.package>org.apache.shardingsphere.dependencies</shade.package>
- </properties>
-
+ <name>${project.artifactId}</name>
+
<modules>
<module>shardingsphere-agent-bootstrap</module>
<module>shardingsphere-agent-core</module>
<module>shardingsphere-agent-plugins</module>
<module>shardingsphere-agent-distribution</module>
</modules>
-
+
+ <properties>
+ <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
+ <shade.package>org.apache.shardingsphere.dependencies</shade.package>
+ </properties>
+
<dependencies>
<dependency>
<groupId>net.bytebuddy</groupId>
@@ -54,7 +54,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<pluginManagement>
<plugins>
diff --git a/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml b/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml
index 38abe06..39eb810 100644
--- a/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml
@@ -19,21 +19,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>shardingsphere-agent-bootstrap</artifactId>
-
+ <name>${project.artifactId}</name>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<premain.class>org.apache.shardingsphere.agent.bootstrap.ShardingSphereAgent</premain.class>
<can.redefine.classes>true</can.redefine.classes>
<can.retransform.classes>true</can.retransform.classes>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -41,7 +42,7 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
+
<build>
<finalName>shardingsphere-agent</finalName>
<plugins>
diff --git a/shardingsphere-agent/shardingsphere-agent-core/pom.xml b/shardingsphere-agent/shardingsphere-agent-core/pom.xml
index c128a51..0799fda 100644
--- a/shardingsphere-agent/shardingsphere-agent-core/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-core/pom.xml
@@ -19,15 +19,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>shardingsphere-agent-core</artifactId>
-
+ <name>${project.artifactId}</name>
+
<dependencies>
<dependency>
<groupId>org.yaml</groupId>
diff --git a/shardingsphere-agent/shardingsphere-agent-distribution/pom.xml b/shardingsphere-agent/shardingsphere-agent-distribution/pom.xml
index 3c96f87..2ed4b31 100644
--- a/shardingsphere-agent/shardingsphere-agent-distribution/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-distribution/pom.xml
@@ -19,16 +19,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
<artifactId>shardingsphere-agent-distribution</artifactId>
-
+ <packaging>pom</packaging>
+ <name>${project.artifactId}</name>
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -36,7 +36,7 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
+
<build>
<finalName>shardingsphere-agent</finalName>
<plugins>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/pom.xml
index 74ba9ac..1a61524 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/pom.xml
@@ -19,20 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>shardingsphere-agent-plugins</artifactId>
- <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
-
+ <name>${project.artifactId}</name>
+
<modules>
<module>shardingsphere-agent-plugin-metrics</module>
<module>shardingsphere-agent-plugin-tracers</module>
</modules>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -43,7 +44,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<build>
<finalName>${project.artifactId}-${project.version}.jar</finalName>
<plugins>
@@ -83,5 +84,4 @@
</plugin>
</plugins>
</build>
-
</project>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/pom.xml
index 10929d8..ce936f5 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/pom.xml
@@ -19,24 +19,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-plugins</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+ <artifactId>shardingsphere-agent-plugin-metrics</artifactId>
<packaging>pom</packaging>
+ <name>${project.artifactId}</name>
+
<modules>
<module>shardingsphere-agent-metrics-api</module>
<module>shardingsphere-agent-metrics-bootstrap</module>
</modules>
- <artifactId>shardingsphere-agent-plugin-metrics</artifactId>
-
+
<properties>
<entrypoint.class/>
<metrics.target.directory>${project.basedir}/../target/plugins</metrics.target.directory>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/pom.xml
index 685ea23..0ccbeef 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/pom.xml
@@ -19,43 +19,40 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-plugin-metrics</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>shardingsphere-agent-metrics-api</artifactId>
-
+ <name>${project.artifactId}</name>
+
<properties>
<prometheus.version>0.6.0</prometheus.version>
<prometheus.jmx.version>0.10</prometheus.jmx.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
<version>${prometheus.version}</version>
</dependency>
-
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_hotspot</artifactId>
<version>${prometheus.version}</version>
</dependency>
-
<dependency>
<groupId>io.prometheus.jmx</groupId>
<artifactId>collector</artifactId>
<version>${prometheus.jmx.version}</version>
</dependency>
-
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_httpserver</artifactId>
<version>${prometheus.version}</version>
</dependency>
</dependencies>
-
</project>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-bootstrap/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-bootstrap/pom.xml
index 1d38a39..b28a4ac 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-bootstrap/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-bootstrap/pom.xml
@@ -19,26 +19,28 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-plugin-metrics</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>shardingsphere-agent-metrics-bootstrap</artifactId>
-
+ <packaging>jar</packaging>
+ <name>${project.artifactId}</name>
+
<properties>
<entrypoint.class>org.apache.shardingsphere.agent.metrics.bootstrap.definition.MetricsPluginDefinition</entrypoint.class>
<shardingsphere.version>5.0.0-RC1-SNAPSHOT</shardingsphere.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-metrics-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-infra-route</artifactId>
@@ -46,7 +48,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracers/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracers/pom.xml
index da5d2cb..5f0a2c9 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracers/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracers/pom.xml
@@ -20,32 +20,31 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+ <artifactId>shardingsphere-agent-plugin-tracers</artifactId>
<parent>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-plugins</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
-
<packaging>pom</packaging>
- <artifactId>shardingsphere-agent-plugin-tracers</artifactId>
-
+ <name>${project.artifactId}</name>
+
+ <modules>
+ <module>shardingsphere-agent-tracer-jaeger</module>
+ </modules>
+
<properties>
<entrypoint.class/>
<tracing.target.directory>${project.basedir}/../target/plugins</tracing.target.directory>
</properties>
-
- <modules>
- <module>shardingsphere-agent-tracer-jaeger</module>
- </modules>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-core</artifactId>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracers/shardingsphere-agent-tracer-jaeger/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracers/shardingsphere-agent-tracer-jaeger/pom.xml
index 034b95c..66bc0a6 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracers/shardingsphere-agent-tracer-jaeger/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracers/shardingsphere-agent-tracer-jaeger/pom.xml
@@ -20,27 +20,27 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-plugin-tracers</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
-
- <packaging>jar</packaging>
<artifactId>shardingsphere-agent-tracer-jaeger</artifactId>
-
+ <packaging>jar</packaging>
+ <name>${project.artifactId}</name>
+
<properties>
<jaeger-client.version>0.31.0</jaeger-client.version>
<entrypoint.class>org.apache.shardingsphere.agent.plugin.trace.JaegerPluginDefinition</entrypoint.class>
</properties>
-
+
<dependencies>
<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-client</artifactId>
<version>${jaeger-client.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-proxy-frontend-core</artifactId>