Merge branch 'V5-develop' into V6-develop

Author: sanluan

publiccms-parent/publiccms-cache/src/main/java/com/publiccms/common/redis/hibernate/RedisStrategyRegistrationProviderImpl.java

@@ -10,18 +10,16 @@
 
 public class RedisStrategyRegistrationProviderImpl implements StrategyRegistrationProvider {
     @Override
-    @SuppressWarnings({ "rawtypes" })
-    public Iterable<StrategyRegistration> getStrategyRegistrations() {
-        final List<StrategyRegistration> strategyRegistrations = new ArrayList<>();
+    public Iterable<StrategyRegistration<?>> getStrategyRegistrations() {
+        final List<StrategyRegistration<?>> strategyRegistrations = new ArrayList<>();
 
-        strategyRegistrations.add(new SimpleStrategyRegistrationImpl<RegionFactory>(RegionFactory.class,
-                RedisRegionFactory.class, "redis", RedisRegionFactory.class.getName(),
-                RedisRegionFactory.class.getSimpleName(), "com.publiccms.common.redis.hibernate.RedisRegionFactory"));
+        strategyRegistrations.add(new SimpleStrategyRegistrationImpl<RegionFactory>(RegionFactory.class, RedisRegionFactory.class,
+                "redis", RedisRegionFactory.class.getName(), RedisRegionFactory.class.getSimpleName(),
+                "com.publiccms.common.redis.hibernate.RedisRegionFactory"));
 
         strategyRegistrations.add(new SimpleStrategyRegistrationImpl<RegionFactory>(RegionFactory.class,
                 SingletonRedisRegionFactory.class, "redis-singleton", SingletonRedisRegionFactory.class.getName(),
-                SingletonRedisRegionFactory.class.getSimpleName(),
-                "com.publiccms.common.redis.hibernate.RedisRegionFactory"));
+                SingletonRedisRegionFactory.class.getSimpleName(), "com.publiccms.common.redis.hibernate.RedisRegionFactory"));
 
         return strategyRegistrations;
     }

publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/search/CmsElasticsearchHttpClientConfigurer.java

@@ -1,8 +1,8 @@
 package com.publiccms.common.search;
 
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.hibernate.search.backend.elasticsearch.client.ElasticsearchHttpClientConfigurationContext;
-import org.hibernate.search.backend.elasticsearch.client.ElasticsearchHttpClientConfigurer;
+import org.hibernate.search.backend.elasticsearch.client.rest4.ElasticsearchHttpClientConfigurationContext;
+import org.hibernate.search.backend.elasticsearch.client.rest4.ElasticsearchHttpClientConfigurer;
 
 public class CmsElasticsearchHttpClientConfigurer implements ElasticsearchHttpClientConfigurer {