rebase on next

Author: csviri

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java

@@ -9,8 +9,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
-import io.javaoperatorsdk.operator.processing.dependent.EmptyTestDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.EmptyTestDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java

@@ -239,7 +239,7 @@ public Builder withPortForward(String namespace, String labelKey, String labelVa
 
 
     public Builder withAdditionalCustomResourceDefinition(
-            Class<? extends CustomResource> customResource) {
+        Class<? extends CustomResource> customResource) {
       additionalCustomResourceDefinitions.add(customResource);
       return this;
     }