From d1662844f8f98f31b1e69d6c88a197eafc35dec9 Mon Sep 17 00:00:00 2001
From: Halil Sener <halil.sener@datadoghq.com>
Date: Thu, 11 Jul 2024 11:22:58 +0200
Subject: [PATCH 1/3] Move `optional` tags to module POMs

---
 extended/pom.xml |  5 +++++
 pom.xml          | 12 +++++++++---
 spring/pom.xml   |  7 ++++++-
 util/pom.xml     |  5 ++++-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/extended/pom.xml b/extended/pom.xml
index a32d1aaef7..bb70936c34 100644
--- a/extended/pom.xml
+++ b/extended/pom.xml
@@ -34,6 +34,11 @@
             <artifactId>client-java-api-fluent</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient</artifactId>
+            <optional>${prometheus.client.optional}</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/pom.xml b/pom.xml
index 79eb95b8ad..5198e4cd31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,15 @@
     <prometheus.client.version>0.16.0</prometheus.client.version>
     <reflections.version>0.10.2</reflections.version>
 
+    <!-- The `optional` tag in `dependencyManagement` is not inherited; see
+    https://issues.apache.org/jira/browse/MNG-5227 and
+    https://issues.apache.org/jira/browse/MNG-5632. Therefore, we specify
+    optional dependencies here to manage them in a single location. -->
+    <prometheus.client.optional>true</prometheus.client.optional>
+    <com.amazonaws.aws-java-sdk-sts.optional>true</com.amazonaws.aws-java-sdk-sts.optional>
+    <com.google.auth.google-auth-library-oauth2-http.optional>true</com.google.auth.google-auth-library-oauth2-http.optional>
+    <org.springframework.boot.spring-boot-actuator.optional>true</org.springframework.boot.spring-boot-actuator.optional>
+
     <e2e.skip>true</e2e.skip>
 
     <gpg.keyname>48540ECBBF00A28EACCF04E720FD12AFB0C9EBA9</gpg.keyname>
@@ -185,19 +194,16 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-actuator</artifactId>
         <version>${spring.boot.version}</version>
-        <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>io.prometheus</groupId>
         <artifactId>simpleclient</artifactId>
         <version>${prometheus.client.version}</version>
-        <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>io.prometheus</groupId>
         <artifactId>simpleclient_httpserver</artifactId>
         <version>${prometheus.client.version}</version>
-        <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
diff --git a/spring/pom.xml b/spring/pom.xml
index 1237846d05..cef8d9d8cf 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -26,7 +26,11 @@
       <artifactId>client-java-extended</artifactId>
       <version>${project.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient</artifactId>
+      <optional>${prometheus.client.optional}</optional>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot</artifactId>
@@ -38,6 +42,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-actuator</artifactId>
+      <optional>${org.springframework.boot.spring-boot-actuator.optional}</optional>
     </dependency>
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
diff --git a/util/pom.xml b/util/pom.xml
index 732fea4288..55177c0c4b 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -15,10 +15,12 @@
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>
+            <optional>${prometheus.client.optional}</optional>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient_httpserver</artifactId>
+            <optional>${prometheus.client.optional}</optional>
         </dependency>
         <dependency>
             <groupId>io.kubernetes</groupId>
@@ -65,6 +67,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-sts</artifactId>
+            <optional>${com.amazonaws.aws-java-sdk-sts.optional}</optional>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -86,7 +89,7 @@
         <dependency>
             <groupId>com.google.auth</groupId>
             <artifactId>google-auth-library-oauth2-http</artifactId>
-            <optional>true</optional>
+            <optional>${com.google.auth.google-auth-library-oauth2-http.optional}</optional>
         </dependency>
         <!-- test dependencies -->
         <dependency>

From b42e50dfd6d2718d2801c48a0396cccb315e1384 Mon Sep 17 00:00:00 2001
From: Babak <b.abdollahi.kh@gmail.com>
Date: Tue, 13 Aug 2024 07:11:54 -0700
Subject: [PATCH 2/3] use optional variables

---
 pom.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5198e4cd31..6a1115b998 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,8 @@
     <com.amazonaws.aws-java-sdk-sts.optional>true</com.amazonaws.aws-java-sdk-sts.optional>
     <com.google.auth.google-auth-library-oauth2-http.optional>true</com.google.auth.google-auth-library-oauth2-http.optional>
     <org.springframework.boot.spring-boot-actuator.optional>true</org.springframework.boot.spring-boot-actuator.optional>
+    <com.microsoft.azure.adal4j.optional>true</com.microsoft.azure.adal4j.optional>
+    <com.fasterxml.jackson.core.jackson-annotations.optional>true</com.fasterxml.jackson.core.jackson-annotations.optional>
 
     <e2e.skip>true</e2e.skip>
 
@@ -152,13 +154,13 @@
         <groupId>com.microsoft.azure</groupId>
         <artifactId>adal4j</artifactId>
         <version>1.6.7</version>
-        <optional>true</optional>
+        <optional>${com.microsoft.azure.adal4j.optional}</optional>
       </dependency>
       <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-sts</artifactId>
         <version>1.12.746</version>
-        <optional>true</optional>
+        <optional>${com.amazonaws.aws-java-sdk-sts.optional}</optional>
       </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
@@ -254,13 +256,13 @@
         <groupId>com.google.auth</groupId>
         <artifactId>google-auth-library-oauth2-http</artifactId>
         <version>1.23.0</version>
-        <optional>true</optional>
+        <optional>${com.google.auth.google-auth-library-oauth2-http.optional}</optional>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
         <version>2.17.1</version>
-        <optional>true</optional>
+        <optional>${com.fasterxml.jackson.core.jackson-annotations.optional}</optional>
       </dependency>
 
       <!-- tests -->

From 3601df90859c33c0628a05ea58c3a06acebacb84 Mon Sep 17 00:00:00 2001
From: Babak <b.abdollahi.kh@gmail.com>
Date: Tue, 13 Aug 2024 07:12:27 -0700
Subject: [PATCH 3/3] Fix parent pom version for fluent-gen

---
 fluent-gen/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fluent-gen/pom.xml b/fluent-gen/pom.xml
index 5d669f287f..9277d0d2d3 100644
--- a/fluent-gen/pom.xml
+++ b/fluent-gen/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>io.kubernetes</groupId>
     <artifactId>client-java-parent</artifactId>
-    <version>21.0.0-legacy-SNAPSHOT</version>
+    <version>21.0.1-legacy-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>