Merge branch 'develop' into gh-2602-port-log4j-replacement-to-gaffer-1

gchq · Mar 23, 2022 · 476a8ed · 476a8ed
2 parents 52d3f20 + bef66a1
commit 476a8ed
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 7 deletions.
diff --git a/library/cache-library/hazelcast-cache-service/pom.xml b/library/cache-library/hazelcast-cache-service/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>3.8</version>
+            <version>5.1.1</version>
         </dependency>
 
         <dependency>

diff --git a/...y/hazelcast-cache-service/src/main/java/uk/gov/gchq/gaffer/cache/impl/HazelcastCache.java b/...y/hazelcast-cache-service/src/main/java/uk/gov/gchq/gaffer/cache/impl/HazelcastCache.java
@@ -16,7 +16,7 @@
 
 package uk.gov.gchq.gaffer.cache.impl;
 
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 
 import uk.gov.gchq.gaffer.cache.ICache;
 import uk.gov.gchq.gaffer.cache.exception.CacheOperationException;

diff --git a/...zelcast-cache-service/src/test/java/uk/gov/gchq/gaffer/cache/impl/HazelcastCacheTest.java b/...zelcast-cache-service/src/test/java/uk/gov/gchq/gaffer/cache/impl/HazelcastCacheTest.java
@@ -18,7 +18,7 @@
 
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/library/cache-library/hazelcast-cache-service/src/test/resources/hazelcast.xml b/library/cache-library/hazelcast-cache-service/src/test/resources/hazelcast.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <hazelcast xmlns="http://www.hazelcast.com/schema/config">
-    <group>
-        <name>test</name>
-        <password>password</password>
-    </group>
+    <cluster-name>test</cluster-name>
     <network>
         <port port-count="3" auto-increment="true">34562</port>
     </network>

diff --git a/store-implementation/hbase-store/README.md b/store-implementation/hbase-store/README.md
@@ -14,6 +14,11 @@ limitations under the License.
 
 The master copy of this page is the README in the hbase-store module.
 
+Deprecated
+===================
+The HBase Store has been [deprecated](https://github.com/gchq/Gaffer/issues/2556). It will be deleted during the Gaffer 2 development process and Gaffer v2.0.0 will not have a HBase Store implementation included with it.  
+
+
 HBase Store
 ===================
 

diff --git a/store-implementation/hbase-store/src/main/java/uk/gov/gchq/gaffer/hbasestore/HBaseStore.java b/store-implementation/hbase-store/src/main/java/uk/gov/gchq/gaffer/hbasestore/HBaseStore.java
@@ -92,7 +92,10 @@
  * the rowId. This is to enable an edge to be found in a Range scan when providing
  * only one end of the edge.
  * </p>
+ * @deprecated
+ * The HBase Store will be removed in Gaffer v2.0.0.
  */
+@Deprecated
 public class HBaseStore extends Store {
     public static final Set<StoreTrait> TRAITS =
             Collections.unmodifiableSet(Sets.newHashSet(

diff --git a/store-implementation/parquet-store/README.md b/store-implementation/parquet-store/README.md
@@ -12,6 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+# Deprecated
+The Parquet Store has been [deprecated](https://github.com/gchq/Gaffer/issues/2604). It will be deleted during the Gaffer 2 development process and Gaffer v2.0.0 will not have a Parquet Store implementation included with it.  
+
 # Parquet Store
 
 Contents:

diff --git a/...lementation/parquet-store/src/main/java/uk/gov/gchq/gaffer/parquetstore/ParquetStore.java b/...lementation/parquet-store/src/main/java/uk/gov/gchq/gaffer/parquetstore/ParquetStore.java
@@ -97,7 +97,10 @@
  * It is designed to make the most of the Parquet file types by serialising the {@link Element}s using
  * {@link uk.gov.gchq.gaffer.parquetstore.serialisation.ParquetSerialiser}s which also allows for Gaffer objects to be
  * stored as multiple or nested columns of primitive types.
+ * @deprecated
+ * The Parquet Store will be removed in Gaffer v2.0.0.
  */
+@Deprecated
 public class ParquetStore extends Store {
     public static final String GROUP = "group";
     public static final String GRAPH = "graph";