From 878159eea176a5baa0897b2b01740f575d62e0e0 Mon Sep 17 00:00:00 2001 From: capistrant Date: Sat, 20 Sep 2025 08:13:34 -0500 Subject: [PATCH 1/5] Bump fabric8 to 7.4 and jackson to latest 2.19.x --- .../kubernetes-overlord-extensions/pom.xml | 2 +- licenses.yaml | 36 ++----------------- pom.xml | 5 ++- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/extensions-core/kubernetes-overlord-extensions/pom.xml b/extensions-core/kubernetes-overlord-extensions/pom.xml index f64125bc1fcb..d70cfa356c34 100644 --- a/extensions-core/kubernetes-overlord-extensions/pom.xml +++ b/extensions-core/kubernetes-overlord-extensions/pom.xml @@ -35,7 +35,7 @@ - 7.2.0 + 7.4.0 diff --git a/licenses.yaml b/licenses.yaml index e4ebfe3df359..58b46faa9a21 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -223,39 +223,9 @@ name: Jackson license_category: binary module: java-core license_name: Apache License version 2.0 -version: 2.18.4.1 +version: 2.19.2 libraries: - com.fasterxml.jackson.core: jackson-core -notice: | - # Jackson JSON processor - - Jackson is a high-performance, Free/Open Source JSON processing library. - It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has - been in development since 2007. - It is currently developed by a community of developers, as well as supported - commercially by FasterXML.com. - - ## Licensing - - Jackson core and extension components may licensed under different licenses. - To find the details that apply to this artifact see the accompanying LICENSE file. - For more information, including possible other licensing options, contact - FasterXML.com (http://fasterxml.com). - - ## Credits - - A list of contributors may be found from CREDITS file, which is included - in some artifacts (usually source distributions); but is always available - from the source code management (SCM) system project uses. - ---- - -name: Jackson -license_category: binary -module: java-core -license_name: Apache License version 2.0 -version: 2.18.4 -libraries: - com.fasterxml.jackson.core: jackson-annotations - com.fasterxml.jackson.dataformat: jackson-dataformat-cbor - com.fasterxml.jackson.dataformat: jackson-dataformat-smile @@ -296,7 +266,7 @@ name: Jackson license_category: binary module: extensions-contrib/druid-deltalake-extensions license_name: Apache License version 2.0 -version: 2.18.4 +version: 2.19.2 libraries: - com.fasterxml.jackson.core: jackson-databind notice: | @@ -2894,7 +2864,7 @@ libraries: --- name: Jackson Dataformat Yaml -version: 2.18.4 +version: 2.19.2 license_category: binary module: extensions/druid-avro-extensions license_name: Apache License version 2.0 diff --git a/pom.xml b/pom.xml index bb2dd823d15a..535e4878a623 100644 --- a/pom.xml +++ b/pom.xml @@ -100,8 +100,7 @@ 1.3 12.0.25 1.19.4 - 2.18.4.1 - 2.18.4 + 2.19.2 1.9.13 2.22.1 8.2.0 @@ -620,7 +619,7 @@ com.fasterxml.jackson jackson-bom - ${jackson.core.version} + ${jackson.version} import pom From 7fd5f591fd7474354f3993f38a090826d6782877 Mon Sep 17 00:00:00 2001 From: capistrant Date: Sat, 20 Sep 2025 08:35:25 -0500 Subject: [PATCH 2/5] fix licenses --- licenses.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses.yaml b/licenses.yaml index 58b46faa9a21..9d6c516e0677 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -860,7 +860,7 @@ name: kubernetes fabric java client license_category: binary module: extensions-core/kubernetes-overlord-extensions license_name: Apache License version 2.0 -version: 7.2.0 +version: 7.4.0 libraries: - io.fabric8: kubernetes-client-api - io.fabric8: kubernetes-model-batch From ffaa8de1988582c14a3695a0737f81247ce5df0e Mon Sep 17 00:00:00 2001 From: capistrant Date: Mon, 22 Sep 2025 09:12:03 -0500 Subject: [PATCH 3/5] Fix licenses --- licenses.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses.yaml b/licenses.yaml index 9d6c516e0677..fe0531ba4696 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -1069,7 +1069,7 @@ name: org.snakeyaml snakeyaml-engine license_category: binary module: extensions-core/druid-kubernetes-overlord-extensions license_name: Apache License version 2.0 -version: 2.9 +version: 2.10 libraries: - org.snakeyaml: snakeyaml-engine @@ -1079,7 +1079,7 @@ name: org.yaml snakeyaml license_category: binary module: extensions-core/druid-kubernetes-overlord-extensions license_name: Apache License version 2.0 -version: 2.3 +version: 2.4 libraries: - org.yaml: snakeyaml From 74524e5d02cd05f041d1ba15a0375f6fe8cdfbf3 Mon Sep 17 00:00:00 2001 From: capistrant Date: Wed, 24 Sep 2025 12:14:26 -0500 Subject: [PATCH 4/5] 2.10 was getting parsed as 2.1, breaking the license checks --- licenses.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/licenses.yaml b/licenses.yaml index fe0531ba4696..fd5f2fc3dbf5 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -1062,14 +1062,13 @@ libraries: - io.prometheus: simpleclient_tracer_otel - io.prometheus: simpleclient_tracer_otel_agent - --- name: org.snakeyaml snakeyaml-engine license_category: binary -module: extensions-core/druid-kubernetes-overlord-extensions +module: extensions-core/kubernetes-overlord-extensions license_name: Apache License version 2.0 -version: 2.10 +version: "2.10" libraries: - org.snakeyaml: snakeyaml-engine @@ -1077,7 +1076,7 @@ libraries: name: org.yaml snakeyaml license_category: binary -module: extensions-core/druid-kubernetes-overlord-extensions +module: extensions-core/kubernetes-overlord-extensions license_name: Apache License version 2.0 version: 2.4 libraries: From 0c3a2259fcb6e70cdef4bffcdb05741a9e2debd5 Mon Sep 17 00:00:00 2001 From: capistrant Date: Wed, 24 Sep 2025 18:03:01 -0500 Subject: [PATCH 5/5] Centralize fabric8 version definition --- embedded-tests/pom.xml | 6 +++--- extensions-core/kubernetes-overlord-extensions/pom.xml | 3 --- pom.xml | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/embedded-tests/pom.xml b/embedded-tests/pom.xml index fb83b4c7421b..3407b6831a83 100644 --- a/embedded-tests/pom.xml +++ b/embedded-tests/pom.xml @@ -374,19 +374,19 @@ io.fabric8 kubernetes-model-core - 7.2.0 + ${fabric8.version} test io.fabric8 kubernetes-client-api - 7.2.0 + ${fabric8.version} test io.fabric8 kubernetes-client - 7.2.0 + ${fabric8.version} test diff --git a/extensions-core/kubernetes-overlord-extensions/pom.xml b/extensions-core/kubernetes-overlord-extensions/pom.xml index d70cfa356c34..100c6dc88ec1 100644 --- a/extensions-core/kubernetes-overlord-extensions/pom.xml +++ b/extensions-core/kubernetes-overlord-extensions/pom.xml @@ -34,9 +34,6 @@ ../../pom.xml - - 7.4.0 - diff --git a/pom.xml b/pom.xml index 535e4878a623..1d715b72b98b 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,7 @@ 10.14.2.0 4.2.22 2.35.1 + 7.4.0 8.5.4 32.1.3-jre 5.1.0