From f6d650deb1b3f4cee3c8c3e9fe4aa51c8973ed03 Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Tue, 9 Jan 2024 08:16:16 +0000
Subject: [PATCH] Exclude redundant kubernetes-client dependencies

Fixes #5515
---
 integration-tests/camel-k-runtime/pom.xml     |  5 ----
 integration-tests/kubernetes/pom.xml          |  5 ----
 integration-tests/master-openshift/pom.xml    | 24 ++++++++++++++-----
 poms/bom/pom.xml                              | 12 ++++++++++
 .../src/main/generated/flattened-full-pom.xml | 12 ++++++++++
 .../main/generated/flattened-reduced-pom.xml  | 12 ++++++++++
 .../flattened-reduced-verbose-pom.xml         | 12 ++++++++++
 7 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/integration-tests/camel-k-runtime/pom.xml b/integration-tests/camel-k-runtime/pom.xml
index fadacdd0fc2b..c64174cb5e2e 100644
--- a/integration-tests/camel-k-runtime/pom.xml
+++ b/integration-tests/camel-k-runtime/pom.xml
@@ -30,11 +30,6 @@
     <name>Camel Quarkus :: Integration Tests :: Camel K Runtime</name>
     <description>Integration tests for Camel Quarkus K Runtime extension</description>
 
-    <properties>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 -->
-        <ci.native.tests.skip>true</ci.native.tests.skip>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml
index 0b9cdc892fde..73b2bf3383f4 100644
--- a/integration-tests/kubernetes/pom.xml
+++ b/integration-tests/kubernetes/pom.xml
@@ -30,11 +30,6 @@
     <name>Camel Quarkus :: Integration Tests :: Kubernetes</name>
     <description>Integration tests for Camel Quarkus Kubernetes extension</description>
 
-    <properties>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 -->
-        <ci.native.tests.skip>true</ci.native.tests.skip>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/master-openshift/pom.xml b/integration-tests/master-openshift/pom.xml
index 3bb0e84ac17b..87b18901b730 100644
--- a/integration-tests/master-openshift/pom.xml
+++ b/integration-tests/master-openshift/pom.xml
@@ -30,12 +30,6 @@
     <name>Camel Quarkus :: Integration Tests :: Master With OpenShift</name>
     <description>Integration tests for Camel Quarkus Master extension with OpenShift</description>
 
-    <properties>
-        <quarkus.runner>${project.build.directory}/quarkus-app/quarkus-run.jar</quarkus.runner>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 -->
-        <ci.native.tests.skip>true</ci.native.tests.skip>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
@@ -68,6 +62,24 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-openshift-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-httpclient-okhttp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>openshift-model-hive</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>openshift-model-miscellaneous</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>openshift-model-operator</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- test dependencies -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 0f6ba0543661..824c129ff11e 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1679,6 +1679,18 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>kubernetes-httpclient-okhttp</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>openshift-model-hive</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>openshift-model-miscellaneous</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>openshift-model-operator</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index fdbfbbae4450..6ed679eeee39 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1617,6 +1617,18 @@
             <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
             <artifactId>kubernetes-httpclient-okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
           </exclusion>
+          <exclusion>
+            <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+            <artifactId>openshift-model-hive</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+          </exclusion>
+          <exclusion>
+            <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+            <artifactId>openshift-model-miscellaneous</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+          </exclusion>
+          <exclusion>
+            <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+            <artifactId>openshift-model-operator</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 1c6ff7fb9117..0f9187e76c82 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1617,6 +1617,18 @@
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-httpclient-okhttp</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>io.fabric8</groupId>
+            <artifactId>openshift-model-hive</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>io.fabric8</groupId>
+            <artifactId>openshift-model-miscellaneous</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>io.fabric8</groupId>
+            <artifactId>openshift-model-operator</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 834e85257c82..4a55d6a58b43 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -1617,6 +1617,18 @@
             <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
             <artifactId>kubernetes-httpclient-okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
           </exclusion>
+          <exclusion>
+            <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+            <artifactId>openshift-model-hive</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+          </exclusion>
+          <exclusion>
+            <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+            <artifactId>openshift-model-miscellaneous</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+          </exclusion>
+          <exclusion>
+            <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+            <artifactId>openshift-model-operator</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>