diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml
index 0f62ce90c42e..6c70d6091cc4 100644
--- a/extensions-core/kubernetes-extensions/pom.xml
+++ b/extensions-core/kubernetes-extensions/pom.xml
@@ -35,9 +35,22 @@
- 11.0.4
+ 19.0.0
+
+
+
+
+
+ com.squareup.okhttp3
+ okhttp
+ 4.12.0
+
+
+
+
org.apache.druid
@@ -80,18 +93,6 @@
test
-
-
- org.bouncycastle
- bcprov-jdk15on
- runtime
-
-
- org.bouncycastle
- bcprov-ext-jdk15on
- runtime
-
-
com.google.code.findbugs
@@ -137,6 +138,18 @@
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ io.kubernetes:client-java-api-fluent:jar:19.0.0
+
+
+
+
org.jacoco
diff --git a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
index e17f8360e506..ab2c3b20952c 100644
--- a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
+++ b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
@@ -65,7 +65,7 @@ public DefaultK8sApiClient(ApiClient realK8sClient, @Json ObjectMapper jsonMappe
public void patchPod(String podName, String podNamespace, String jsonPatchStr)
{
try {
- coreV1Api.patchNamespacedPod(podName, podNamespace, new V1Patch(jsonPatchStr), "true", null, null, null);
+ coreV1Api.patchNamespacedPod(podName, podNamespace, new V1Patch(jsonPatchStr), "true", null, null, null, null);
}
catch (ApiException ex) {
throw new RE(ex, "Failed to patch pod[%s/%s], code[%d], error[%s].", podNamespace, podName, ex.getCode(), ex.getResponseBody());
@@ -80,7 +80,7 @@ public DiscoveryDruidNodeList listPods(
)
{
try {
- V1PodList podList = coreV1Api.listNamespacedPod(podNamespace, null, null, null, null, labelSelector, 0, null, null, null, null);
+ V1PodList podList = coreV1Api.listNamespacedPod(podNamespace, null, null, null, null, labelSelector, 0, null, null, null, null, null);
Preconditions.checkState(podList != null, "WTH: NULL podList");
Map allNodes = new HashMap();
@@ -114,7 +114,7 @@ public WatchResult watchPods(String namespace, String labelSelector, String last
Watch.createWatch(
realK8sClient,
coreV1Api.listNamespacedPodCall(namespace, null, true, null, null,
- labelSelector, null, lastKnownResourceVersion, null, 0, true, null
+ labelSelector, null, lastKnownResourceVersion, null, null, 0, true, null
),
new TypeReference>()
{
diff --git a/extensions-core/protobuf-extensions/pom.xml b/extensions-core/protobuf-extensions/pom.xml
index 2f13eacd78ed..038d4cbef172 100644
--- a/extensions-core/protobuf-extensions/pom.xml
+++ b/extensions-core/protobuf-extensions/pom.xml
@@ -36,6 +36,7 @@
2.11.0
+ 3.6.0
@@ -45,6 +46,19 @@
+
+
+
+
+ com.squareup.okio
+ okio
+ ${okio.version}
+
+
+
+
+
org.apache.druid
diff --git a/licenses.yaml b/licenses.yaml
index 45de078000e7..1d6c4905f6b0 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -843,63 +843,58 @@ libraries:
---
-name: kubernetes official java client
+name: kubernetes fabric java client
license_category: binary
-module: extensions/druid-kubernetes-extensions
+module: extensions-contrib/kubernetes-overlord-extensions
license_name: Apache License version 2.0
-version: 11.0.4
+version: 6.7.2
libraries:
- - io.kubernetes: client-java
+ - io.fabric8: kubernetes-client
---
-name: kubernetes official java client api
+name: kubernetes official java client
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 11.0.4
+version: 19.0.0
libraries:
+ - io.kubernetes: client-java
- io.kubernetes: client-java-api
-
----
-
-name: kubernetes official java client extended
-license_category: binary
-module: extensions/druid-kubernetes-extensions
-license_name: Apache License version 2.0
-version: 11.0.4
-libraries:
- io.kubernetes: client-java-extended
+ - io.kubernetes: client-java-api-fluent
+ - io.kubernetes: client-java-proto
---
-name: kubernetes fabric java client
+name: Swagger
+version: 1.6.2
license_category: binary
-module: extensions-contrib/kubernetes-overlord-extensions
+module: extensions/druid-avro-extensions
license_name: Apache License version 2.0
-version: 6.7.2
libraries:
- - io.fabric8: kubernetes-client
+ - io.swagger: swagger-core
+ - io.swagger: swagger-models
---
-name: io.prometheus simpleclient_common
+name: org.apache.commons commons-collections4
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 0.9.0
+version: 4.4
libraries:
- - io.prometheus: simpleclient_common
+ - org.apache.commons: commons-collections4
---
-name: org.apache.commons commons-collections4
+name: io.sundr builder-annotations
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 4.4
+version: 0.22.0
libraries:
- - org.apache.commons: commons-collections4
+ - io.sundr: builder-annotations
---
@@ -927,7 +922,7 @@ name: io.swagger swagger-annotations
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 1.6.2
+version: 1.6.11
libraries:
- io.swagger: swagger-annotations
@@ -937,22 +932,23 @@ name: io.swagger swagger-annotations
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 2.8.6
+version: 1.6.2
libraries:
- - com.google.code.gson: gson
+ - io.swagger: swagger-annotations
---
-name: io.prometheus simpleclient_httpserver
+name: io.swagger swagger-annotations
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 0.9.0
+version: 2.8.6
libraries:
- - io.prometheus: simpleclient_httpserver
+ - com.google.code.gson: gson
---
+
name: org.bitbucket.b_c jose4j
license_category: binary
module: extensions/druid-kubernetes-extensions
@@ -971,35 +967,54 @@ version: 2.2.1
libraries:
- org.joda: joda-convert
+
---
name: com.squareup.okhttp3 okhttp
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 3.14.9
+version: 4.12.0
libraries:
- com.squareup.okhttp3: okhttp
+ - com.squareup.okhttp3: logging-interceptor
---
-name: io.prometheus simpleclient
+name: com.squareup.okhttp3 okhttp logging-interceptor
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 0.9.0
+version: 4.11.0
libraries:
- - io.prometheus: simpleclient
+ - com.squareup.okhttp3: logging-interceptor
---
-name: io.kubernetes client-java-proto
+name: com.squareup.okio okio
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 11.0.4
+version: 3.6.0
libraries:
- - io.kubernetes: client-java-proto
+ - com.squareup.okio: okio
+ - com.squareup.okio: okio-jvm
+
+---
+
+name: io.prometheus simpleclient
+license_category: binary
+module: extensions/druid-kubernetes-extensions
+license_name: Apache License version 2.0
+version: 0.16.0
+libraries:
+ - io.prometheus: simpleclient
+ - io.prometheus: simpleclient_common
+ - io.prometheus: simpleclient_httpserver
+ - io.prometheus: simpleclient_tracer_common
+ - io.prometheus: simpleclient_tracer_otel
+ - io.prometheus: simpleclient_tracer_otel_agent
+
---
@@ -1017,70 +1032,76 @@ name: com.flipkart.zjsonpatch zjsonpatch
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 0.4.11
+version: 0.4.14
libraries:
- com.flipkart.zjsonpatch: zjsonpatch
---
-
-name: org.bouncycastle bcprov-jdk15on
+name: org.bouncycastle bcprov-jdk18on
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: MIT License
-version: "1.70"
+version: "1.76"
libraries:
- - org.bouncycastle: bcprov-jdk15on
-
+ - org.bouncycastle: bcprov-jdk18on
+ - org.bouncycastle: bcprov-ext-jdk18on
+ - org.bouncycastle: bcpkix-jdk18on
+ - org.bouncycastle: bcutil-jdk18on
---
-name: org.bouncycastle bcprov-ext-jdk15on
+
+name: com.github.vladimir-bukhtoyarov bucket4j-core
license_category: binary
module: extensions/druid-kubernetes-extensions
-license_name: MIT License
-version: "1.70"
+license_name: Apache License version 2.0
+version: 7.6.0
libraries:
- - org.bouncycastle: bcprov-ext-jdk15on
+ - com.github.vladimir-bukhtoyarov: bucket4j-core
---
-name: org.bouncycastle bcpkix-jdk15on
+name: Jetbrains Annotations
license_category: binary
module: extensions/druid-kubernetes-extensions
-license_name: MIT License
-version: "1.70"
+module: extensions/kubernetes-extensions
+license_name: Apache License version 2.0
+version: 13.0
libraries:
- - org.bouncycastle: bcpkix-jdk15on
+ - org.jetbrains: annotations
+
---
-name: org.bouncycastle bcutil-jdk15on
+name: Jetbrains kotlin-stdlib
license_category: binary
-module: extensions/druid-kubernetes-extensions
-license_name: MIT License
-version: "1.70"
+module: extensions/kubernetes-extensions
+license_name: Apache License version 2.0
+version: 1.6.10
libraries:
- - org.bouncycastle: bcutil-jdk15on
+ - org.jetbrains.kotlin: kotlin-stdlib
---
-name: com.squareup.okhttp3 logging-interceptor
+name: Jetbrains kotlin-stdlib common
license_category: binary
-module: extensions/druid-kubernetes-extensions
+module: extensions/kubernetes-extensions
license_name: Apache License version 2.0
-version: 3.14.9
+version: 1.9.10
libraries:
- - com.squareup.okhttp3: logging-interceptor
+ - org.jetbrains.kotlin: kotlin-stdlib-common
---
-
-name: com.github.vladimir-bukhtoyarov bucket4j-core
+name: Jetbrains jdk7 jdk 8
license_category: binary
-module: extensions/druid-kubernetes-extensions
+module: extensions/kubernetes-extensions
license_name: Apache License version 2.0
-version: 4.10.0
+version: 1.8.21
libraries:
- - com.github.vladimir-bukhtoyarov: bucket4j-core
+ - org.jetbrains.kotlin: kotlin-stdlib
+ - org.jetbrains.kotlin: kotlin-stdlib-common
+ - org.jetbrains.kotlin: kotlin-stdlib-jdk7
+ - org.jetbrains.kotlin: kotlin-stdlib-jdk8
---
@@ -4097,6 +4118,16 @@ libraries:
---
+name: org.elasticsearch securesm
+license_category: binary
+version: 2.1.9
+module: druid-ranger-security
+license_name: Creative Commons CC0
+libraries:
+ - org.hdrhistogram: HdrHistogram
+
+---
+
name: Apache Lucene
license_category: binary
version: 8.4.0
diff --git a/owasp-dependency-check-suppressions.xml b/owasp-dependency-check-suppressions.xml
index 4359bddc0f93..7486d357e29c 100644
--- a/owasp-dependency-check-suppressions.xml
+++ b/owasp-dependency-check-suppressions.xml
@@ -764,6 +764,7 @@
CVE-2021-4277
+
CVE-2023-5072
-
-
-
- CVE-2023-44981
-
@@ -1113,7 +1094,7 @@
com.github.docker-java
docker-java-bom
- 3.2.13
+ 3.3.4
import
pom