From 2b82f81fc927771cf5a71e8422633c1eb504e785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Fri, 20 Sep 2024 09:05:30 +0200 Subject: [PATCH] fix: cleanup after rebase on main MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../processing/dependent/workflow/WorkflowTest.java | 2 +- pom.xml | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowTest.java index 203c1714f2..b8d90a45ad 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowTest.java @@ -12,8 +12,8 @@ import io.javaoperatorsdk.operator.sample.simple.TestCustomResource; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertThrows; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; diff --git a/pom.xml b/pom.xml index 325a64a215..d36c1e440a 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,6 @@ 4.2.0 2.7.3 1.13.3 - 4.12.0 3.1.8 0.9.11 2.16.1 @@ -198,16 +197,6 @@ operator-framework ${project.version} - - com.squareup.okhttp3 - logging-interceptor - ${okhttp.version} - - - com.squareup.okhttp3 - mockwebserver - ${okhttp.version} - com.github.ben-manes.caffeine caffeine