Align operator sdk version with quarkus

Apicurio · Nov 13, 2024 · 541f7b6 · 541f7b6
1 parent c3ad7fb
commit 541f7b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/docs/modules/ROOT/partials/getting-started/ref-registry-all-configs.adoc b/docs/modules/ROOT/partials/getting-started/ref-registry-all-configs.adoc
@@ -709,6 +709,11 @@ The following {registry} configuration options are available for each component
 |
 |
 |Kafka sql storage bootstrap servers
+|`apicurio.kafkasql.consumer.group-prefix`
+|`string`
+|`apicurio-`
+|
+|Kafka sql storage prefix for consumer group name
 |`apicurio.kafkasql.consumer.poll.timeout`
 |`integer`
 |`5000`

diff --git a/operator/model/src/main/java/io/apicurio/registry/operator/api/v1/status/Conditions.java b/operator/model/src/main/java/io/apicurio/registry/operator/api/v1/status/Conditions.java
@@ -1,7 +1,6 @@
 package io.apicurio.registry.operator.api.v1.status;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -39,7 +38,7 @@ public class Conditions implements KubernetesResource {
     @Required()
     @JsonPropertyDescription("lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.")
     @JsonSetter(nulls = Nulls.SKIP)
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
     @SchemaFrom(type = String.class)
     private Instant lastTransitionTime;
 

diff --git a/pom.xml b/pom.xml
@@ -147,8 +147,8 @@
     <quarkus.version>3.15.1</quarkus.version>
     <!-- Go to `io.quarkiverse.operatorsdk:quarkus-operator-sdk-bom` and then to the parent `io.quarkiverse.operatorsdk:quarkus-operator-sdk-parent`. -->
     <!-- TODO: Fix: Currently, versions are not aligned exactly (3.11.1 vs 3.11.0), because there is no closer version supported by QOSDK. -->
-    <quarkus-operator-sdk.version>6.7.1</quarkus-operator-sdk.version>
-    <java-operator-sdk.version>4.9.6</java-operator-sdk.version>
+    <quarkus-operator-sdk.version>6.8.4</quarkus-operator-sdk.version>
+    <java-operator-sdk.version>4.9.5</java-operator-sdk.version>
     <!-- /WARNING -->
 
     <!-- Jandex -->