From 6c7b1407c56689a24b219de13f8d3412449202a9 Mon Sep 17 00:00:00 2001
From: Chris Laprun <claprun@redhat.com>
Date: Sat, 2 Dec 2023 14:39:35 +0100
Subject: [PATCH] fix: stay on Quarkus < 3.5 for 6.4 as we need to stay with
 Fabric8 6.7.2

Signed-off-by: Chris Laprun <claprun@redhat.com>
---
 .github/project.yml                                  |  4 ++--
 .github/workflows/build.yml                          |  2 +-
 .../deployment/builders/CsvManifestsBuilder.java     | 12 ++++++------
 docs/modules/ROOT/pages/includes/attributes.adoc     |  2 +-
 pom.xml                                              |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/project.yml b/.github/project.yml
index e6ba012f5..9fbdf0b9d 100644
--- a/.github/project.yml
+++ b/.github/project.yml
@@ -1,5 +1,5 @@
 name: Java Operator SDK Extension
 release:
-  current-version: 6.4.0
-  next-version: 6.4.1-SNAPSHOT
+  current-version: 6.4.1
+  next-version: 6.4.2-SNAPSHOT
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5adc7b78d..346c1be1c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
     uses: ./.github/workflows/build-for-quarkus-version.yml
     with:
 #      quarkus-version-jq-cmd: ${{ matrix.quarkus-version-jq-cmd }}
-      quarkus-version: 3.6.0.CR1
+      quarkus-version: 3.4.3
       java-version: ${{ matrix.java-version }}
       branch: ${{ needs.extract-branch-name.outputs.branch_name }}
       native-modules: "integration-tests"
diff --git a/bundle-generator/deployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/builders/CsvManifestsBuilder.java b/bundle-generator/deployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/builders/CsvManifestsBuilder.java
index 1d2ab1fdd..89b13d7bd 100644
--- a/bundle-generator/deployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/builders/CsvManifestsBuilder.java
+++ b/bundle-generator/deployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/builders/CsvManifestsBuilder.java
@@ -284,13 +284,13 @@ public byte[] getManifestData(List<ServiceAccount> serviceAccounts, List<Cluster
         return YAML_MAPPER.writeValueAsBytes(csv);
     }
 
-    private void handleDeployments(List<Deployment> deployments, NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
+    private void handleDeployments(List<Deployment> deployments, NamedInstallStrategyFluent.SpecNested<?> installSpec) {
         deployments.forEach(deployment -> handleDeployment(deployment, installSpec));
     }
 
     private void handlePermissions(List<ClusterRole> clusterRoles, List<RoleBinding> roleBindings, List<Role> roles,
             String defaultServiceAccountName,
-            NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
+            NamedInstallStrategyFluent.SpecNested<?> installSpec) {
         Map<String, List<PolicyRule>> customPermissionRules = new HashMap<>();
         if (metadata.permissionRules != null) {
             for (CSVMetadataHolder.PermissionRule permissionRule : metadata.permissionRules) {
@@ -323,7 +323,7 @@ private void handlePermissions(List<ClusterRole> clusterRoles, List<RoleBinding>
     private void handleClusterPermissions(List<ClusterRoleBinding> clusterRoleBindings, List<ClusterRole> clusterRoles,
             List<Role> roles,
             String defaultServiceAccountName,
-            NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
+            NamedInstallStrategyFluent.SpecNested<?> installSpec) {
         for (ClusterRoleBinding binding : clusterRoleBindings) {
             String serviceAccountName = findServiceAccountFromSubjects(binding.getSubjects(), defaultServiceAccountName);
             if (NO_SERVICE_ACCOUNT.equals(serviceAccountName)) {
@@ -336,7 +336,7 @@ private void handleClusterPermissions(List<ClusterRoleBinding> clusterRoleBindin
         }
     }
 
-    private void handleDeployment(Deployment deployment, NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
+    private void handleDeployment(Deployment deployment, NamedInstallStrategyFluent.SpecNested<?> installSpec) {
         if (deployment != null) {
             final var deploymentName = deployment.getMetadata().getName();
             var deploymentSpec = deployment.getSpec();
@@ -375,7 +375,7 @@ private void handleDeployment(Deployment deployment, NamedInstallStrategyFluent<
     }
 
     private void handlerPermission(List<PolicyRule> rules, String serviceAccountName,
-            NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
+            NamedInstallStrategyFluent.SpecNested<?> installSpec) {
         if (!rules.isEmpty()) {
             Predicate<StrategyDeploymentPermissionsBuilder> sameServiceAccountName = p -> serviceAccountName
                     .equals(p.getServiceAccountName());
@@ -394,7 +394,7 @@ private void handlerPermission(List<PolicyRule> rules, String serviceAccountName
 
     private void handleClusterPermission(List<PolicyRule> rules,
             String serviceAccountName,
-            NamedInstallStrategyFluent<?>.SpecNested<?> installSpec) {
+            NamedInstallStrategyFluent.SpecNested<?> installSpec) {
 
         Predicate<StrategyDeploymentPermissionsBuilder> sameServiceAccountName = p -> serviceAccountName
                 .equals(p.getServiceAccountName());
diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
index ee2c53037..610a0b220 100644
--- a/docs/modules/ROOT/pages/includes/attributes.adoc
+++ b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,3 +1,3 @@
-:project-version: 6.4.0
+:project-version: 6.4.1
 
 :examples-dir: ./../examples/
diff --git a/pom.xml b/pom.xml
index 5e8ec3102..11f767221 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   <packaging>pom</packaging>
   <name>Quarkus - Operator SDK - Parent</name>
   <properties>
-    <quarkus.version>3.5.2</quarkus.version>
+    <quarkus.version>3.4.3</quarkus.version>
     <java-operator-sdk.version>4.5.0</java-operator-sdk.version>
   </properties>
   <scm>