From ba1000ae714f2040f5899dc79cb252474aa9660e Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 1 Sep 2022 08:44:04 +0200 Subject: [PATCH 1/4] chore: clien to v6.1.0 --- .../java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java index 1bdad72c76..3dc896f57e 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java @@ -1,7 +1,5 @@ package io.javaoperatorsdk.operator; -import java.net.URI; - import org.junit.jupiter.api.Test; import io.fabric8.kubernetes.api.model.ContainerBuilder; From e5817d349328417ebc0753dfc31ce00373a0dade Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 1 Sep 2022 09:37:19 +0200 Subject: [PATCH 2/4] test fix --- .../java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java index 3dc896f57e..f3341211e7 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java @@ -1,5 +1,7 @@ package io.javaoperatorsdk.operator; +import java.net.URI; + import org.junit.jupiter.api.Test; import io.fabric8.kubernetes.api.model.ContainerBuilder; @@ -32,6 +34,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; + class ReconcilerUtilsTest { public static final String RESOURCE_URI = From 08351acdc3f088f9bb33aa1cf85ee4a3245b11c1 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 2 Sep 2022 09:27:23 +0200 Subject: [PATCH 3/4] fix: remove crd-generator-api dependencies --- operator-framework/pom.xml | 5 ----- sample-operators/leader-election/pom.xml | 4 ---- sample-operators/mysql-schema/pom.xml | 4 ---- sample-operators/tomcat-operator/pom.xml | 4 ---- sample-operators/webpage/pom.xml | 4 ---- 5 files changed, 21 deletions(-) diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml index 05e09d708e..f42be1af79 100644 --- a/operator-framework/pom.xml +++ b/operator-framework/pom.xml @@ -61,11 +61,6 @@ crd-generator-apt test - - io.fabric8 - crd-generator-api - test - org.apache.logging.log4j log4j-slf4j-impl diff --git a/sample-operators/leader-election/pom.xml b/sample-operators/leader-election/pom.xml index 8ae0e3e4ba..d6dde5058a 100644 --- a/sample-operators/leader-election/pom.xml +++ b/sample-operators/leader-election/pom.xml @@ -40,10 +40,6 @@ crd-generator-apt provided - - io.fabric8 - crd-generator-api - org.awaitility awaitility diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml index 3c1fd768d1..5bb6a0621a 100644 --- a/sample-operators/mysql-schema/pom.xml +++ b/sample-operators/mysql-schema/pom.xml @@ -47,10 +47,6 @@ crd-generator-apt provided - - io.fabric8 - crd-generator-api - org.apache.logging.log4j log4j-slf4j-impl diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml index b36caccc1d..dfd6e5338b 100644 --- a/sample-operators/tomcat-operator/pom.xml +++ b/sample-operators/tomcat-operator/pom.xml @@ -32,10 +32,6 @@ crd-generator-apt provided - - io.fabric8 - crd-generator-api - org.apache.logging.log4j log4j-slf4j-impl diff --git a/sample-operators/webpage/pom.xml b/sample-operators/webpage/pom.xml index 8a150ee29d..b8d3921cd0 100644 --- a/sample-operators/webpage/pom.xml +++ b/sample-operators/webpage/pom.xml @@ -40,10 +40,6 @@ crd-generator-apt provided - - io.fabric8 - crd-generator-api - org.awaitility awaitility From 4727366aba5a217081e25c8fd7bfa58bf4c4b040 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 2 Sep 2022 11:05:19 +0200 Subject: [PATCH 4/4] fix format --- .../java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java index f3341211e7..1bdad72c76 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java @@ -34,7 +34,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - class ReconcilerUtilsTest { public static final String RESOURCE_URI =