You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2023/07/11 03:43:12 UTC
[iotdb] 01/02: Revert "Fix metrics service cannot start (#10450)"
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch test_write_0711
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ad6afa7aeb6cc7b94a93ea3e2bfb27f41d07454a
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Tue Jul 11 11:42:32 2023 +0800
Revert "Fix metrics service cannot start (#10450)"
This reverts commit cdbc28c76f7ee972335a72894af83bcc54d4de36.
---
iotdb-core/metrics/interface/pom.xml | 43 ++++++++-----------------
iotdb-core/metrics/micrometer-metrics/pom.xml | 46 ++++++++-------------------
pom.xml | 2 --
3 files changed, 27 insertions(+), 64 deletions(-)
diff --git a/iotdb-core/metrics/interface/pom.xml b/iotdb-core/metrics/interface/pom.xml
index 1a203c2a98c..4061f7bc07d 100644
--- a/iotdb-core/metrics/interface/pom.xml
+++ b/iotdb-core/metrics/interface/pom.xml
@@ -23,6 +23,7 @@
<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>
@@ -45,6 +46,14 @@
<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>
@@ -65,38 +74,12 @@
<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 e40e5937d59..86e989371b1 100644
--- a/iotdb-core/metrics/micrometer-metrics/pom.xml
+++ b/iotdb-core/metrics/micrometer-metrics/pom.xml
@@ -54,11 +54,6 @@
<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>
@@ -67,8 +62,16 @@
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
- <version>${reactor-netty-http.version}</version>
+ <version>1.0.24</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>
@@ -89,37 +92,16 @@
<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>
+ <artifactId>netty-common</artifactId>
<version>${netty.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 729d21a3136..68dcc73a6a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,8 +227,6 @@
<!-- 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