From 3bc7ef7ed5283a8535a1e5607753d46c7bc5785a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Muzik=C3=A1=C5=99?= <vmuzikar@redhat.com>
Date: Mon, 20 Nov 2023 14:27:13 +0100
Subject: [PATCH] Update to Quarkus 3.2.9 (#24842)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #24841
Closes #24160

Signed-off-by: Václav Muzikář <vmuzikar@redhat.com>
Co-authored-by: Bruno Oliveira da Silva <bruno@abstractj.com>
Co-authored-by: Alexander Schwartz <aschwart@redhat.com>
---
 operator/scripts/create-olm-bundle.sh                  |  1 -
 .../controllers/KeycloakSharedCsvMetadata.java         |  4 ++--
 pom.xml                                                | 10 +++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/operator/scripts/create-olm-bundle.sh b/operator/scripts/create-olm-bundle.sh
index f94879402c..0fac9c1cb3 100755
--- a/operator/scripts/create-olm-bundle.sh
+++ b/operator/scripts/create-olm-bundle.sh
@@ -67,7 +67,6 @@ yq ea -i '.spec.apiservicedefinitions = {}' "$CSV_PATH"
 yq ea -i '.spec.install.spec.deployments[0].spec.selector.matchLabels.name = "keycloak-operator"' "$CSV_PATH"
 yq ea -i '.spec.install.spec.deployments[0].spec.template.metadata.labels.name = "keycloak-operator"' "$CSV_PATH"
 
-yq ea -i '.spec.install.spec.deployments[0].spec.template.spec.containers[0].env += [{"name": "QUARKUS_OPERATOR_SDK_NAMESPACES", "valueFrom": {"fieldRef": {"fieldPath": "metadata.annotations['"'"'olm.targetNamespaces'"'"']"}}}]' "$CSV_PATH"
 yq ea -i '.spec.install.spec.deployments[0].spec.template.spec.containers[0].env += [{"name": "POD_NAME", "valueFrom": {"fieldRef": {"fieldPath": "metadata.name"}}}]' "$CSV_PATH"
 yq ea -i '.spec.install.spec.deployments[0].spec.template.spec.containers[0].env += [{"name": "OPERATOR_NAME", "value": "keycloak-operator"}]' "$CSV_PATH"
 
diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakSharedCsvMetadata.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakSharedCsvMetadata.java
index 0465cfc86d..211e8ee4a4 100644
--- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakSharedCsvMetadata.java
+++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakSharedCsvMetadata.java
@@ -16,8 +16,8 @@
  */
 package org.keycloak.operator.controllers;
 
-import io.quarkiverse.operatorsdk.bundle.runtime.CSVMetadata;
-import io.quarkiverse.operatorsdk.bundle.runtime.SharedCSVMetadata;
+import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
+import io.quarkiverse.operatorsdk.annotations.SharedCSVMetadata;
 
 @CSVMetadata(
     version = "KCOP_NEXT",
diff --git a/pom.xml b/pom.xml
index af7c81fb3b..ec94a24831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,8 @@
         <jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id>
         <jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url>
 
-        <quarkus.version>3.2.7.Final</quarkus.version>
-        <quarkus.build.version>3.2.7.Final</quarkus.build.version>
+        <quarkus.version>3.2.9.Final</quarkus.version>
+        <quarkus.build.version>3.2.9.Final</quarkus.build.version>
 
         <project.build-time>${timestamp}</project.build-time>
 
@@ -93,8 +93,8 @@
         <cxf.undertow.version>3.3.10</cxf.undertow.version>
         <dom4j.version>2.1.3</dom4j.version>
         <h2.version>2.2.224</h2.version>
-        <hibernate-orm.plugin.version>6.2.7.Final</hibernate-orm.plugin.version>
-        <hibernate.c3p0.version>6.2.7.Final</hibernate.c3p0.version>
+        <hibernate-orm.plugin.version>6.2.13.Final</hibernate-orm.plugin.version>
+        <hibernate.c3p0.version>6.2.13.Final</hibernate.c3p0.version>
         <infinispan.version>14.0.19.Final</infinispan.version>
         <infinispan.protostream.processor.version>4.6.5.Final</infinispan.protostream.processor.version>
 
@@ -166,7 +166,7 @@
         <mssql-jdbc.version>12.2.0.jre11</mssql-jdbc.version>
         <oracledb.version>19.3</oracledb.version>
         <!-- this is the oracle driver version also used in the Quarkus BOM -->
-        <oracle-jdbc.version>23.2.0.0</oracle-jdbc.version>
+        <oracle-jdbc.version>23.3.0.23.09</oracle-jdbc.version>
 
         <!-- Test -->
         <greenmail.version>2.1.0-alpha-1</greenmail.version>