feat(content cleanup) : Automatically prune File Asset versions excee…

…ding a configurable limit #26188 (#26350) * fix(content cleanup) : Automatically prune File Asset versions exceeding a configurable limit #26188 * Implementing SonarQube feedback. * Implementing SonarQube feedback. * Fixing test class name.
dotCMS · Nov 6, 2023 · 1ad9a6e · 1ad9a6e
1 parent 8e298b1
commit 1ad9a6e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/dotCMS/src/integration-test/java/com/dotcms/MainSuite2b.java b/dotCMS/src/integration-test/java/com/dotcms/MainSuite2b.java
@@ -146,11 +146,17 @@
 import com.dotmarketing.startup.runonce.Task230328AddMarkedForDeletionColumnTest;
 import com.dotmarketing.startup.runonce.Task230426AlterVarcharLengthOfLockedByColTest;
 import com.dotmarketing.startup.runonce.Task230523CreateVariantFieldInContentletIntegrationTest;
+<<<<<<< HEAD
 import com.dotmarketing.startup.runonce.Task230922AddPublishDateToContentletVersionInfoTest;
 import com.dotmarketing.startup.runonce.Task230701AddHashIndicesToWorkflowTablesTest;
 import com.dotmarketing.startup.runonce.Task230707CreateSystemTableTest;
 import com.dotmarketing.startup.runonce.Task230713IncreaseDisabledWysiwygColumnSizeTest;
 import com.dotmarketing.startup.runonce.Task230922AddPublishDateToContentletVersionInfoTest;
+=======
+import com.dotmarketing.startup.runonce.Task230701AddHashIndicesToWorkflowTablesTest;
+import com.dotmarketing.startup.runonce.Task230707CreateSystemTableTest;
+import com.dotmarketing.startup.runonce.Task230713IncreaseDisabledWysiwygColumnSizeTest;
+>>>>>>> 64ac9bdb36 (feat(content cleanup) : Automatically prune File Asset versions exceeding a configurable limit #26188 (#26350))
 import com.dotmarketing.util.MaintenanceUtilTest;
 import com.dotmarketing.util.ResourceCollectorUtilTest;
 import com.dotmarketing.util.UtilMethodsITest;