This is an automated email from the ASF dual-hosted git repository.
jackie 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 aeaf7cf813 Upgrade hadoop version to 3.4.0 (#13582)
aeaf7cf813 is described below
commit aeaf7cf8131014107e783da7d9ce2ef80923e728
Author: Abhishek Sharma <[email protected]>
AuthorDate: Fri Jul 12 16:29:16 2024 -0400
Upgrade hadoop version to 3.4.0 (#13582)
---
pinot-plugins/pinot-input-format/pinot-orc/pom.xml | 4 ++++
pom.xml | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
b/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
index 1a92bf7cd4..1fb737299a 100644
--- a/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
@@ -74,5 +74,9 @@
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 82160540ed..c3942be8b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
<javassist.version>3.30.2-GA</javassist.version>
<swagger.version>1.6.14</swagger.version>
<swagger-ui.version>5.17.14</swagger-ui.version>
- <hadoop.version>3.3.6</hadoop.version>
+ <hadoop.version>3.4.0</hadoop.version>
<jsonpath.version>2.9.0</jsonpath.version>
<jsonsmart.version>2.5.1</jsonsmart.version>
<quartz.version>2.3.2</quartz.version>
@@ -233,6 +233,7 @@
<scala.compat.version>2.12</scala.compat.version>
<!-- Solve conflict across dependencies -->
+ <jetbrains.annotations.version>24.1.0</jetbrains.annotations.version>
<kotlin.stdlib.version>2.0.0</kotlin.stdlib.version>
<okio.version>3.9.0</okio.version>
<kerby.version>2.0.3</kerby.version>
@@ -1490,6 +1491,11 @@
<artifactId>kotlin-stdlib-common</artifactId>
<version>${kotlin.stdlib.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${jetbrains.annotations.version}</version>
+ </dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
