diff --git a/operator-framework-core/pom.xml b/operator-framework-core/pom.xml
index e1dc2f7db2..0ead5bab7f 100644
--- a/operator-framework-core/pom.xml
+++ b/operator-framework-core/pom.xml
@@ -14,6 +14,10 @@
Core framework for implementing Kubernetes operators
+
+ io.github.java-diff-utils
+ java-diff-utils
+
io.fabric8
kubernetes-client
@@ -58,6 +62,7 @@
org.assertj
assertj-core
+ test
io.fabric8
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java
index 7bf3e07999..94a991f62d 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java
@@ -14,7 +14,6 @@
import java.util.SortedMap;
import java.util.TreeMap;
-import org.assertj.core.util.diff.DiffUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +26,9 @@
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.processing.LoggingUtils;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.UnifiedDiffUtils;
+
/**
* Matches the actual state on the server vs the desired state. Based on the managedFields of SSA.
*
@@ -123,12 +125,13 @@ private String getDiff(Map prunedActualMap, Map
var actualYaml = serialization.asYaml(sortMap(prunedActualMap));
var desiredYaml = serialization.asYaml(sortMap(desiredMap));
if (log.isTraceEnabled()) {
- log.trace("Pruned actual resource: \n{} \ndesired resource: \n{} ", actualYaml, desiredYaml);
+ log.trace("Pruned actual resource: \n {} \ndesired resource: \n {} ", actualYaml,
+ desiredYaml);
}
var patch = DiffUtils.diff(actualYaml.lines().toList(), desiredYaml.lines().toList());
List unifiedDiff =
- DiffUtils.generateUnifiedDiff("", "", actualYaml.lines().toList(), patch, 1);
+ UnifiedDiffUtils.generateUnifiedDiff("", "", actualYaml.lines().toList(), patch, 1);
return String.join("\n", unifiedDiff);
}
diff --git a/pom.xml b/pom.xml
index ea33898000..0983f34b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
3.1.8
0.9.11
2.16.1
+ 4.12
2.11
3.12.1
@@ -161,6 +162,11 @@
${mokito.version}
+
+ io.github.java-diff-utils
+ java-diff-utils
+ ${java.diff.version}
+
org.slf4j
slf4j-api