From 871b0e765aa048fe4e5867163da057c3693b9181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= <mvavrik@redhat.com>
Date: Thu, 20 Jul 2023 16:53:44 +0200
Subject: [PATCH 1/2] Bump Quarkus to 3.2.1.Final

---
 .github/workflows/pr.yaml | 3 +--
 pom.xml                   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 6eb72e6ca..9bb34decd 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -18,9 +18,8 @@ jobs:
           check-latest: true
           cache: 'maven'
       - name: Build with Maven
-        # TODO: remove 'quarkus.bootstrap.effective-model-builder' property when issue get fixed: https://github.com/quarkusio/quarkus/issues/34787
         run: |
-          mvn -V -B -s .github/mvn-settings.xml verify -Pframework,examples -Dvalidate-format -DskipTests -DskipITs -Dquarkus.bootstrap.effective-model-builder
+          mvn -V -B -s .github/mvn-settings.xml verify -Pframework,examples -Dvalidate-format -DskipTests -DskipITs
   quarkus-main-build:
     name: Quarkus main build
     runs-on: ubuntu-latest
diff --git a/pom.xml b/pom.xml
index 5ab2a80c1..fd54e3edc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
         <impsort-maven-plugin.version>1.9.0</impsort-maven-plugin.version>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-        <quarkus.platform.version>3.2.0.Final</quarkus.platform.version>
+        <quarkus.platform.version>3.2.1.Final</quarkus.platform.version>
         <exclude.tests.with.tags>quarkus-cli</exclude.tests.with.tags>
         <include.tests>**/*IT.java</include.tests>
         <exclude.openshift.tests>**/OpenShift*IT.java</exclude.openshift.tests>

From 2dcde731d47ed77c43a8552623a5cd236c24edfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= <mvavrik@redhat.com>
Date: Thu, 20 Jul 2023 16:55:13 +0200
Subject: [PATCH 2/2] Revert "Fix calls to methods broken by fabric8 update"

This reverts commit 54afffa709c9ff9ae8703ad555614b51bea967e4.
---
 .../bootstrap/inject/OpenShiftClient.java     | 27 +++----------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java b/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java
index 58d9b2ba6..ebd539bed 100644
--- a/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java
+++ b/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java
@@ -17,9 +17,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -58,7 +55,6 @@
 import io.fabric8.kubernetes.client.dsl.ContainerResource;
 import io.fabric8.kubernetes.client.dsl.NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable;
 import io.fabric8.kubernetes.client.dsl.PodResource;
-import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.openshift.api.model.DeploymentConfig;
 import io.fabric8.openshift.api.model.ImageStream;
@@ -962,26 +958,9 @@ private boolean doCreateProject(String projectName) {
     }
 
     private List<HasMetadata> loadYaml(String template) {
-        NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> metadata = loadUsingDarkArtsOfReflection(
-                client, new ByteArrayInputStream(template.getBytes()));
-        return metadata.items();
-    }
-
-    /*
-     * todo replace the only call of this method with client.load(new ByteArrayInputStream(...)
-     * when https://github.com/quarkusio/quarkus/pull/33767 got released (probably 3.2.0)
-     * verification: mvn clean install -Pframework \
-     * && mvn clean verify -Popenshift,examples -pl examples/https/ -Dquarkus.platform.version=999-SNAPSHOT
-     */
-    private NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> loadUsingDarkArtsOfReflection(
-            OpenShiftClientImpl client, ByteArrayInputStream stream) {
-        try {
-            Method method = KubernetesClientImpl.class.getDeclaredMethod("load", InputStream.class);
-            Object metadata = method.invoke(client, stream);
-            return (NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata>) metadata;
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
+        NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load = client
+                .load(new ByteArrayInputStream(template.getBytes()));
+        return load.items();
     }
 
     private String generateRandomProjectName() {