Merge pull request #5494 from tkafalas/feature

[BACKLOG-39451] Remove ehcache-core jar from build. Causing conflict…
pentaho · Jan 8, 2024 · 01bfb5f · 01bfb5f
2 parents 3dbe8d2 + a6a7f56
commit 01bfb5f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 39 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -453,12 +453,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
-      <version>${ehcache-core.version}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.mozilla</groupId>
       <artifactId>rhino</artifactId>

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -534,18 +534,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
-      <version>${ehcache-core.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>

diff --git a/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/CacheManager.java b/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/CacheManager.java
@@ -14,13 +14,14 @@
  * See the GNU Lesser General Public License for more details.
  *
  *
- * Copyright (c) 2002-2023 Hitachi Vantara. All rights reserved.
+ * Copyright (c) 2002-2024 Hitachi Vantara. All rights reserved.
  *
  */
 
 package org.pentaho.platform.plugin.services.cache;
 
 import net.sf.ehcache.Ehcache;
+import net.sf.ehcache.management.CacheStatistics;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.dom4j.Element;
@@ -505,18 +506,13 @@ public long getElementCountInRegionCache( String region ) {
       Ehcache ehcache = hvcache.getStorageAccess().getCache();
       if ( hvcache != null ) {
         try {
-          long memCnt = ehcache.getStatistics().getMemoryStoreObjectCount();
-          long discCnt = ehcache.getStatistics().getDiskStoreObjectCount();
-          return memCnt + discCnt;
+          CacheStatistics cacheStatistics = new CacheStatistics( ehcache );
+          return cacheStatistics.getMemoryStoreObjectCount() + cacheStatistics.getDiskStoreObjectCount();
         } catch ( Exception ignored ) {
-          return -1;
         }
-      } else {
-        return -1;
       }
-    } else {
-      return -1;
     }
+    return -1;
   }
 
   @Override

diff --git a/pom.xml b/pom.xml
@@ -147,7 +147,6 @@
     <gdata-client-meta.version>1.0</gdata-client-meta.version>
     <owasp.encoder.version>1.2</owasp.encoder.version>
     <powermock.version>1.6.3</powermock.version>
-    <ehcache-core.version>2.5.1</ehcache-core.version>
     <mockito-core.version>4.0.0</mockito-core.version>
     <apacheds.version>1.5.5</apacheds.version>
     <jcommon.version>1.0.16</jcommon.version>

diff --git a/repository/pom.xml b/repository/pom.xml
@@ -460,17 +460,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
-      <version>${ehcache-core.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>