Merge branch 'integration' into bugfix/groupByCounts

.github/CODEOWNERS

@@ -0,0 +1,7 @@
+
+# In order to ensure the query microservices are consistent with the wildfly webservice, we need
+# to ensure that changes made to QueryExecutorBean match QueryManagementService, and changes made
+# to LookupUUIDUtil match LookupService in the Query Service.
+QueryExecutorBean.java @jwomeara
+LookupUUIDUtil.java @jwomeara
+RunningQuery.java @jwomeara

.github/workflows/tests.yml

@@ -171,4 +171,3 @@ jobs:
     #     docker tag ${IMAGE_NAME}:${TAG} ${REMOTE_IMAGE_NAME}:${TAG}
     #     docker images
     #     docker push ${REMOTE_IMAGE_NAME}:${TAG}
-

.gitmodules

@@ -61,3 +61,24 @@
 [submodule "microservices/microservice-service-parent"]
 	path = microservices/microservice-service-parent
 	url = [email protected]:NationalSecurityAgency/datawave-service-parent.git
+[submodule "contrib/datawave-utils"]
+	path = contrib/datawave-utils
+	url = [email protected]:NationalSecurityAgency/datawave-utils.git
+[submodule "microservices/starters/query"]
+	path = microservices/starters/query
+	url = [email protected]:NationalSecurityAgency/datawave-spring-boot-starter-query.git
+[submodule "microservices/services/query"]
+	path = microservices/services/query
+	url = [email protected]:NationalSecurityAgency/datawave-query-service.git
+[submodule "microservices/services/query-executor"]
+	path = microservices/services/query-executor
+	url = [email protected]:NationalSecurityAgency/datawave-query-executor-service.git
+[submodule "microservices/services/modification"]
+	path = microservices/services/modification
+	url = [email protected]:NationalSecurityAgency/datawave-modification-service.git
+[submodule "microservices/services/mapreduce-query"]
+	path = microservices/services/mapreduce-query
+	url = [email protected]:NationalSecurityAgency/datawave-mapreduce-query-service.git
+[submodule "microservices/starters/cached-results"]
+	path = microservices/starters/cached-results
+	url = [email protected]:NationalSecurityAgency/datawave-spring-boot-starter-cached-results.git

.mvn/maven-build-cache-config.xml

@@ -71,6 +71,22 @@
                         <goal>install</goal>
                     </goals>
                 </goalsList>
+                <goalsList artifactId="docker-maven-plugin">
+                    <goals>
+                        <goal>build</goal>
+                        <goal>push</goal>
+                    </goals>
+                </goalsList>
+                <goalsList artifactId="maven-resources-plugin">
+                    <goals>
+                        <goal>copy-resources</goal>
+                    </goals>
+                </goalsList>
+                <goalsList artifactId="spring-boot-maven-plugin">
+                    <goals>
+                        <goal>repackage</goal>
+                    </goals>
+                </goalsList>
             </goalsLists>
         </runAlways>
         <reconcile logAllProperties="true">

README.md

@@ -56,5 +56,9 @@ mvn -Pdocker,dist -DskipMicroservices clean install -T 1C
 git submodule deinit --all
 ```
 
+### DataWave Microservices
+
+For more information about deploying the datawave quickstart and microservices, check out the [Docker Readme](docker/README.md#usage)
+
 [li]: http://img.shields.io/badge/license-ASL-blue.svg
 [ll]: https://www.apache.org/licenses/LICENSE-2.0

checkstyle.xml

@@ -2,13 +2,14 @@
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
   <property name="charset" value="UTF-8"/>
+  <property name="severity" value="info"/>
+  <property name="basedir" value="${basedir}"/>
   <module name="TreeWalker">
-    <!--check that only Accumulo 1.9 public APIs are imported-->
-    <module name="RegexpSinglelineJava">
-<!--      <property name="format" value="import\s+org\.apache\.accumulo\.(.*\.(impl|thrift|crypto)\..*|(?!core|minicluster|testing).*|core\.(?!client|conf|data|security|spi|iterators).*)"/>-->
-      <property name="format" value="import\s+org\.apache\.accumulo\.(?!(core\.(client|data|iterators|security)|minicluster|hadoop)\.).*" />
-      <property name="ignoreComments" value="true" />
-      <property name="message" value="Accumulo non-public classes imported" />
+    <!--check that only Accumulo 2.1.x public APIs are imported-->
+    <module name="ImportControl">
+        <!--Allows per-package enforcement for importing Accumulo 2.1.x public APIs -->
+        <property name="file" value="${basedir}/import-control-accumulo.xml"/>
+        <property name="severity" value="warning"/>
     </module>
   </module>
 </module>

common-test/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-parent</artifactId>
-        <version>6.13.0-SNAPSHOT</version>
+        <version>7.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-common-test</artifactId>
     <name>${project.artifactId}</name>

contrib/datawave-quickstart/.gitignore

@@ -28,4 +28,4 @@
 !docker
 !docker/**
 
-docker/target/**
+docker/target/**

contrib/datawave-quickstart/bin/common.sh

@@ -2,6 +2,7 @@ BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "${BIN_DIR}/logging.sh"
 source "${BIN_DIR}/query.sh"
+source "${BIN_DIR}/modification.sh"
 
 # Upon uninstall, tarballs will be preserved in place by default.
 # To remove them, use DW_UNINSTALL_RM_BINARIES_FLAG_*