#24851 removing classes, tests, dependencies

dotCMS · Aug 3, 2023 · 6ed80b7 · 6ed80b7
1 parent 0956cf6
commit 6ed80b7
Show file tree

Hide file tree

Showing 23 changed files with 9 additions and 2,490 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -791,21 +791,10 @@
                Cluster Support
              *****************************
            -->
-            <dependency>
-                <groupId>com.hazelcast</groupId>
-                <artifactId>hazelcast-all</artifactId>
-                <version>3.12.13</version>
-            </dependency>
-            <dependency>
-                <groupId>com.hazelcast</groupId>
-                <artifactId>hazelcast-kubernetes</artifactId>
-                <version>1.2.2</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.hazelcast</groupId>
-                        <artifactId>hazelcast</artifactId>
-                    </exclusion>
-                </exclusions>
+           <dependency>
+                <groupId>dnsjava</groupId>
+                <artifactId>dnsjava</artifactId>
+                <version>2.1.8</version>
             </dependency>
 
             <dependency>

diff --git a/dotCMS/dependencies.gradle b/dotCMS/dependencies.gradle
@@ -140,10 +140,6 @@ dependencies {
     }
     implementation (group: 'com.graphql-java', name: 'java-dataloader', version: '2.1.1'){}
     implementation (group: 'com.h2database', name: 'h2', version: '1.3.176'){}
-    implementation (group: 'com.hazelcast', name: 'hazelcast-all', version: '3.12.13'){}
-    implementation (group: 'com.hazelcast', name: 'hazelcast-kubernetes', version: '1.2.2') {
-        exclude group: 'com.hazelcast', module: 'hazelcast'
-    }
     implementation (group: 'com.impossibl.pgjdbc-ng', name: 'pgjdbc-ng', version: '0.8.9'){}
     implementation (group: 'com.impossibl.pgjdbc-ng', name: 'spy', version: '0.8.9'){}
     implementation (group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'){}

diff --git a/dotCMS/pom.xml b/dotCMS/pom.xml
@@ -631,12 +631,8 @@
          *****************************
        -->
         <dependency>
-            <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast-kubernetes</artifactId>
+            <groupId>dnsjava</groupId>
+            <artifactId>dnsjava</artifactId>
         </dependency>
 
         <dependency>

diff --git a/dotCMS/src/integration-test/java/com/dotcms/MainSuite.java b/dotCMS/src/integration-test/java/com/dotcms/MainSuite.java
@@ -411,7 +411,6 @@
         com.dotmarketing.business.VersionableAPITest.class,
         com.dotmarketing.business.UserAPITest.class,
         com.dotmarketing.business.portal.PortletAPIImplTest.class,
-        com.dotmarketing.business.cache.provider.guava.CachePerformanceTest.class,
         com.dotmarketing.business.web.LanguageWebApiTest.class,
         com.dotmarketing.business.IdentifierFactoryTest.class,
         com.dotmarketing.business.IdentifierAPITest.class,

diff --git a/dotCMS/src/integration-test/java/com/dotcms/MainSuite2a.java b/dotCMS/src/integration-test/java/com/dotcms/MainSuite2a.java
@@ -120,7 +120,6 @@
         com.dotmarketing.business.VersionableAPITest.class,
         com.dotmarketing.business.UserAPITest.class,
         com.dotmarketing.business.portal.PortletAPIImplTest.class,
-        com.dotmarketing.business.cache.provider.guava.CachePerformanceTest.class,
         com.dotmarketing.business.web.LanguageWebApiTest.class,
         com.dotmarketing.business.IdentifierFactoryTest.class,
         com.dotmarketing.business.IdentifierAPITest.class,

diff --git a/...ration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java b/...ration-test/java/com/dotmarketing/business/cache/provider/guava/CachePerformanceTest.java
diff --git a/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties b/dotCMS/src/integration-test/resources/it-dotmarketing-config.properties
@@ -517,8 +517,6 @@ cache.contentletcache.chain     =com.dotmarketing.business.cache.provider.caffin
 cache.velocitycache.chain       =com.dotmarketing.business.cache.provider.caffine.CaffineCache,com.dotmarketing.business.cache.provider.h22.H22Cache
 cache.vanityurlcache.chain      =com.dotmarketing.business.cache.provider.timedcache.TimedCacheProvider
 cache.cachedvanityurlgroup.chain=com.dotmarketing.business.cache.provider.timedcache.TimedCacheProvider
-#cache.default.chain=com.dotmarketing.business.cache.provider.hazelcast.HazelcastCacheProviderEmbedded
-#cache.default.chain=com.dotmarketing.business.cache.provider.hazelcast.HazelcastCacheProviderClient
 
 CACHE_INVALIDATION_TRANSPORT_CLASS=com.dotmarketing.business.jgroups.NullTransport