You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/07/05 03:55:15 UTC
[iotdb] branch fix_metrics created (now aa890fb482c)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch fix_metrics
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at aa890fb482c Fix metrics service cannot start
This branch includes the following new commits:
new aa890fb482c Fix metrics service cannot start
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: Fix metrics service cannot start
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch fix_metrics
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit aa890fb482cf919d207174ca9e024a5f51ec5d8f
Author: HTHou <hh...@outlook.com>
AuthorDate: Wed Jul 5 11:54:06 2023 +0800
Fix metrics service cannot start
---
iotdb-core/metrics/interface/pom.xml | 43 +++++++++++++++++--------
iotdb-core/metrics/micrometer-metrics/pom.xml | 46 +++++++++++++++++++--------
pom.xml | 2 ++
3 files changed, 64 insertions(+), 27 deletions(-)
diff --git a/iotdb-core/metrics/interface/pom.xml b/iotdb-core/metrics/interface/pom.xml
index 4061f7bc07d..1a203c2a98c 100644
--- a/iotdb-core/metrics/interface/pom.xml
+++ b/iotdb-core/metrics/interface/pom.xml
@@ -23,7 +23,6 @@
<modelVersion>4.0.0</modelVersion>
<properties>
<snakeyaml.version>1.31</snakeyaml.version>
- <reactor-netty-http.version>1.0.24</reactor-netty-http.version>
</properties>
<parent>
<groupId>org.apache.iotdb</groupId>
@@ -46,14 +45,6 @@
<artifactId>reactor-netty-http</artifactId>
<version>${reactor-netty-http.version}</version>
<exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
@@ -74,12 +65,38 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
diff --git a/iotdb-core/metrics/micrometer-metrics/pom.xml b/iotdb-core/metrics/micrometer-metrics/pom.xml
index 86e989371b1..e40e5937d59 100644
--- a/iotdb-core/metrics/micrometer-metrics/pom.xml
+++ b/iotdb-core/metrics/micrometer-metrics/pom.xml
@@ -54,6 +54,11 @@
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler-proxy</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
@@ -62,16 +67,8 @@
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
- <version>1.0.24</version>
+ <version>${reactor-netty-http.version}</version>
<exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
@@ -92,16 +89,37 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <version>${netty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 68dcc73a6a6..729d21a3136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,6 +227,8 @@
<!-- codegen -->
<drill.freemarker.maven.plugin.version>1.17.0</drill.freemarker.maven.plugin.version>
<codegen.phase>generate-sources</codegen.phase>
+ <!-- metrics -->
+ <reactor-netty-http.version>1.0.24</reactor-netty-http.version>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim