From 66b3754b64b81ea7df321a3a67ccd16c0406e670 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 28 Nov 2022 12:49:57 +0100 Subject: [PATCH 1/2] chore: own version to 4.2.0-SNAPSHOT --- micrometer-support/pom.xml | 2 +- operator-framework-core/pom.xml | 2 +- .../processing/event/source/informer/InformerManager.java | 6 +----- .../event/source/informer/ManagedInformerEventSource.java | 3 ++- operator-framework-junit5/pom.xml | 2 +- operator-framework/pom.xml | 2 +- pom.xml | 2 +- sample-operators/leader-election/pom.xml | 2 +- sample-operators/mysql-schema/pom.xml | 2 +- sample-operators/pom.xml | 2 +- sample-operators/tomcat-operator/pom.xml | 2 +- sample-operators/webpage/pom.xml | 2 +- 12 files changed, 13 insertions(+), 16 deletions(-) diff --git a/micrometer-support/pom.xml b/micrometer-support/pom.xml index 8378720ed8..c541810f47 100644 --- a/micrometer-support/pom.xml +++ b/micrometer-support/pom.xml @@ -5,7 +5,7 @@ java-operator-sdk io.javaoperatorsdk - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/operator-framework-core/pom.xml b/operator-framework-core/pom.xml index 65de6f8323..e885984058 100644 --- a/operator-framework-core/pom.xml +++ b/operator-framework-core/pom.xml @@ -6,7 +6,7 @@ io.javaoperatorsdk java-operator-sdk - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java index c996aa2c0e..4d7d547356 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java @@ -1,10 +1,6 @@ package io.javaoperatorsdk.operator.processing.event.source.informer; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java index 34e1c9f876..43173a28f7 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java @@ -32,7 +32,7 @@ public abstract class ManagedInformerEventSource implements ResourceEventHandler, Cache, IndexerResourceCache, RecentOperationCacheFiller, - NamespaceChangeable, InformerWrappingEventSourceHealthIndicator, Configurable { + NamespaceChangeable, InformerWrappingEventSourceHealthIndicator, Configurable { private static final Logger log = LoggerFactory.getLogger(ManagedInformerEventSource.class); @@ -155,6 +155,7 @@ public Status getStatus() { public ResourceConfiguration getInformerConfiguration() { return configuration; } + @Override public C configuration() { return manager().configuration(); diff --git a/operator-framework-junit5/pom.xml b/operator-framework-junit5/pom.xml index 891aab5c96..94ac00cacb 100644 --- a/operator-framework-junit5/pom.xml +++ b/operator-framework-junit5/pom.xml @@ -5,7 +5,7 @@ java-operator-sdk io.javaoperatorsdk - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml index 27efa90b55..7b2c68639f 100644 --- a/operator-framework/pom.xml +++ b/operator-framework/pom.xml @@ -5,7 +5,7 @@ java-operator-sdk io.javaoperatorsdk - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index a9070ebf06..34006aeeef 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.javaoperatorsdk java-operator-sdk - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT Operator SDK for Java Java SDK for implementing Kubernetes operators pom diff --git a/sample-operators/leader-election/pom.xml b/sample-operators/leader-election/pom.xml index a0f996983d..82fdd327ac 100644 --- a/sample-operators/leader-election/pom.xml +++ b/sample-operators/leader-election/pom.xml @@ -7,7 +7,7 @@ io.javaoperatorsdk sample-operators - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT sample-leader-election diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml index 888a93abb5..4f98b6c1ba 100644 --- a/sample-operators/mysql-schema/pom.xml +++ b/sample-operators/mysql-schema/pom.xml @@ -7,7 +7,7 @@ io.javaoperatorsdk sample-operators - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT sample-mysql-schema-operator diff --git a/sample-operators/pom.xml b/sample-operators/pom.xml index 61e2ecae15..54c3efc2da 100644 --- a/sample-operators/pom.xml +++ b/sample-operators/pom.xml @@ -7,7 +7,7 @@ io.javaoperatorsdk java-operator-sdk - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT sample-operators diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml index 1db82bf079..8a1cc0b00e 100644 --- a/sample-operators/tomcat-operator/pom.xml +++ b/sample-operators/tomcat-operator/pom.xml @@ -7,7 +7,7 @@ io.javaoperatorsdk sample-operators - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT sample-tomcat-operator diff --git a/sample-operators/webpage/pom.xml b/sample-operators/webpage/pom.xml index 31b9b6a5b8..0f847b8f6f 100644 --- a/sample-operators/webpage/pom.xml +++ b/sample-operators/webpage/pom.xml @@ -7,7 +7,7 @@ io.javaoperatorsdk sample-operators - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT sample-webpage-operator From 8a604a667b2b8eb07624f39f2b18617c37e61db4 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 28 Nov 2022 12:53:32 +0100 Subject: [PATCH 2/2] fix --- operator-framework-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator-framework-bom/pom.xml b/operator-framework-bom/pom.xml index 6b22c02bbb..7c435928ae 100644 --- a/operator-framework-bom/pom.xml +++ b/operator-framework-bom/pom.xml @@ -5,7 +5,7 @@ io.javaoperatorsdk operator-framework-bom - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT Operator SDK - Bill of Materials pom Java SDK for implementing Kubernetes operators