From 874db1e8f54da9d464c0c494a2a7838c9b48baea Mon Sep 17 00:00:00 2001
From: Sergey Nuyanzin <snuyanzin@gmail.com>
Date: Thu, 25 Jan 2024 10:46:55 +0100
Subject: [PATCH] [FLINK-34234] Add markBundledAsOptional

---
 flink-shaded-asm-9/pom.xml                                 | 4 ++++
 flink-shaded-guava-32/pom.xml                              | 1 +
 flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml | 7 +++++++
 .../flink-shaded-jackson-module-jsonSchema-2/pom.xml       | 4 ++++
 flink-shaded-netty-4/pom.xml                               | 1 +
 flink-shaded-netty-tcnative-dynamic/pom.xml                | 1 +
 flink-shaded-netty-tcnative-static/pom.xml                 | 1 +
 flink-shaded-swagger/pom.xml                               | 2 ++
 .../flink-shaded-zookeeper-35/pom.xml                      | 4 ++++
 .../flink-shaded-zookeeper-36/pom.xml                      | 5 +++++
 .../flink-shaded-zookeeper-37/pom.xml                      | 5 +++++
 .../flink-shaded-zookeeper-38/pom.xml                      | 5 +++++
 12 files changed, 40 insertions(+)

diff --git a/flink-shaded-asm-9/pom.xml b/flink-shaded-asm-9/pom.xml
index 1722471..d07c76a 100644
--- a/flink-shaded-asm-9/pom.xml
+++ b/flink-shaded-asm-9/pom.xml
@@ -43,24 +43,28 @@ under the License.
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
             <version>${asm.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
 
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
             <version>${asm.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
 
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-analysis</artifactId>
             <version>${asm.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
 
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-commons</artifactId>
             <version>${asm.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
     </dependencies>
 
diff --git a/flink-shaded-guava-32/pom.xml b/flink-shaded-guava-32/pom.xml
index 844447f..7bf5112 100644
--- a/flink-shaded-guava-32/pom.xml
+++ b/flink-shaded-guava-32/pom.xml
@@ -39,6 +39,7 @@ under the License.
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- this dependency is actually empty and appears to be some weird legacy artifact -->
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index aba2c59..80c3cd3 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -35,32 +35,39 @@ under the License.
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
         <dependency>
             <!--	Java 8 Date/time	-->
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
         <dependency>
             <!--	Java 8 Datatypes	-->
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jdk8</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
     </dependencies>
 
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index 3e0ce58..b9e6856 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -35,18 +35,22 @@ under the License.
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jsonSchema</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
     </dependencies>
 
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index af427d6..3a411a8 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -37,6 +37,7 @@ under the License.
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
             <version>${netty.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
     </dependencies>
 
diff --git a/flink-shaded-netty-tcnative-dynamic/pom.xml b/flink-shaded-netty-tcnative-dynamic/pom.xml
index 507b6df..6cb572b 100644
--- a/flink-shaded-netty-tcnative-dynamic/pom.xml
+++ b/flink-shaded-netty-tcnative-dynamic/pom.xml
@@ -43,6 +43,7 @@ under the License.
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative</artifactId>
             <version>${netty.tcnative.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
     </dependencies>
 
diff --git a/flink-shaded-netty-tcnative-static/pom.xml b/flink-shaded-netty-tcnative-static/pom.xml
index 55f9416..eec9f09 100644
--- a/flink-shaded-netty-tcnative-static/pom.xml
+++ b/flink-shaded-netty-tcnative-static/pom.xml
@@ -43,6 +43,7 @@ under the License.
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative-boringssl-static</artifactId>
             <version>${netty.tcnative.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
         </dependency>
     </dependencies>
 
diff --git a/flink-shaded-swagger/pom.xml b/flink-shaded-swagger/pom.xml
index cb6d9b7..13d3b63 100644
--- a/flink-shaded-swagger/pom.xml
+++ b/flink-shaded-swagger/pom.xml
@@ -37,6 +37,7 @@ under the License.
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-core</artifactId>
             <version>2.2.19</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -52,6 +53,7 @@ under the License.
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
                 <version>2.1</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
index 6b377b9..f3df990 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
@@ -41,6 +41,7 @@ under the License.
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -63,6 +64,7 @@ under the License.
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
             <version>${curator.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -114,6 +116,7 @@ under the License.
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -127,6 +130,7 @@ under the License.
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
index 1e073d9..2433959 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
@@ -41,6 +41,7 @@ under the License.
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -71,6 +72,7 @@ under the License.
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
             <version>3.2.5</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -88,6 +90,7 @@ under the License.
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
             <version>${curator.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -139,6 +142,7 @@ under the License.
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -152,6 +156,7 @@ under the License.
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
index 9d3fda0..5ef1e8e 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
@@ -41,6 +41,7 @@ under the License.
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -61,6 +62,7 @@ under the License.
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
             <version>4.1.12.1</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -73,6 +75,7 @@ under the License.
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
             <version>${curator.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -124,6 +127,7 @@ under the License.
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -137,6 +141,7 @@ under the License.
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
index 9935f81..80f38cf 100644
--- a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
+++ b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
@@ -41,6 +41,7 @@ under the License.
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -65,6 +66,7 @@ under the License.
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
             <version>4.1.12.1</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- Flink distribution provides logging classes -->
@@ -77,6 +79,7 @@ under the License.
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
             <version>${curator.version}</version>
+            <optional>${flink.markBundledAsOptional}</optional>
             <exclusions>
                 <exclusion>
                     <!-- not relevant at runtime -->
@@ -128,6 +131,7 @@ under the License.
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -141,6 +145,7 @@ under the License.
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
+                <optional>${flink.markBundledAsOptional}</optional>
             </dependency>
         </dependencies>
     </dependencyManagement>