[LPD-40485 Ehcache] LPD-41245 Upgrade to Ehcache 3

modules/apps/dynamic-data-mapping/dynamic-data-mapping-data-provider-impl/src/main/resources/META-INF/module-multi-vm.xml

@@ -1,17 +1,14 @@
-<ehcache
-	dynamicConfig="true"
-	monitoring="off"
-	name="module-multi-vm"
-	updateCheck="false"
+<config
+	xmlns="http://www.ehcache.org/v3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://www.ehcache.org/ehcache.xsd"
+	xsi:schemaLocation="http://www.ehcache.org/v3 https://www.ehcache.org/schema/ehcache-core-3.10.xsd"
 >
 	<cache
-		eternal="false"
-		maxElementsInMemory="10000"
-		name="com.liferay.dynamic.data.mapping.data.provider.rest.internal.DDMRESTDataProvider"
-		overflowToDisk="false"
-		timeToIdleSeconds="600"
+		alias="com.liferay.dynamic.data.mapping.data.provider.rest.internal.DDMRESTDataProvider"
 	>
+		<expiry>
+			<tti>600</tti>
+		</expiry>
+		<heap>10000</heap>
 	</cache>
-</ehcache>
+</config>

modules/apps/ip-geocoder/ip-geocoder-impl/src/main/resources/META-INF/module-single-vm.xml

@@ -1,17 +1,14 @@
-<ehcache
-	dynamicConfig="true"
-	monitoring="off"
-	name="module-single-vm"
-	updateCheck="false"
+<config
+	xmlns="http://www.ehcache.org/v3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://www.ehcache.org/ehcache.xsd"
+	xsi:schemaLocation="http://www.ehcache.org/v3 https://www.ehcache.org/schema/ehcache-core-3.10.xsd"
 >
 	<cache
-		eternal="false"
-		maxElementsInMemory="100000"
-		name="com.liferay.ip.geocoder.internal.IPGeocoderImpl"
-		overflowToDisk="false"
-		timeToIdleSeconds="3600"
+		alias="com.liferay.ip.geocoder.internal.IPGeocoderImpl"
 	>
+		<expiry>
+			<tti>3600</tti>
+		</expiry>
+		<heap>100000</heap>
 	</cache>
-</ehcache>
+</config>

modules/apps/journal/journal-service/src/main/resources/META-INF/module-multi-vm.xml

@@ -1,17 +1,14 @@
-<ehcache
-	dynamicConfig="true"
-	monitoring="off"
-	name="module-multi-vm"
-	updateCheck="false"
+<config
+	xmlns="http://www.ehcache.org/v3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://www.ehcache.org/ehcache.xsd"
+	xsi:schemaLocation="http://www.ehcache.org/v3 https://www.ehcache.org/schema/ehcache-core-3.10.xsd"
 >
 	<cache
-		eternal="false"
-		maxElementsInMemory="10000"
-		name="com.liferay.journal.util.JournalContent"
-		overflowToDisk="false"
-		timeToIdleSeconds="600"
+		alias="com.liferay.journal.util.JournalContent"
 	>
+		<expiry>
+			<tti>600</tti>
+		</expiry>
+		<heap>10000</heap>
 	</cache>
-</ehcache>
+</config>

modules/apps/portal-cache/portal-cache-api/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: Liferay Portal Cache API
 Bundle-SymbolicName: com.liferay.portal.cache.api
-Bundle-Version: 12.2.1
+Bundle-Version: 13.0.0
 Export-Package:\
 	com.liferay.portal.cache,\
 	com.liferay.portal.cache.configuration,\

modules/apps/portal-cache/portal-cache-api/src/main/java/com/liferay/portal/cache/configuration/PortalCacheConfiguration.java

@@ -22,39 +22,39 @@ public class PortalCacheConfiguration {
 
 	public PortalCacheConfiguration(
 		String portalCacheName,
-		Set<Properties> portalCacheListenerPropertiesSet) {
+		Set<Properties> portalCacheReplicatorPropertiesSet) {
 
 		if (portalCacheName == null) {
 			throw new NullPointerException("Portal cache name is null");
 		}
 
 		_portalCacheName = portalCacheName;
 
-		if (portalCacheListenerPropertiesSet == null) {
-			_portalCacheListenerPropertiesSet = Collections.emptySet();
+		if (portalCacheReplicatorPropertiesSet == null) {
+			_portalCacheReplicatorPropertiesSet = Collections.emptySet();
 		}
 		else {
-			_portalCacheListenerPropertiesSet = new HashSet<>(
-				portalCacheListenerPropertiesSet);
+			_portalCacheReplicatorPropertiesSet = new HashSet<>(
+				portalCacheReplicatorPropertiesSet);
 		}
 	}
 
-	public Set<Properties> getPortalCacheListenerPropertiesSet() {
-		return _portalCacheListenerPropertiesSet;
-	}
-
 	public String getPortalCacheName() {
 		return _portalCacheName;
 	}
 
+	public Set<Properties> getPortalCacheReplicatorPropertiesSet() {
+		return _portalCacheReplicatorPropertiesSet;
+	}
+
 	public PortalCacheConfiguration newPortalCacheConfiguration(
 		String portalCacheName) {
 
 		return new PortalCacheConfiguration(
-			portalCacheName, _portalCacheListenerPropertiesSet);
+			portalCacheName, _portalCacheReplicatorPropertiesSet);
 	}
 
-	private final Set<Properties> _portalCacheListenerPropertiesSet;
 	private final String _portalCacheName;
+	private final Set<Properties> _portalCacheReplicatorPropertiesSet;
 
 }

modules/apps/portal-cache/portal-cache-api/src/main/java/com/liferay/portal/cache/configuration/PortalCacheManagerConfiguration.java

@@ -6,9 +6,7 @@
 package com.liferay.portal.cache.configuration;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -18,18 +16,9 @@
 public class PortalCacheManagerConfiguration {
 
 	public PortalCacheManagerConfiguration(
-		Set<Properties> portalCacheManagerListenerPropertiesSet,
 		PortalCacheConfiguration defaultPortalCacheConfiguration,
 		Set<PortalCacheConfiguration> portalCacheConfigurations) {
 
-		if (portalCacheManagerListenerPropertiesSet == null) {
-			_portalCacheManagerListenerPropertiesSet = Collections.emptySet();
-		}
-		else {
-			_portalCacheManagerListenerPropertiesSet = new HashSet<>(
-				portalCacheManagerListenerPropertiesSet);
-		}
-
 		_defaultPortalCacheConfiguration = defaultPortalCacheConfiguration;
 
 		if (portalCacheConfigurations != null) {
@@ -65,11 +54,6 @@ public PortalCacheConfiguration getPortalCacheConfiguration(
 		return portalCacheConfiguration;
 	}
 
-	public Set<Properties> getPortalCacheManagerListenerPropertiesSet() {
-		return Collections.unmodifiableSet(
-			_portalCacheManagerListenerPropertiesSet);
-	}
-
 	public Set<String> getPortalCacheNames() {
 		return Collections.unmodifiableSet(_portalCacheConfigurations.keySet());
 	}
@@ -91,6 +75,5 @@ public void setDefaultPortalCacheConfiguration(
 	private PortalCacheConfiguration _defaultPortalCacheConfiguration;
 	private final Map<String, PortalCacheConfiguration>
 		_portalCacheConfigurations = new ConcurrentHashMap<>();
-	private final Set<Properties> _portalCacheManagerListenerPropertiesSet;
 
 }

modules/apps/portal-cache/portal-cache-api/src/main/resources/com/liferay/portal/cache/configuration/packageinfo

@@ -1 +1 @@
-version 3.2.0
+version 4.0.0

modules/apps/portal-cache/portal-cache-api/src/main/resources/com/liferay/portal/cache/packageinfo

@@ -1 +1 @@
-version 11.0.0
+version 12.0.0

modules/apps/portal-cache/portal-cache-ehcache-impl/bnd.bnd

@@ -2,40 +2,4 @@ Bundle-Name: Liferay Portal Cache Ehcache Implementation
 Bundle-SymbolicName: com.liferay.portal.cache.ehcache.impl
 Bundle-Version: 4.0.35
 DynamicImport-Package: *
-Import-Package:\
-	!org.hibernate.*,\
-	\
-	!org.quartz,\
-	!org.quartz.impl,\
-	!org.quartz.impl.jdbcjobstore,\
-	!org.quartz.impl.matchers,\
-	!org.quartz.simpl,\
-	\
-	!org.terracotta.quartz,\
-	!org.terracotta.toolkit,\
-	!org.terracotta.toolkit.atomic,\
-	!org.terracotta.toolkit.builder,\
-	!org.terracotta.toolkit.cache,\
-	!org.terracotta.toolkit.cluster,\
-	!org.terracotta.toolkit.collections,\
-	!org.terracotta.toolkit.concurrent.locks,\
-	!org.terracotta.toolkit.config,\
-	!org.terracotta.toolkit.events,\
-	!org.terracotta.toolkit.feature,\
-	!org.terracotta.toolkit.internal,\
-	!org.terracotta.toolkit.internal.cache,\
-	!org.terracotta.toolkit.internal.cluster,\
-	!org.terracotta.toolkit.internal.collections,\
-	!org.terracotta.toolkit.internal.concurrent.locks,\
-	!org.terracotta.toolkit.internal.feature,\
-	!org.terracotta.toolkit.monitoring,\
-	!org.terracotta.toolkit.nonstop,\
-	!org.terracotta.toolkit.rejoin,\
-	!org.terracotta.toolkit.search,\
-	!org.terracotta.toolkit.search.attribute,\
-	!org.terracotta.toolkit.store,\
-	\
-	!sun.misc,\
-	\
-	*
 -dsannotations-options: inherit

modules/apps/portal-cache/portal-cache-ehcache-impl/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-	compileInclude group: "com.liferay", name: "net.sf.ehcache", version: "2.10.6.LIFERAY-PATCHED-2"
+	compileInclude group: "org.ehcache", name: "ehcache", version: "3.10.8"
 
 	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
 	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"