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/03/23 13:22:36 UTC
[shardingsphere] branch master updated: Move agent's version declaration into root pom (#16309)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 660a250 Move agent's version declaration into root pom (#16309)
660a250 is described below
commit 660a2504c6ce4ef2d3574ea855d5e7e0ff75356f
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Mar 23 21:21:15 2022 +0800
Move agent's version declaration into root pom (#16309)
* Remove useless maven properties
* Move agent's version declaration into root pom
---
pom.xml | 106 +++++++++++++++++++++
.../shardingsphere-agent-bootstrap/pom.xml | 7 +-
.../shardingsphere-agent-plugin-metrics/pom.xml | 3 -
.../pom.xml | 4 -
.../shardingsphere-agent-plugin-tracing/pom.xml | 8 +-
.../shardingsphere-agent-tracing-jaeger/pom.xml | 33 +++----
.../pom.xml | 37 +++----
.../pom.xml | 23 ++---
.../shardingsphere-agent-tracing-test/pom.xml | 7 +-
.../shardingsphere-agent-tracing-zipkin/pom.xml | 28 ++----
10 files changed, 154 insertions(+), 102 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5358b0d..941d0d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,14 @@
<spring-boot.version>[1.5.20.RELEASE,2.0.0.M1)</spring-boot.version>
<bytebuddy.version>1.11.18</bytebuddy.version>
+ <prometheus.version>0.11.0</prometheus.version>
+ <prometheus.jmx.version>0.16.1</prometheus.jmx.version>
+ <opentracing.version>0.31.0</opentracing.version>
+ <jaeger-client.version>0.31.0</jaeger-client.version>
+ <zipkin-brave.version>5.13.2</zipkin-brave.version>
+ <zipkin-reporter.version>2.16.2</zipkin-reporter.version>
+ <opentelemetry.version>1.3.0</opentelemetry.version>
+ <opentelemetry-autoconfigure.version>1.3.0-alpha</opentelemetry-autoconfigure.version>
<cosid.version>1.8.6</cosid.version>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
@@ -438,6 +446,104 @@
<artifactId>byte-buddy</artifactId>
<version>${bytebuddy.version}</version>
</dependency>
+ <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</groupId>
+ <artifactId>simpleclient_httpserver</artifactId>
+ <version>${prometheus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.prometheus.jmx</groupId>
+ <artifactId>collector</artifactId>
+ <version>${prometheus.jmx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ <version>${opentracing.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ <version>${opentracing.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-mock</artifactId>
+ <version>${opentracing.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.jaegertracing</groupId>
+ <artifactId>jaeger-client</artifactId>
+ <version>${jaeger-client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.brave</groupId>
+ <artifactId>brave</artifactId>
+ <version>${zipkin-brave.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>zipkin-reporter-brave</artifactId>
+ <groupId>io.zipkin.reporter2</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-reporter-brave</artifactId>
+ <version>${zipkin-reporter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-sender-okhttp3</artifactId>
+ <version>${zipkin-reporter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-api</artifactId>
+ <version>${opentelemetry.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk</artifactId>
+ <version>${opentelemetry.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
+ <version>${opentelemetry-autoconfigure.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-exporter-jaeger</artifactId>
+ <version>${opentelemetry.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-exporter-zipkin</artifactId>
+ <version>${opentelemetry.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-exporter-otlp-trace</artifactId>
+ <version>${opentelemetry.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-sdk-testing</artifactId>
+ <version>${opentelemetry.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>me.ahoo.cosid</groupId>
diff --git a/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml b/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml
index 54f96e0..4aa1505 100644
--- a/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-bootstrap/pom.xml
@@ -29,10 +29,7 @@
<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>
@@ -68,8 +65,8 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Premain-Class>${premain.class}</Premain-Class>
- <Can-Redefine-Classes>${can.redefine.classes}</Can-Redefine-Classes>
- <Can-Retransform-Classes>${can.retransform.classes}</Can-Retransform-Classes>
+ <Can-Redefine-Classes>true</Can-Redefine-Classes>
+ <Can-Retransform-Classes>true</Can-Retransform-Classes>
</manifestEntries>
</transformer>
</transformers>
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 9492533..0538011 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
@@ -35,10 +35,7 @@
</modules>
<properties>
- <entrypoint.class/>
<metrics.target.directory>${project.basedir}/../target/plugins</metrics.target.directory>
- <prometheus.version>0.11.0</prometheus.version>
- <prometheus.jmx.version>0.16.1</prometheus.jmx.version>
</properties>
<dependencies>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/pom.xml
index bcaab73..b5bdaf9 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/pom.xml
@@ -63,22 +63,18 @@
<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</groupId>
<artifactId>simpleclient_httpserver</artifactId>
- <version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus.jmx</groupId>
<artifactId>collector</artifactId>
- <version>${prometheus.jmx.version}</version>
</dependency>
</dependencies>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/pom.xml
index bb35ff3..1c6fde6 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/pom.xml
@@ -39,12 +39,6 @@
<properties>
<tracing.target.directory>${project.basedir}/../target/plugins</tracing.target.directory>
- <opentracing.version>0.31.0</opentracing.version>
- <jaeger-client.version>0.31.0</jaeger-client.version>
- <zipkin-brave.version>5.13.2</zipkin-brave.version>
- <zipkin-reporter.version>2.16.2</zipkin-reporter.version>
- <opentelemetry.version>1.3.0</opentelemetry.version>
- <opentelemetry-autoconfigure.version>1.3.0-alpha</opentelemetry-autoconfigure.version>
</properties>
<dependencies>
@@ -53,7 +47,7 @@
<artifactId>shardingsphere-agent-api</artifactId>
</dependency>
</dependencies>
-
+
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/pom.xml
index 249b214..b3133d9 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/pom.xml
@@ -28,42 +28,35 @@
<artifactId>shardingsphere-agent-tracing-jaeger</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <opentracing.version>0.31.0</opentracing.version>
- <jaeger-client.version>0.31.0</jaeger-client.version>
- </properties>
-
<dependencies>
<dependency>
- <groupId>io.jaegertracing</groupId>
- <artifactId>jaeger-client</artifactId>
- <version>${jaeger-client.version}</version>
+ <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>
</dependency>
+
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
- <version>${opentracing.version}</version>
- </dependency>
- <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-mock</artifactId>
- <version>${opentracing.version}</version>
- <scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-tracing-test</artifactId>
+ <groupId>io.jaegertracing</groupId>
+ <artifactId>jaeger-client</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/pom.xml
index b4f6bf4..d6ea6bf 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/pom.xml
@@ -27,59 +27,46 @@
</parent>
<artifactId>shardingsphere-agent-tracing-opentelemetry</artifactId>
<name>${project.artifactId}</name>
-
- <properties>
- <opentelemetry.version>1.3.0</opentelemetry.version>
- <opentelemetry-autoconfigure.version>1.3.0-alpha</opentelemetry-autoconfigure.version>
- </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>
+ </dependency>
+
+ <dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
- <version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
- <version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
- <version>${opentelemetry-autoconfigure.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-jaeger</artifactId>
- <version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-zipkin</artifactId>
- <version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp-trace</artifactId>
- <version>${opentelemetry.version}</version>
- </dependency>
- <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>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
- <version>${opentelemetry.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
-
</project>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/pom.xml
index 8e69881..3f272d2 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentracing/pom.xml
@@ -27,33 +27,26 @@
</parent>
<artifactId>shardingsphere-agent-tracing-opentracing</artifactId>
<name>${project.artifactId}</name>
-
- <properties>
- <opentracing.version>0.31.0</opentracing.version>
- </properties>
-
+
<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>
- <version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
- <version>${opentracing.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>
- <version>${opentracing.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-proxy-frontend-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
</dependency>
</dependencies>
-
</project>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
index 285b5e3..96e579a 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
@@ -40,17 +40,14 @@
<artifactId>byte-buddy-agent</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>io.opentracing</groupId>
- <artifactId>opentracing-mock</artifactId>
- <version>${opentracing.version}</version>
+ <artifactId>opentracing-util</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
- <version>${opentracing.version}</version>
+ <artifactId>opentracing-mock</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/pom.xml b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/pom.xml
index ab51269..2c46c48 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/pom.xml
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-zipkin/pom.xml
@@ -27,36 +27,28 @@
</parent>
<artifactId>shardingsphere-agent-tracing-zipkin</artifactId>
<name>${project.artifactId}</name>
-
+
<dependencies>
<dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-proxy-frontend-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-agent-tracing-test</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave</artifactId>
- <version>${zipkin-brave.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>zipkin-reporter-brave</artifactId>
- <groupId>io.zipkin.reporter2</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter-brave</artifactId>
- <version>${zipkin-reporter.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-okhttp3</artifactId>
- <version>${zipkin-reporter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-proxy-frontend-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-tracing-test</artifactId>
</dependency>
</dependencies>
</project>