Merge remote-tracking branch 'origin/release/accumulo-2.1' into featu…

…re/spring-boot-2.x-accumulo-2.1
NationalSecurityAgency · Mar 10, 2023 · ecab8e6 · ecab8e6
2 parents 924239f + 8ce91d2
commit ecab8e6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -18,10 +18,10 @@ jobs:
     steps:
     - name: Checkout Code
       uses: actions/checkout@v1
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - uses: actions/cache@v1
       with:
         path: ~/.m2/repository
@@ -43,10 +43,10 @@ jobs:
     steps:
     - name: Checkout Code
       uses: actions/checkout@v1
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - uses: actions/cache@v1
       with:
         path: ~/.m2/repository

diff --git a/client/pom.xml b/client/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>3.0</version>
+        <version>3.1-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>hazelcast-client</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <url>https://code.nsa.gov/datawave-hazelcast-service</url>
     <scm>
         <connection>scm:git:https://github.com/NationalSecurityAgency/datawave-hazelcast-service.git</connection>
@@ -18,7 +18,7 @@
     </scm>
     <properties>
         <version.hazelcast-kubernetes>2.2.3</version.hazelcast-kubernetes>
-        <version.microservice.hazelcast>2.0-SNAPSHOT</version.microservice.hazelcast>
+        <version.microservice.hazelcast>3.0-SNAPSHOT</version.microservice.hazelcast>
     </properties>
     <dependencyManagement>
         <dependencies>

diff --git a/common/pom.xml b/common/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>3.0</version>
+        <version>3.1-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>hazelcast-common</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <url>https://code.nsa.gov/datawave-hazelcast-service</url>
     <scm>
         <connection>scm:git:https://github.com/NationalSecurityAgency/datawave-hazelcast-service.git</connection>
@@ -17,7 +17,7 @@
         <url>https://github.com/NationalSecurityAgency/datawave-hazelcast-service</url>
     </scm>
     <properties>
-        <version.microservice.starter>2.0-SNAPSHOT</version.microservice.starter>
+        <version.microservice.starter>3.0-SNAPSHOT</version.microservice.starter>
     </properties>
     <dependencies>
         <dependency>

diff --git a/common/src/test/java/datawave/microservice/cached/HazelcastCacheInspectorTest.java b/common/src/test/java/datawave/microservice/cached/HazelcastCacheInspectorTest.java
@@ -97,6 +97,8 @@ public static class InspectorConfiguration {
         public HazelcastInstance hazelcastInstance() {
             Config config = new Config();
             config.setClusterName(UUID.randomUUID().toString());
+            config.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(false);
+            config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false);
             return Hazelcast.newHazelcastInstance(config);
         }
     }

diff --git a/pom.xml b/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-parent</artifactId>
-        <version>2.0</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../../microservice-parent/pom.xml</relativePath>
     </parent>
     <artifactId>hazelcast-service-parent</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>https://code.nsa.gov/datawave-hazelcast-service</url>
     <modules>

diff --git a/service/pom.xml b/service/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>3.0</version>
+        <version>3.1-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>hazelcast-service</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <description>DATAWAVE Hazelcast Server</description>
     <url>https://code.nsa.gov/datawave-hazelcast-service</url>
     <scm>
@@ -20,8 +20,8 @@
     <properties>
         <start-class>datawave.microservice.cached.server.HazelcastService</start-class>
         <version.hazelcast-kubernetes>2.2.3</version.hazelcast-kubernetes>
-        <version.microservice.hazelcast-common>2.0-SNAPSHOT</version.microservice.hazelcast-common>
-        <version.zookeeper>3.6.3</version.zookeeper>
+        <version.microservice.hazelcast-common>3.0-SNAPSHOT</version.microservice.hazelcast-common>
+        <version.zookeeper>3.8.0</version.zookeeper>
     </properties>
     <dependencyManagement>
         <dependencies>