[EAK-490] Updated AnyDiff dependency

exadel-inc · Apr 12, 2024 · 66b3c5e · 66b3c5e
1 parent b7a1c0b
commit 66b3c5e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/it.tests/pom.xml b/it.tests/pom.xml
@@ -132,7 +132,7 @@
         </dependency>
         <dependency>
             <groupId>com.exadel.etoolbox</groupId>
-            <artifactId>etoolbox-coconut-core</artifactId>
+            <artifactId>etoolbox-anydiff-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/it.tests/src/test/java/com/exadel/aem/toolkit/regression/ComparisonUtil.java b/it.tests/src/test/java/com/exadel/aem/toolkit/regression/ComparisonUtil.java
@@ -30,11 +30,11 @@
 import org.junit.Assert;
 
 import com.exadel.aem.toolkit.core.CoreConstants;
-import com.exadel.etoolbox.coconut.Comparator;
-import com.exadel.etoolbox.coconut.OutputType;
-import com.exadel.etoolbox.coconut.diff.Diff;
-import com.exadel.etoolbox.coconut.filter.Filter;
-import com.exadel.etoolbox.coconut.filter.FilterFactory;
+import com.exadel.etoolbox.anydiff.AnyDiff;
+import com.exadel.etoolbox.anydiff.OutputType;
+import com.exadel.etoolbox.anydiff.diff.Diff;
+import com.exadel.etoolbox.anydiff.filter.Filter;
+import com.exadel.etoolbox.anydiff.filter.FilterFactory;
 
 class ComparisonUtil {
 
@@ -51,7 +51,7 @@ static boolean isMatch(Path oldDirectory, Path newDirectory, List<String> filter
             RegressionTest.LOG.info("There are no different packages");
             return true;
         }
-        Comparator comparator = new Comparator()
+        AnyDiff comparator = new AnyDiff()
             .left(oldPackages, "Expected")
             .right(newPackages, "Actual")
             .filter(PACKAGE_FILTER);
@@ -69,7 +69,7 @@ static boolean isMatch(Path oldDirectory, Path newDirectory, List<String> filter
             differences = comparator.compare();
         }
 
-        boolean result = Comparator.isMatch(differences);
+        boolean result = AnyDiff.isMatch(differences);
         if (!differences.isEmpty()) {
             report(differences);
         }

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -110,7 +110,7 @@
         </dependency>
         <dependency>
             <groupId>com.exadel.etoolbox</groupId>
-            <artifactId>etoolbox-coconut-core</artifactId>
+            <artifactId>etoolbox-anydiff-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/plugin/src/test/com/exadel/aem/toolkit/plugin/maven/RenderingUtil.java b/plugin/src/test/com/exadel/aem/toolkit/plugin/maven/RenderingUtil.java
@@ -29,11 +29,11 @@
 import com.exadel.aem.toolkit.plugin.sources.ComponentSource;
 import com.exadel.aem.toolkit.plugin.sources.Sources;
 import com.exadel.aem.toolkit.plugin.writers.PackageWriter;
-import com.exadel.etoolbox.coconut.Comparator;
-import com.exadel.etoolbox.coconut.OutputType;
-import com.exadel.etoolbox.coconut.diff.Diff;
-import com.exadel.etoolbox.coconut.diff.DiffEntry;
-import com.exadel.etoolbox.coconut.filter.Filter;
+import com.exadel.etoolbox.anydiff.AnyDiff;
+import com.exadel.etoolbox.anydiff.OutputType;
+import com.exadel.etoolbox.anydiff.diff.Diff;
+import com.exadel.etoolbox.anydiff.diff.DiffEntry;
+import com.exadel.etoolbox.anydiff.filter.Filter;
 
 class RenderingUtil {
 
@@ -59,13 +59,13 @@ public static boolean doTest(
 
         PackageWriter.forFileSystem(fileSystem, TestConstants.DEFAULT_PROJECT_NAME).write(testable);
 
-        List<Diff> differences = new Comparator()
+        List<Diff> differences = new AnyDiff()
             .left(sampleFilesPath, "Expected")
             .right(effectiveCreatedFilesPath, "Actual")
             .filter(XML_NAMESPACE_FILTER)
             .compare();
 
-        boolean result = Comparator.isMatch(differences);
+        boolean result = AnyDiff.isMatch(differences);
         if (!result) {
             reportDifferences(differences);
         }

diff --git a/pom.xml b/pom.xml
@@ -461,8 +461,8 @@
             </dependency>
             <dependency>
                 <groupId>com.exadel.etoolbox</groupId>
-                <artifactId>etoolbox-coconut-core</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <artifactId>etoolbox-anydiff-core</artifactId>
+                <version>1.0.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.exadel.etoolbox</groupId>
         <artifactId>etoolbox-authoring-kit</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.5.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>etoolbox-authoring-kit-ui.apps</artifactId>