diff --git a/common-test/pom.xml b/common-test/pom.xml index c340d1e48a..fbc23678c5 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-common-test ${project.artifactId} diff --git a/contrib/datawave-quickstart/docker/pom.xml b/contrib/datawave-quickstart/docker/pom.xml index de19a23c2d..4654e03c5d 100644 --- a/contrib/datawave-quickstart/docker/pom.xml +++ b/contrib/datawave-quickstart/docker/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT ../../../pom.xml quickstart diff --git a/core/cached-results/pom.xml b/core/cached-results/pom.xml index 9c5dbd86f1..55a29764ef 100644 --- a/core/cached-results/pom.xml +++ b/core/cached-results/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-core-cached-results ${project.artifactId} diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml index f7ee5e356f..69474bf072 100644 --- a/core/common-util/pom.xml +++ b/core/common-util/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-core-common-util ${project.artifactId} diff --git a/core/common/pom.xml b/core/common/pom.xml index 77522fd9a1..43dc72494c 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-core-common ${project.artifactId} diff --git a/core/connection-pool/pom.xml b/core/connection-pool/pom.xml index 9c3ed01fa4..b0605d6bc9 100644 --- a/core/connection-pool/pom.xml +++ b/core/connection-pool/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-core-connection-pool ${project.artifactId} diff --git a/core/map-reduce/pom.xml b/core/map-reduce/pom.xml index 3545496447..188fdc32cb 100644 --- a/core/map-reduce/pom.xml +++ b/core/map-reduce/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-core-map-reduce ${project.artifactId} diff --git a/core/modification/pom.xml b/core/modification/pom.xml index 3f6e8cf631..71d992f575 100644 --- a/core/modification/pom.xml +++ b/core/modification/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-core-modification ${project.artifactId} diff --git a/core/pom.xml b/core/pom.xml index ebb7175043..0661dcc530 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT gov.nsa.datawave.core datawave-core-parent diff --git a/core/query/pom.xml b/core/query/pom.xml index a80897693a..de90c5439d 100644 --- a/core/query/pom.xml +++ b/core/query/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-core-query ${project.artifactId} diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 9cfbcece2c..5ed3ac15a9 100644 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT gov.nsa.datawave.core datawave-utils-parent diff --git a/docs/pom.xml b/docs/pom.xml index 3bf8e7133e..e81315e71a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-docs diff --git a/microservices/pom.xml b/microservices/pom.xml index 396af33b29..bd4754c3fc 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT gov.nsa.datawave.microservice datawave-microservice-build-parent diff --git a/microservices/services/pom.xml b/microservices/services/pom.xml index af7613a61d..d15a19b13c 100644 --- a/microservices/services/pom.xml +++ b/microservices/services/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.microservice datawave-microservice-build-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-microservice-service-build-parent pom diff --git a/microservices/starters/pom.xml b/microservices/starters/pom.xml index e59a2a4e49..cea898e34b 100644 --- a/microservices/starters/pom.xml +++ b/microservices/starters/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.microservice datawave-microservice-build-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-microservice-starter-build-parent pom diff --git a/pom.xml b/pom.xml index 3d470b98d4..e3a202412a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT pom DataWave DataWave is a Java-based ingest and query framework that leverages Apache Accumulo to provide fast, secure access to your data. diff --git a/warehouse/accumulo-extensions/pom.xml b/warehouse/accumulo-extensions/pom.xml index e1d89cc467..635d99fa0f 100644 --- a/warehouse/accumulo-extensions/pom.xml +++ b/warehouse/accumulo-extensions/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-accumulo-extensions ${project.artifactId} diff --git a/warehouse/age-off-utils/pom.xml b/warehouse/age-off-utils/pom.xml index 38a8617dd3..3143df48f7 100644 --- a/warehouse/age-off-utils/pom.xml +++ b/warehouse/age-off-utils/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-age-off-utils ${project.artifactId} diff --git a/warehouse/age-off/pom.xml b/warehouse/age-off/pom.xml index 64b5d313f9..209b787775 100644 --- a/warehouse/age-off/pom.xml +++ b/warehouse/age-off/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-age-off ${project.artifactId} diff --git a/warehouse/assemble/datawave/pom.xml b/warehouse/assemble/datawave/pom.xml index 960c15ee07..08bb03c2ad 100644 --- a/warehouse/assemble/datawave/pom.xml +++ b/warehouse/assemble/datawave/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave assemble-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT assemble-datawave jar diff --git a/warehouse/assemble/pom.xml b/warehouse/assemble/pom.xml index 3c8d9a3f09..d5995e4e24 100644 --- a/warehouse/assemble/pom.xml +++ b/warehouse/assemble/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT assemble-parent pom diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index 968f755c53..15df642902 100644 --- a/warehouse/assemble/webservice/pom.xml +++ b/warehouse/assemble/webservice/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave assemble-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT assemble-webservice ${project.artifactId} diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml index 8fe59a7c3c..4abb6170c9 100644 --- a/warehouse/common/pom.xml +++ b/warehouse/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-common ${project.artifactId} diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index fabb7a2798..8eda4ab399 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-core jar diff --git a/warehouse/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml index 38e16d610f..4d1f0a5d6d 100644 --- a/warehouse/data-dictionary-core/pom.xml +++ b/warehouse/data-dictionary-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-data-dictionary-core jar diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml index 407f1e4272..7fef2af5ae 100644 --- a/warehouse/edge-dictionary-core/pom.xml +++ b/warehouse/edge-dictionary-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-edge-dictionary-core jar diff --git a/warehouse/edge-model-configuration-core/pom.xml b/warehouse/edge-model-configuration-core/pom.xml index e86159dba4..a1afa6009d 100644 --- a/warehouse/edge-model-configuration-core/pom.xml +++ b/warehouse/edge-model-configuration-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-edge-model-configuration-core jar diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index 6b6e9a6506..aace1d2f9a 100644 --- a/warehouse/index-stats/pom.xml +++ b/warehouse/index-stats/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-index-stats jar diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml index e48c586147..c872c25840 100644 --- a/warehouse/ingest-configuration/pom.xml +++ b/warehouse/ingest-configuration/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ingest-configuration diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index 90fb606c9b..4aa75ea7c9 100644 --- a/warehouse/ingest-core/pom.xml +++ b/warehouse/ingest-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ingest-core jar diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index 15a7961135..e11abd91a5 100644 --- a/warehouse/ingest-csv/pom.xml +++ b/warehouse/ingest-csv/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ingest-csv jar diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index 7353391f33..e6d5e728d6 100644 --- a/warehouse/ingest-json/pom.xml +++ b/warehouse/ingest-json/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ingest-json jar diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml index dd9b9acb17..23a1e339ff 100644 --- a/warehouse/ingest-nyctlc/pom.xml +++ b/warehouse/ingest-nyctlc/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ingest-nyctlc jar diff --git a/warehouse/ingest-scripts/pom.xml b/warehouse/ingest-scripts/pom.xml index 325bff42ea..2a1a58a8ad 100644 --- a/warehouse/ingest-scripts/pom.xml +++ b/warehouse/ingest-scripts/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ingest-scripts ${project.artifactId} diff --git a/warehouse/ingest-ssdeep/pom.xml b/warehouse/ingest-ssdeep/pom.xml index 6fd679cf76..8880548c93 100644 --- a/warehouse/ingest-ssdeep/pom.xml +++ b/warehouse/ingest-ssdeep/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ingest-ssdeep diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml index 83d09f468b..6e1d0be980 100644 --- a/warehouse/ingest-wikipedia/pom.xml +++ b/warehouse/ingest-wikipedia/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ingest-wikipedia jar diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml index 136f22bbe6..13d08f1c2e 100644 --- a/warehouse/metrics-core/pom.xml +++ b/warehouse/metrics-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-metrics-core jar diff --git a/warehouse/ops-tools/config-compare/pom.xml b/warehouse/ops-tools/config-compare/pom.xml index eefe49bf57..436882d33d 100644 --- a/warehouse/ops-tools/config-compare/pom.xml +++ b/warehouse/ops-tools/config-compare/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-ops-tools-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ops-tools-config-compare diff --git a/warehouse/ops-tools/index-validation/pom.xml b/warehouse/ops-tools/index-validation/pom.xml index 672d5f542a..a060e0fecb 100644 --- a/warehouse/ops-tools/index-validation/pom.xml +++ b/warehouse/ops-tools/index-validation/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-ops-tools-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ops-tools-index-validation jar diff --git a/warehouse/ops-tools/pom.xml b/warehouse/ops-tools/pom.xml index c8e99e19d4..d3217a980a 100644 --- a/warehouse/ops-tools/pom.xml +++ b/warehouse/ops-tools/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ops-tools-parent pom diff --git a/warehouse/pom.xml b/warehouse/pom.xml index b7d8f73fa7..1ba8b40b6e 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-warehouse-parent pom diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index 25be249ea0..c21ddfb8f7 100644 --- a/warehouse/query-core/pom.xml +++ b/warehouse/query-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-query-core jar diff --git a/warehouse/query-core/src/test/java/datawave/query/ExcerptTest.java b/warehouse/query-core/src/test/java/datawave/query/ExcerptTest.java index 88b3c84cc5..bb46004070 100644 --- a/warehouse/query-core/src/test/java/datawave/query/ExcerptTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/ExcerptTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertTrue; import java.text.DateFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -20,6 +20,7 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.jboss.arquillian.container.test.api.Deployment; @@ -52,13 +53,18 @@ public abstract class ExcerptTest { @RunWith(Arquillian.class) - public static class ShardRange extends datawave.query.ExcerptTest { + public static class ShardRangeTest extends datawave.query.ExcerptTest { protected static AccumuloClient connector = null; + @Override + protected void runTestQuery(String queryString) throws Exception { + super.runTestQuery(connector, queryString); + } + @BeforeClass public static void setUp() throws Exception { - QueryTestTableHelper qtth = new QueryTestTableHelper(ShardRange.class.toString(), log); + QueryTestTableHelper qtth = new QueryTestTableHelper(ShardRangeTest.class.toString(), log); connector = qtth.client; WiseGuysIngest.writeItAll(connector, WiseGuysIngest.WhatKindaRange.SHARD); Authorizations auths = new Authorizations("ALL"); @@ -67,21 +73,21 @@ public static void setUp() throws Exception { PrintUtility.printTable(connector, auths, QueryTestTableHelper.MODEL_TABLE_NAME); } - @Override - protected void runTestQuery(String queryString, Date startDate, Date endDate, Map extraParms, Collection goodResults) - throws Exception { - super.runTestQuery(connector, queryString, startDate, endDate, extraParms, goodResults); - } } @RunWith(Arquillian.class) - public static class DocumentRange extends datawave.query.ExcerptTest { + public static class DocumentRangeTest extends datawave.query.ExcerptTest { protected static AccumuloClient connector = null; + @Override + protected void runTestQuery(String queryString) throws Exception { + super.runTestQuery(connector, queryString); + } + @BeforeClass public static void setUp() throws Exception { - QueryTestTableHelper qtth = new QueryTestTableHelper(DocumentRange.class.toString(), log); + QueryTestTableHelper qtth = new QueryTestTableHelper(DocumentRangeTest.class.toString(), log); connector = qtth.client; WiseGuysIngest.writeItAll(connector, WiseGuysIngest.WhatKindaRange.DOCUMENT); @@ -91,11 +97,6 @@ public static void setUp() throws Exception { PrintUtility.printTable(connector, auths, QueryTestTableHelper.MODEL_TABLE_NAME); } - @Override - protected void runTestQuery(String queryString, Date startDate, Date endDate, Map extraParms, Collection goodResults) - throws Exception { - super.runTestQuery(connector, queryString, startDate, endDate, extraParms, goodResults); - } } private static final Logger log = Logger.getLogger(datawave.query.ExcerptTest.class); @@ -111,6 +112,11 @@ protected void runTestQuery(String queryString, Date startDate, Date endDate, Ma protected KryoDocumentDeserializer deserializer; private final DateFormat format = new SimpleDateFormat("yyyyMMdd"); + private Date startDate; + private Date endDate; + + private final Map extraParameters = new HashMap<>(); + private final Set expectedResults = new HashSet<>(); @Deployment public static JavaArchive createDeployment() throws Exception { @@ -131,18 +137,46 @@ public static void teardown() { } @Before - public void setup() { + public void setup() throws ParseException { TimeZone.setDefault(TimeZone.getTimeZone("GMT")); log.setLevel(Level.TRACE); logic.setFullTableScanEnabled(true); deserializer = new KryoDocumentDeserializer(); + startDate = format.parse("19000101"); + endDate = format.parse("20240101"); + extraParameters.clear(); + expectedResults.clear(); + } + + protected void setDefaultQueryParams() { + extraParameters.put("include.grouping.context", "true"); + extraParameters.put("hit.list", "true"); + extraParameters.put("return.fields", "HIT_EXCERPT"); + extraParameters.put("query.syntax", "LUCENE"); + } + + protected void updateQueryParam(String key, String value) { + if (StringUtils.isNoneBlank(key, value)) { + extraParameters.put(key, value); + } + } + + protected void addExpectedResult(String result) { + if (StringUtils.isNotBlank(result)) { + expectedResults.add(result); + } + } + + protected boolean initialized() { + return !(extraParameters.isEmpty() || expectedResults.isEmpty()); } - protected abstract void runTestQuery(String queryString, Date startDate, Date endDate, Map extraParms, Collection goodResults) - throws Exception; + protected abstract void runTestQuery(String queryString) throws Exception; - protected void runTestQuery(AccumuloClient connector, String queryString, Date startDate, Date endDate, Map extraParms, - Collection goodResults) throws Exception { + protected void runTestQuery(AccumuloClient connector, String queryString) throws Exception { + if (!initialized()) { + throw new Exception("must set query parameters and expected results before running query"); + } QueryImpl settings = new QueryImpl(); settings.setBeginDate(startDate); @@ -150,7 +184,7 @@ protected void runTestQuery(AccumuloClient connector, String queryString, Date s settings.setPagesize(Integer.MAX_VALUE); settings.setQueryAuthorizations(auths.serialize()); settings.setQuery(queryString); - settings.setParameters(extraParms); + settings.setParameters(extraParameters); settings.setId(UUID.randomUUID()); log.debug("query: " + settings.getQuery()); @@ -180,7 +214,7 @@ protected void runTestQuery(AccumuloClient connector, String queryString, Date s if (attribute instanceof Attributes) { for (Attribute attr : ((Attributes) attribute).getAttributes()) { String toFind = dictionaryEntry.getKey() + ":" + attr; - boolean found = goodResults.remove(toFind); + boolean found = expectedResults.remove(toFind); if (found) log.debug("removed " + toFind); else { @@ -191,7 +225,7 @@ protected void runTestQuery(AccumuloClient connector, String queryString, Date s String toFind = dictionaryEntry.getKey() + ":" + dictionaryEntry.getValue(); - boolean found = goodResults.remove(toFind); + boolean found = expectedResults.remove(toFind); if (found) log.debug("removed " + toFind); else { @@ -203,210 +237,163 @@ protected void runTestQuery(AccumuloClient connector, String queryString, Date s } assertTrue("unexpected fields returned: " + unexpectedFields, unexpectedFields.isEmpty()); - assertTrue(goodResults + " was not empty", goodResults.isEmpty()); + assertTrue(expectedResults + " was not empty", expectedResults.isEmpty()); assertFalse("No docs were returned!", docs.isEmpty()); } @Test public void simpleTest() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(farther) #EXCERPT_FIELDS(QUOTE/2)"; // not sure why the timestamp and delete flag are present - Set goodResults = new HashSet<>(Set.of("HIT_EXCERPT:get much [farther] with a: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:get much [farther] with a: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void simpleTestBefore() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(farther) #EXCERPT_FIELDS(QUOTE/2/before)"; // not sure why the timestamp and delete flag are present - Set goodResults = new HashSet<>(Set.of("HIT_EXCERPT:get much [farther]: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:get much [farther]: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void simpleTestAfter() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(farther) #EXCERPT_FIELDS(QUOTE/2/after)"; // not sure why the timestamp and delete flag are present - Set goodResults = new HashSet<>(Set.of("HIT_EXCERPT:[farther] with a: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:[farther] with a: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void lessSimpleBeforeTest() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(he cant refuse) #EXCERPT_FIELDS(QUOTE/2/before)"; - Set goodResults = new HashSet<>(Set.of("HIT_EXCERPT:an offer [he] [cant] [refuse]: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:an offer [he] [cant] [refuse]: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void lessSimpleAfterTest() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(he cant refuse) #EXCERPT_FIELDS(QUOTE/2/after)"; - Set goodResults = new HashSet<>(Set.of("HIT_EXCERPT:[he] [cant] [refuse]: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:[he] [cant] [refuse]: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void lessSimpleTest() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(he cant refuse) #EXCERPT_FIELDS(QUOTE/2)"; - Set goodResults = new HashSet<>(Set.of("HIT_EXCERPT:an offer [he] [cant] [refuse]: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:an offer [he] [cant] [refuse]: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void biggerRangeThanQuoteLength() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(he cant refuse) #EXCERPT_FIELDS(QUOTE/20)"; - Set goodResults = new HashSet<>(Set.of("HIT_EXCERPT:im gonna make him an offer [he] [cant] [refuse]: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:im gonna make him an offer [he] [cant] [refuse]: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void biggerRangeThanQuoteLengthBeforeTest() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(he cant refuse) #EXCERPT_FIELDS(QUOTE/20/before)"; - Set goodResults = new HashSet<>(Set.of("HIT_EXCERPT:im gonna make him an offer [he] [cant] [refuse]: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:im gonna make him an offer [he] [cant] [refuse]: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void biggerRangeThanQuoteLengthAfterTest() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(he cant refuse) #EXCERPT_FIELDS(QUOTE/20/after)"; - Set goodResults = new HashSet<>(Set.of("HIT_EXCERPT:[he] [cant] [refuse]: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:[he] [cant] [refuse]: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void wholeQuote() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); String queryString = "QUOTE:(im gonna make him an offer he cant refuse) #EXCERPT_FIELDS(QUOTE/20)"; - Set goodResults = new HashSet<>( - Set.of("HIT_EXCERPT:[im] [gonna] [make] [him] [an] [offer] [he] [cant] [refuse]: : [] 9223372036854775807 false")); + addExpectedResult("HIT_EXCERPT:[im] [gonna] [make] [him] [an] [offer] [he] [cant] [refuse]: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void anotherFirstTerm() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT,UUID"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); + updateQueryParam("return.fields", "HIT_EXCERPT,UUID"); // "if" is the first term for one event String queryString = "QUOTE:(if) #EXCERPT_FIELDS(QUOTE/3)"; - Set goodResults = new HashSet<>(Set.of("UUID.0:SOPRANO", "HIT_EXCERPT:[if] you can quote: : [] 9223372036854775807 false")); + addExpectedResult("UUID.0:SOPRANO"); + addExpectedResult("HIT_EXCERPT:[if] you can quote: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void anotherFirstTermBeforeTest() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT,UUID"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); + updateQueryParam("return.fields", "HIT_EXCERPT,UUID"); // "if" is the first term for one event String queryString = "QUOTE:(if) #EXCERPT_FIELDS(QUOTE/3/before)"; - Set goodResults = new HashSet<>(Set.of("UUID.0:SOPRANO", "HIT_EXCERPT:[if]: : [] 9223372036854775807 false")); + addExpectedResult("UUID.0:SOPRANO"); + addExpectedResult("HIT_EXCERPT:[if]: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } @Test public void anotherFirstTermAfterTest() throws Exception { - Map extraParameters = new HashMap<>(); - extraParameters.put("include.grouping.context", "true"); - extraParameters.put("hit.list", "true"); - extraParameters.put("return.fields", "HIT_EXCERPT,UUID"); - extraParameters.put("query.syntax", "LUCENE"); + setDefaultQueryParams(); + updateQueryParam("return.fields", "HIT_EXCERPT,UUID"); // "if" is the first term for one event String queryString = "QUOTE:(if) #EXCERPT_FIELDS(QUOTE/3/after)"; - Set goodResults = new HashSet<>(Set.of("UUID.0:SOPRANO", "HIT_EXCERPT:[if] you can quote: : [] 9223372036854775807 false")); + addExpectedResult("UUID.0:SOPRANO"); + addExpectedResult("HIT_EXCERPT:[if] you can quote: : [] 9223372036854775807 false"); - runTestQuery(queryString, format.parse("19000101"), format.parse("20240101"), extraParameters, goodResults); + runTestQuery(queryString); } } diff --git a/warehouse/regression-testing/pom.xml b/warehouse/regression-testing/pom.xml index 1976f124cd..af9b2ee69f 100644 --- a/warehouse/regression-testing/pom.xml +++ b/warehouse/regression-testing/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-regression-testing ${project.artifactId} diff --git a/warehouse/ssdeep-common/pom.xml b/warehouse/ssdeep-common/pom.xml index 419ac4a44a..795b07133b 100644 --- a/warehouse/ssdeep-common/pom.xml +++ b/warehouse/ssdeep-common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ssdeep-common diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index d5105ed39d..b2b1cc31a0 100644 --- a/web-services/accumulo/pom.xml +++ b/web-services/accumulo/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-accumulo ejb diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml index ee9adc557d..8f05782cb5 100644 --- a/web-services/atom/pom.xml +++ b/web-services/atom/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-atom ejb diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml index 1be0e6f460..f5f3d3a59a 100644 --- a/web-services/cached-results/pom.xml +++ b/web-services/cached-results/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-cached-results ejb diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index b5c61ef65f..0f9d305fce 100644 --- a/web-services/client/pom.xml +++ b/web-services/client/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-client jar diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index 220de0a1cd..7e864febec 100644 --- a/web-services/common-util/pom.xml +++ b/web-services/common-util/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-common-util jar diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index dcf641c672..037e3f1c04 100644 --- a/web-services/common/pom.xml +++ b/web-services/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-common ejb diff --git a/web-services/deploy/application/pom.xml b/web-services/deploy/application/pom.xml index 3902115f4b..530c7d228f 100644 --- a/web-services/deploy/application/pom.xml +++ b/web-services/deploy/application/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-deploy-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-deploy-application ear diff --git a/web-services/deploy/configuration/pom.xml b/web-services/deploy/configuration/pom.xml index 86c6b5604d..b35ce86386 100644 --- a/web-services/deploy/configuration/pom.xml +++ b/web-services/deploy/configuration/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-deploy-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-deploy-configuration jar diff --git a/web-services/deploy/docs/pom.xml b/web-services/deploy/docs/pom.xml index 65cdbab645..dfcdbeffdc 100644 --- a/web-services/deploy/docs/pom.xml +++ b/web-services/deploy/docs/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-deploy-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-deploy-docs war diff --git a/web-services/deploy/pom.xml b/web-services/deploy/pom.xml index c39e870196..b520bf5a80 100644 --- a/web-services/deploy/pom.xml +++ b/web-services/deploy/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT gov.nsa.datawave.webservices datawave-ws-deploy-parent diff --git a/web-services/deploy/spring-framework-integration/pom.xml b/web-services/deploy/spring-framework-integration/pom.xml index 837e3fa8dc..ac7344f102 100644 --- a/web-services/deploy/spring-framework-integration/pom.xml +++ b/web-services/deploy/spring-framework-integration/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-deploy-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT spring-framework-integration ${project.artifactId} diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index c26e60c41c..529ac31f81 100644 --- a/web-services/dictionary/pom.xml +++ b/web-services/dictionary/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-dictionary ejb diff --git a/web-services/examples/client-login/pom.xml b/web-services/examples/client-login/pom.xml index 894dc78d8a..329e08a01f 100644 --- a/web-services/examples/client-login/pom.xml +++ b/web-services/examples/client-login/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-examples-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-examples-client-login ejb diff --git a/web-services/examples/http-client/pom.xml b/web-services/examples/http-client/pom.xml index 1e6d633a37..6f95e15453 100644 --- a/web-services/examples/http-client/pom.xml +++ b/web-services/examples/http-client/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-examples-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-examples-http-client jar diff --git a/web-services/examples/jms-client/pom.xml b/web-services/examples/jms-client/pom.xml index cb1b0e29a3..5a9a628792 100644 --- a/web-services/examples/jms-client/pom.xml +++ b/web-services/examples/jms-client/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-examples-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-examples-jms-client jar diff --git a/web-services/examples/pom.xml b/web-services/examples/pom.xml index ff8dc100e5..84fc3c573b 100644 --- a/web-services/examples/pom.xml +++ b/web-services/examples/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-examples-parent pom diff --git a/web-services/examples/query-war/pom.xml b/web-services/examples/query-war/pom.xml index cd043708f2..faf6b8660f 100644 --- a/web-services/examples/query-war/pom.xml +++ b/web-services/examples/query-war/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-examples-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-examples-query-war war diff --git a/web-services/map-reduce-embedded/pom.xml b/web-services/map-reduce-embedded/pom.xml index 7374807a9f..813c0b801e 100644 --- a/web-services/map-reduce-embedded/pom.xml +++ b/web-services/map-reduce-embedded/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-map-reduce-embedded jar diff --git a/web-services/map-reduce-status/pom.xml b/web-services/map-reduce-status/pom.xml index 9920d1b606..41cc05335d 100644 --- a/web-services/map-reduce-status/pom.xml +++ b/web-services/map-reduce-status/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-map-reduce-status ejb diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index 8f1c89a09b..3a06f4950b 100644 --- a/web-services/map-reduce/pom.xml +++ b/web-services/map-reduce/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-map-reduce ejb diff --git a/web-services/metrics/pom.xml b/web-services/metrics/pom.xml index 8b7d3c42bd..5fc064eb7d 100644 --- a/web-services/metrics/pom.xml +++ b/web-services/metrics/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-metrics ejb diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index c1f606e4cf..0db6186c20 100644 --- a/web-services/model/pom.xml +++ b/web-services/model/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-model ejb diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml index bfc58214da..3e856b4844 100644 --- a/web-services/modification/pom.xml +++ b/web-services/modification/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-modification ejb diff --git a/web-services/pom.xml b/web-services/pom.xml index 958283e825..5887806da9 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT gov.nsa.datawave.webservices datawave-ws-parent diff --git a/web-services/query-websocket/pom.xml b/web-services/query-websocket/pom.xml index 040a8f2c01..a1e50539da 100644 --- a/web-services/query-websocket/pom.xml +++ b/web-services/query-websocket/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-query-websocket war diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index 96b02b5e77..83fb4234fe 100644 --- a/web-services/query/pom.xml +++ b/web-services/query/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-query ejb diff --git a/web-services/rest-api/pom.xml b/web-services/rest-api/pom.xml index 3b437cf651..bc81188ade 100644 --- a/web-services/rest-api/pom.xml +++ b/web-services/rest-api/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-rest-api war diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index e40f9d3f84..020c2dd1a5 100644 --- a/web-services/security/pom.xml +++ b/web-services/security/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-security ejb diff --git a/web-services/web-root/pom.xml b/web-services/web-root/pom.xml index 4b7d900181..52133ee5b3 100644 --- a/web-services/web-root/pom.xml +++ b/web-services/web-root/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.13.0-SNAPSHOT + 7.14.0-SNAPSHOT datawave-ws-web-root war