From 541f7b6ec3e4b638ad8b07af835465be6662bc89 Mon Sep 17 00:00:00 2001 From: Carles Arnal Date: Thu, 7 Nov 2024 15:27:37 +0100 Subject: [PATCH] Align operator sdk version with quarkus --- .../partials/getting-started/ref-registry-all-configs.adoc | 5 +++++ .../apicurio/registry/operator/api/v1/status/Conditions.java | 3 +-- pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 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 index 82679453f9..f577ec0606 100644 --- 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 index 14b413a078..542ee82308 100644 --- 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 index 3ecaae87a4..349157a0d3 100644 --- a/pom.xml +++ b/pom.xml @@ -147,8 +147,8 @@ 3.15.1 - 6.7.1 - 4.9.6 + 6.8.4 + 4.9.5