mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-02-22 07:09:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to Quarkus 3.2.9 (#24842) (#24850)

Browse Source 
* Update to Quarkus 3.2.9 (#24842)

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>
Signed-off-by: Václav Muzikář <vmuzikar@redhat.com>
# Conflicts:
#	pom.xml

* Fix missing CRD metadata in Operator CSV (#25043)

Closed #24984

Signed-off-by: Václav Muzikář <vmuzikar@redhat.com>

(cherry picked from commit 040124bfa7)
Signed-off-by: Václav Muzikář <vmuzikar@redhat.com>

* Downgrade Oracle driver

Closes #24983

Signed-off-by: Václav Muzikář <vmuzikar@redhat.com>
(cherry picked from commit 1be51ee510)

---------

Signed-off-by: Václav Muzikář <vmuzikar@redhat.com>
This commit is contained in:
Václav Muzikář
2023-11-29 13:59:07 +01:00
committed by GitHub
parent 79650aeb75
commit a157df995e
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
operator/scripts/create-olm-bundle.sh
View File

@@ -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"

4
operator/src/main/java/org/keycloak/operator/controllers/KeycloakSharedCsvMetadata.java
View File

@@ -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",

2
operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/Keycloak.java
View File

@@ -22,7 +22,7 @@ import io.fabric8.kubernetes.model.annotation.Group;
import io.fabric8.kubernetes.model.annotation.Plural;
import io.fabric8.kubernetes.model.annotation.ShortNames;
import io.fabric8.kubernetes.model.annotation.Version;
import io.quarkiverse.operatorsdk.bundle.runtime.CSVMetadata;
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import org.keycloak.operator.Constants;

2
operator/src/main/java/org/keycloak/operator/crds/v2alpha1/realmimport/KeycloakRealmImport.java
View File

@@ -23,7 +23,7 @@ import io.fabric8.kubernetes.model.annotation.Group;
import io.fabric8.kubernetes.model.annotation.Version;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import io.quarkiverse.operatorsdk.bundle.runtime.CSVMetadata;
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
import org.keycloak.operator.Constants;
import org.keycloak.representations.idm.ComponentExportRepresentation;
import org.keycloak.representations.idm.GroupRepresentation;

10
pom.xml
View File

@@ -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>
@@ -92,9 +92,9 @@
<cxf.jaxrs.version>3.3.10</cxf.jaxrs.version>
<cxf.undertow.version>3.3.10</cxf.undertow.version>
<dom4j.version>2.1.3</dom4j.version>
<h2.version>2.2.220</h2.version>
<hibernate-orm.plugin.version>6.2.7.Final</hibernate-orm.plugin.version>
<hibernate.c3p0.version>6.2.7.Final</hibernate.c3p0.version>
<h2.version>2.2.224</h2.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>