This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0066aaa7dc0 [chore](dep)upgrade hbase (#57810)
0066aaa7dc0 is described below
commit 0066aaa7dc05e629c7c4e43e5d40b9dc7fb78004
Author: Calvin Kirs <[email protected]>
AuthorDate: Fri Nov 7 20:42:20 2025 +0800
[chore](dep)upgrade hbase (#57810)
#57810
---
fe/fe-core/pom.xml | 11 +--
.../doris/datasource/iceberg/IcebergUtilsTest.java | 8 +-
.../apache/doris/deploy/K8sDeployManagerTest.java | 67 ----------------
fe/pom.xml | 88 ++++++++++++++++++----
4 files changed, 80 insertions(+), 94 deletions(-)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 6ad5cf66692..786b8c783c8 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -266,7 +266,7 @@ under the License.
<!-- https://mvnrepository.com/artifact/io.fabric8/kubernetes-model -->
<dependency>
<groupId>io.fabric8</groupId>
- <artifactId>kubernetes-model</artifactId>
+ <artifactId>kubernetes-model-core</artifactId>
</dependency>
<!--
https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor -->
<dependency>
@@ -739,15 +739,8 @@ under the License.
<dependency>
<groupId>com.google.cloud.bigdataoss</groupId>
<artifactId>gcs-connector</artifactId>
- <version>hadoop3-2.2.21</version>
- <classifier>shaded</classifier>
+ <version>${gcs.version}</version>
<scope>${gcs.dependency.scope}</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!--
https://mvnrepository.com/artifact/org.apache.ranger/ranger-plugins-common -->
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/datasource/iceberg/IcebergUtilsTest.java
b/fe/fe-core/src/test/java/org/apache/doris/datasource/iceberg/IcebergUtilsTest.java
index e19e9b946e1..e4ee0ec5e46 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/datasource/iceberg/IcebergUtilsTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/datasource/iceberg/IcebergUtilsTest.java
@@ -22,6 +22,7 @@ import org.apache.doris.analysis.TableSnapshot;
import org.apache.doris.common.UserException;
import org.apache.doris.datasource.iceberg.source.IcebergTableQueryInfo;
+import com.google.common.collect.ImmutableMap;
import org.apache.iceberg.GenericManifestFile;
import org.apache.iceberg.GenericPartitionFieldSummary;
import org.apache.iceberg.HistoryEntry;
@@ -42,7 +43,6 @@ import org.apache.iceberg.types.Conversions;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.types.Types.LongType;
import org.apache.iceberg.types.Types.StructType;
-import org.checkerframework.org.plumelib.util.ArrayMap;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -351,10 +351,8 @@ public class IcebergUtilsTest {
table,
Optional.empty(),
Optional.of(new TableScanParams("branch",
- new ArrayMap<String, String>() {{
- put("k1", "k2");
- }
- },
+ ImmutableMap.of(
+ "k1", "k2"),
null))
));
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/deploy/K8sDeployManagerTest.java
b/fe/fe-core/src/test/java/org/apache/doris/deploy/K8sDeployManagerTest.java
deleted file mode 100644
index 64a1ebb12c4..00000000000
--- a/fe/fe-core/src/test/java/org/apache/doris/deploy/K8sDeployManagerTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package org.apache.doris.deploy;
-
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import org.junit.Test;
-
-import java.io.File;
-
-public class K8sDeployManagerTest {
- /**
- * The purpose of this test case is to verify whether there is a problem
with the referenced Jackson version
- * when initializing the DefaultKubernetesClient.
- * The prerequisite for executing this test case is that the system has a
file named:~/.kube/config.
- * The file demo is as follows:
- *
- * apiVersion: v1
- * clusters:
- * - cluster:
- * certificate-authority-data: xxx
- * server: https://172.xx.xx.16
- * name: cls-m5vzryyb
- * contexts:
- * - context:
- * cluster: cls-m5vzryyb
- * user: "100029465455"
- * name: cls-m5vzryyb-100029465455-context-default
- * current-context: cls-m5vzryyb-100029465455-context-default
- * kind: Config
- * preferences: {}
- * users:
- * - name: "100029465455"
- * user:
- * client-certificate-data: xxx
- * client-key-data: xxx
- *
- * When the test case fails,the error message is as follows:
- *
- * java.lang.NoClassDefFoundError: org/yaml/snakeyaml/LoaderOptions
- * detailed information: https://github.com/apache/doris/pull/18046
- */
- @Test
- public void testClient() {
- File kubeConfigFile = new File(Config.getKubeconfigFilename());
- if (!kubeConfigFile.isFile()) {
- System.out.println("Did not find Kubernetes config at: [" +
kubeConfigFile.getPath() + "]. Ignoring.");
- return;
- }
- new DefaultKubernetesClient();
- }
-}
diff --git a/fe/pom.xml b/fe/pom.xml
index fd2f0d4ec18..73f4ddaa656 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -227,6 +227,7 @@ under the License.
<parquet.version>1.16.0</parquet.version>
<spark.version>3.4.3</spark.version>
<hudi.version>1.0.2</hudi.version>
+ <gcs.version>3.1.9</gcs.version>
<obs.dependency.scope>compile</obs.dependency.scope>
<cos.dependency.scope>compile</cos.dependency.scope>
<gcs.dependency.scope>compile</gcs.dependency.scope>
@@ -248,7 +249,7 @@ under the License.
<commons-configuration2.version>2.11.0</commons-configuration2.version>
<commons-codec.version>1.13</commons-codec.version>
<commons-lang.version>2.6</commons-lang.version>
- <commons-lang3.version>3.17.0</commons-lang3.version>
+ <commons-lang3.version>3.19.0</commons-lang3.version>
<commons-pool2.version>2.2</commons-pool2.version>
<commons-pool.version>1.5.1</commons-pool.version>
<commons-text.version>1.10.0</commons-text.version>
@@ -285,7 +286,7 @@ under the License.
<grpc-java.version>1.34.0</grpc-java.version>
<!--Need to ensure that the version is the same as in
arrow/java/pom.xml or compatible with it.-->
<grpc.version>1.65.1</grpc.version>
- <check.freamework.version>3.43.0</check.freamework.version>
+ <check.freamework.version>3.52.0</check.freamework.version>
<protobuf.version>3.25.8</protobuf.version>
<!-- we use protoc-jar-maven-plugin to generate protobuf generated
code -->
<!-- see
https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/ to get correct
version -->
@@ -296,7 +297,8 @@ under the License.
<snappy-java.version>1.1.10.5</snappy-java.version>
<automaton.version>1.11-8</automaton.version>
<generex.version>1.0.1</generex.version>
- <fabric8.kubernetes.version>6.7.2</fabric8.kubernetes.version>
+ <fabric8.kubernetes.version>7.4.0</fabric8.kubernetes.version>
+ <jetty-servlet.version>11.0.26</jetty-servlet.version>
<logging-interceptor.version>4.12.0</logging-interceptor.version>
<okhttp.version>4.9.3</okhttp.version>
<okio.version>3.4.0</okio.version>
@@ -346,7 +348,8 @@ under the License.
<re2j.version>1.8</re2j.version>
<hadoop.thirdparty.guava.version>1.2.0</hadoop.thirdparty.guava.version>
<hadoop.thirdparty.protobuf_3_25.version>1.5.0</hadoop.thirdparty.protobuf_3_25.version>
- <hbase.version>2.4.9</hbase.version>
+ <hbase.version>2.6.3</hbase.version>
+ <jline.version>3.30.6</jline.version>
<hbase-shaded-gson.version>4.1.7</hbase-shaded-gson.version>
<antlr4.version>4.13.1</antlr4.version>
<joda.version>2.8.1</joda.version>
@@ -362,6 +365,7 @@ under the License.
<kerby.version>2.0.3</kerby.version>
<jettison.version>1.5.4</jettison.version>
<jetty.version>12.0.29</jetty.version>
+ <jetty-http.version>11.0.26</jetty-http.version>
<immutables.version>2.9.3</immutables.version>
<ivy.version>2.5.2</ivy.version>
<icu4j.version>78.1</icu4j.version>
@@ -470,6 +474,21 @@ under the License.
<scope>import</scope>
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>http2-client</artifactId>
+ <version>${jetty-http.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>http2-server</artifactId>
+ <version>${jetty-http.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>http2-http-client-transport</artifactId>
+ <version>${jetty-http.version}</version>
+ </dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
@@ -715,17 +734,11 @@ under the License.
<artifactId>kerb-core</artifactId>
<version>${kerby.version}</version>
</dependency>
- <!--
https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper -->
+ <!-- anyway to avoid declare zookeeper again -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -1022,6 +1035,11 @@ under the License.
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ <version>${protobuf.version}</version>
+ </dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker</artifactId>
@@ -1061,7 +1079,7 @@ under the License.
<!--
https://mvnrepository.com/artifact/io.fabric8/kubernetes-model -->
<dependency>
<groupId>io.fabric8</groupId>
- <artifactId>kubernetes-model</artifactId>
+ <artifactId>kubernetes-model-core</artifactId>
<version>${fabric8.kubernetes.version}</version>
</dependency>
<!--
https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor -->
@@ -1364,6 +1382,50 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hbase.thirdparty</groupId>
+ <artifactId>hbase-shaded-netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <version>${hbase.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hbase.thirdparty</groupId>
+ <artifactId>hbase-shaded-netty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty-servlet.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>${jline.version}</version>
+ </dependency>
<!--
https://mvnrepository.com/artifact/org.apache.hudi/hudi-hadoop-mr -->
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
