This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new c6e8cab1fa Upgrade hadoop version to 3.3.6 (#12561)
c6e8cab1fa is described below
commit c6e8cab1fa2e35f0d4e39a5a5b5d95886e76aa45
Author: Xiang Fu <[email protected]>
AuthorDate: Tue Mar 5 15:35:29 2024 -0800
Upgrade hadoop version to 3.3.6 (#12561)
---
pinot-common/pom.xml | 6 -----
.../pinot-input-format/pinot-protobuf/pom.xml | 10 --------
.../pinot-stream-ingestion/pinot-pulsar/pom.xml | 2 --
pinot-tools/pom.xml | 4 ---
pom.xml | 29 ++++++++++++++++++----
5 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index ad2c032650..7ac856584a 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -282,12 +282,6 @@
<dependency>
<groupId>org.apache.helix</groupId>
<artifactId>helix-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
diff --git a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
index 05d4b14149..c3ec098593 100644
--- a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
@@ -119,16 +119,6 @@
<groupId>io.confluent</groupId>
<artifactId>kafka-protobuf-serializer</artifactId>
<version>${confluent.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.squareup.okio</groupId>
- <artifactId>okio</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
index 531460cdef..7926c5e33f 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
@@ -51,7 +51,6 @@
<javax.annotation-api.version>1.2</javax.annotation-api.version>
<commons-collections.version>4.4</commons-collections.version>
<grpc-protobuf-lite.version>1.19.0</grpc-protobuf-lite.version>
- <okio.version>1.6.0</okio.version>
</properties>
<dependencies>
@@ -164,7 +163,6 @@
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
- <version>${okio.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
diff --git a/pinot-tools/pom.xml b/pinot-tools/pom.xml
index 02158c00f0..b467abaa11 100644
--- a/pinot-tools/pom.xml
+++ b/pinot-tools/pom.xml
@@ -156,10 +156,6 @@
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
diff --git a/pom.xml b/pom.xml
index e7e480261d..be0e87233f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
<grizzly.version>2.4.4</grizzly.version>
<hk2.version>2.6.1</hk2.version>
<swagger.version>1.6.9</swagger.version>
- <hadoop.version>3.2.4</hadoop.version>
+ <hadoop.version>3.3.6</hadoop.version>
<antlr.version>4.6</antlr.version>
<jsonpath.version>2.9.0</jsonpath.version>
<jsonsmart.version>2.5.0</jsonsmart.version>
@@ -197,6 +197,9 @@
<commons-configuration2.version>2.9.0</commons-configuration2.version>
<kotlin.stdlib.version>1.7.22</kotlin.stdlib.version>
+ <okio.version>2.10.0</okio.version>
+ <reload4j.version>1.2.25</reload4j.version>
+ <javax.xml.bind.version>2.3.1</javax.xml.bind.version>
</properties>
<profiles>
@@ -568,6 +571,16 @@
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${javax.xml.bind.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <version>${reload4j.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.helix</groupId>
<artifactId>helix-core</artifactId>
@@ -892,10 +905,6 @@
<version>${hadoop.version}</version>
<scope>provided</scope>
<exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
@@ -1341,6 +1350,16 @@
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.stdlib.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-common</artifactId>
+ <version>${kotlin.stdlib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>${okio.version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
