From 65f81aeff5d2eb4d3f28c4ddd5794ed4c148c245 Mon Sep 17 00:00:00 2001 From: Moriarty <22225248+apmoriarty@users.noreply.github.com> Date: Mon, 30 Dec 2024 17:17:08 +0000 Subject: [PATCH 01/11] Expand bounded range test assertions to handle different order of operations that arise from threading (#2677) --- .../jexl/lookups/BoundedRangeIndexLookupTest.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/warehouse/query-core/src/test/java/datawave/query/jexl/lookups/BoundedRangeIndexLookupTest.java b/warehouse/query-core/src/test/java/datawave/query/jexl/lookups/BoundedRangeIndexLookupTest.java index df4dcd3b25..64f14db044 100644 --- a/warehouse/query-core/src/test/java/datawave/query/jexl/lookups/BoundedRangeIndexLookupTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/jexl/lookups/BoundedRangeIndexLookupTest.java @@ -228,6 +228,13 @@ public void testInvalidDataTypeFilter() { test(lookup, "FIELD_A"); } + @Test + public void testWithNoBackingData() { + withDateRange("20240701", "20240709"); + BoundedRangeIndexLookup lookup = createLookup("FIELD_A", "absent-lower", "absent-upper"); + test(lookup, "FIELD_A"); + } + private void test(BoundedRangeIndexLookup lookup, String field) { lookup.submit(); @@ -305,7 +312,12 @@ public void largeRowInBoundedRangeTest() throws TableNotFoundException { assertEquals(10001, scanner.getSeekCount()); // with new iterator this is initial seek + one seek per unique row in the range // this represents data collapsed and sent back to the client by the WholeRowIterator assertEquals(0, scanner.getNextCount()); // no next cals with seeking filter - assertTrue(map.get("FOO").isThresholdExceeded()); + assertNotNull(map); + if (map.containsKey("FOO")) { + assertTrue(map.get("FOO").isThresholdExceeded()); + } else { + assertTrue(map.isEmpty()); + } verifyAll(); } } From df77935d9f017e5671511dc6edb3ee673e6aea0d Mon Sep 17 00:00:00 2001 From: austin007008 <143425397+austin007008@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:53:34 -0500 Subject: [PATCH 02/11] replace deprecated config options (#2169) Co-authored-by: emiliodskinner --- .../src/main/resources/bin/ingest/bulk-ingest.sh | 4 ++-- .../src/main/resources/bin/ingest/live-ingest.sh | 4 ++-- .../src/test/resources/datawave/mapreduce/MapReduceJobs.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/warehouse/ingest-scripts/src/main/resources/bin/ingest/bulk-ingest.sh b/warehouse/ingest-scripts/src/main/resources/bin/ingest/bulk-ingest.sh index fe30703f42..7936e750c9 100755 --- a/warehouse/ingest-scripts/src/main/resources/bin/ingest/bulk-ingest.sh +++ b/warehouse/ingest-scripts/src/main/resources/bin/ingest/bulk-ingest.sh @@ -72,9 +72,9 @@ export HADOOP_OPTS="-Dfile.encoding=UTF8 -Duser.timezone=GMT $HADOOP_INGEST_OPTS export CHILD_MAP_OPTS="-Xmx${BULK_CHILD_MAP_MAX_MEMORY_MB}m -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF8 -Duser.timezone=GMT -XX:+UseNUMA $CHILD_INGEST_OPTS" export CHILD_REDUCE_OPTS="-Xmx${BULK_CHILD_REDUCE_MAX_MEMORY_MB}m -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF8 -Duser.timezone=GMT -XX:+UseNUMA $CHILD_INGEST_OPTS" -echo $INGEST_HADOOP_HOME/bin/hadoop jar ${DATAWAVE_INGEST_CORE_JAR} datawave.ingest.mapreduce.job.IngestJob -jt $INGEST_JOBTRACKER_NODE $INPUT_FILES ${INGEST_CONFIG[@]} -cacheBaseDir $JOB_CACHE_DIR -cacheJars $LIBJARS -user $USERNAME -pass $PASSWORD -instance $WAREHOUSE_INSTANCE_NAME -zookeepers $WAREHOUSE_ZOOKEEPERS -workDir $WORKDIR -flagFileDir ${FLAG_DIR} -flagFilePattern '.*_(bulk)_.*\.flag' -srcHdfs $INGEST_HDFS_NAME_NODE -destHdfs $WAREHOUSE_HDFS_NAME_NODE -distCpConfDir $WAREHOUSE_HADOOP_CONF -mapred.map.child.java.opts=\"$CHILD_MAP_OPTS\" -mapred.reduce.child.java.opts=\"$CHILD_REDUCE_OPTS\" "${BATCHWRITER_OPTS}" $MAPRED_OPTS $EXTRA_OPTS +echo $INGEST_HADOOP_HOME/bin/hadoop jar ${DATAWAVE_INGEST_CORE_JAR} datawave.ingest.mapreduce.job.IngestJob -jt $INGEST_JOBTRACKER_NODE $INPUT_FILES ${INGEST_CONFIG[@]} -cacheBaseDir $JOB_CACHE_DIR -cacheJars $LIBJARS -user $USERNAME -pass $PASSWORD -instance $WAREHOUSE_INSTANCE_NAME -zookeepers $WAREHOUSE_ZOOKEEPERS -workDir $WORKDIR -flagFileDir ${FLAG_DIR} -flagFilePattern '.*_(bulk)_.*\.flag' -srcHdfs $INGEST_HDFS_NAME_NODE -destHdfs $WAREHOUSE_HDFS_NAME_NODE -distCpConfDir $WAREHOUSE_HADOOP_CONF -mapreduce.map.java.opts=\"$CHILD_MAP_OPTS\" -mapreduce.reduce.java.opts=\"$CHILD_REDUCE_OPTS\" "${BATCHWRITER_OPTS}" $MAPRED_OPTS $EXTRA_OPTS -$INGEST_HADOOP_HOME/bin/hadoop jar ${DATAWAVE_INGEST_CORE_JAR} datawave.ingest.mapreduce.job.IngestJob -jt $INGEST_JOBTRACKER_NODE $INPUT_FILES ${INGEST_CONFIG[@]} -cacheBaseDir $JOB_CACHE_DIR -cacheJars $LIBJARS -user $USERNAME -pass $PASSWORD -instance $WAREHOUSE_INSTANCE_NAME -zookeepers $WAREHOUSE_ZOOKEEPERS -workDir $WORKDIR -flagFileDir ${FLAG_DIR} -flagFilePattern '.*_(bulk)_.*\.flag' -srcHdfs $INGEST_HDFS_NAME_NODE -destHdfs $WAREHOUSE_HDFS_NAME_NODE -distCpConfDir $WAREHOUSE_HADOOP_CONF -mapred.map.child.java.opts="$CHILD_MAP_OPTS" -mapred.reduce.child.java.opts="$CHILD_REDUCE_OPTS" "${BATCHWRITER_OPTS}" $MAPRED_OPTS $EXTRA_OPTS +$INGEST_HADOOP_HOME/bin/hadoop jar ${DATAWAVE_INGEST_CORE_JAR} datawave.ingest.mapreduce.job.IngestJob -jt $INGEST_JOBTRACKER_NODE $INPUT_FILES ${INGEST_CONFIG[@]} -cacheBaseDir $JOB_CACHE_DIR -cacheJars $LIBJARS -user $USERNAME -pass $PASSWORD -instance $WAREHOUSE_INSTANCE_NAME -zookeepers $WAREHOUSE_ZOOKEEPERS -workDir $WORKDIR -flagFileDir ${FLAG_DIR} -flagFilePattern '.*_(bulk)_.*\.flag' -srcHdfs $INGEST_HDFS_NAME_NODE -destHdfs $WAREHOUSE_HDFS_NAME_NODE -distCpConfDir $WAREHOUSE_HADOOP_CONF -mapreduce.map.java.opts="$CHILD_MAP_OPTS" -mapreduce.reduce.java.opts="$CHILD_REDUCE_OPTS" "${BATCHWRITER_OPTS}" $MAPRED_OPTS $EXTRA_OPTS RETURN_CODE=$? diff --git a/warehouse/ingest-scripts/src/main/resources/bin/ingest/live-ingest.sh b/warehouse/ingest-scripts/src/main/resources/bin/ingest/live-ingest.sh index cf7d49007c..738b4a12ad 100755 --- a/warehouse/ingest-scripts/src/main/resources/bin/ingest/live-ingest.sh +++ b/warehouse/ingest-scripts/src/main/resources/bin/ingest/live-ingest.sh @@ -71,10 +71,10 @@ export CHILD_MAP_OPTS="-Xmx${LIVE_CHILD_MAP_MAX_MEMORY_MB}m -XX:+UseConcMarkSwee export CHILD_REDUCE_OPTS="-Xmx${LIVE_CHILD_REDUCE_MAX_MEMORY_MB}m -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF8 -Duser.timezone=GMT -XX:+UseNUMA $CHILD_INGEST_OPTS" -echo $INGEST_HADOOP_HOME/bin/hadoop jar ${DATAWAVE_INGEST_CORE_JAR} datawave.ingest.mapreduce.job.IngestJob -jt $INGEST_JOBTRACKER_NODE $INPUT_FILES ${INGEST_CONFIG[@]} -cacheBaseDir $JOB_CACHE_DIR -cacheJars $LIBJARS -user $USERNAME -pass $PASSWORD -instance $WAREHOUSE_INSTANCE_NAME -zookeepers $WAREHOUSE_ZOOKEEPERS -workDir $WORKDIR -flagFileDir ${FLAG_DIR} -flagFilePattern '.*_live_.*\.flag' -mapred.map.child.java.opts=\"$CHILD_MAP_OPTS\" -mapred.reduce.child.java.opts=\"$CHILD_REDUCE_OPTS\" "${BATCHWRITER_OPTS}" $MAPRED_OPTS -outputMutations -mapOnly -srcHdfs $INGEST_HDFS_NAME_NODE -destHdfs $WAREHOUSE_HDFS_NAME_NODE $EXTRA_OPTS +echo $INGEST_HADOOP_HOME/bin/hadoop jar ${DATAWAVE_INGEST_CORE_JAR} datawave.ingest.mapreduce.job.IngestJob -jt $INGEST_JOBTRACKER_NODE $INPUT_FILES ${INGEST_CONFIG[@]} -cacheBaseDir $JOB_CACHE_DIR -cacheJars $LIBJARS -user $USERNAME -pass $PASSWORD -instance $WAREHOUSE_INSTANCE_NAME -zookeepers $WAREHOUSE_ZOOKEEPERS -workDir $WORKDIR -flagFileDir ${FLAG_DIR} -flagFilePattern '.*_live_.*\.flag' -mapreduce.map.java.opts=\"$CHILD_MAP_OPTS\" -mapreduce.reduce.java.opts=\"$CHILD_REDUCE_OPTS\" "${BATCHWRITER_OPTS}" $MAPRED_OPTS -outputMutations -mapOnly -srcHdfs $INGEST_HDFS_NAME_NODE -destHdfs $WAREHOUSE_HDFS_NAME_NODE $EXTRA_OPTS echo "For decreased latency, one can add the -mapOnly flag at the cost of possibly overcounting duplicate records" -$INGEST_HADOOP_HOME/bin/hadoop jar ${DATAWAVE_INGEST_CORE_JAR} datawave.ingest.mapreduce.job.IngestJob -jt $INGEST_JOBTRACKER_NODE $INPUT_FILES ${INGEST_CONFIG[@]} -cacheBaseDir $JOB_CACHE_DIR -cacheJars $LIBJARS -user $USERNAME -pass $PASSWORD -instance $WAREHOUSE_INSTANCE_NAME -zookeepers $WAREHOUSE_ZOOKEEPERS -workDir $WORKDIR -flagFileDir ${FLAG_DIR} -flagFilePattern '.*_live_.*\.flag' -mapred.map.child.java.opts="$CHILD_MAP_OPTS" -mapred.reduce.child.java.opts="$CHILD_REDUCE_OPTS" "${BATCHWRITER_OPTS}" $MAPRED_OPTS -outputMutations -mapOnly -srcHdfs $INGEST_HDFS_NAME_NODE -destHdfs $WAREHOUSE_HDFS_NAME_NODE $EXTRA_OPTS +$INGEST_HADOOP_HOME/bin/hadoop jar ${DATAWAVE_INGEST_CORE_JAR} datawave.ingest.mapreduce.job.IngestJob -jt $INGEST_JOBTRACKER_NODE $INPUT_FILES ${INGEST_CONFIG[@]} -cacheBaseDir $JOB_CACHE_DIR -cacheJars $LIBJARS -user $USERNAME -pass $PASSWORD -instance $WAREHOUSE_INSTANCE_NAME -zookeepers $WAREHOUSE_ZOOKEEPERS -workDir $WORKDIR -flagFileDir ${FLAG_DIR} -flagFilePattern '.*_live_.*\.flag' -mapreduce.map.java.opts="$CHILD_MAP_OPTS" -mapreduce.reduce.java.opts="$CHILD_REDUCE_OPTS" "${BATCHWRITER_OPTS}" $MAPRED_OPTS -outputMutations -mapOnly -srcHdfs $INGEST_HDFS_NAME_NODE -destHdfs $WAREHOUSE_HDFS_NAME_NODE $EXTRA_OPTS RETURN_CODE=$? diff --git a/web-services/map-reduce/src/test/resources/datawave/mapreduce/MapReduceJobs.xml b/web-services/map-reduce/src/test/resources/datawave/mapreduce/MapReduceJobs.xml index b8b4fc5d15..c5fa0ba674 100644 --- a/web-services/map-reduce/src/test/resources/datawave/mapreduce/MapReduceJobs.xml +++ b/web-services/map-reduce/src/test/resources/datawave/mapreduce/MapReduceJobs.xml @@ -58,7 +58,7 @@ - + From 6bbf6de3a8b43b694e6ca110a1ac1223b53d7dcd Mon Sep 17 00:00:00 2001 From: Bill Oley Date: Wed, 8 Jan 2025 12:42:19 -0500 Subject: [PATCH 03/11] FederatedQueryPlanner.getSubQueryDateRanges can return an illegal range and is skipping some time periods (#2680) * FederatedQueryPlanner.getSubQueryDateRanges can return an illegal range and is skipping some time periods (#2679) * GitHub Actions: Fix Formatting * Correct a few comments --------- Co-authored-by: GitHub Actions --- .../query/planner/FederatedQueryPlanner.java | 139 ++++++++++++------ .../query/planner/FederatedQueryTest.java | 138 ++++++++++++++++- .../query/util/FieldIndexHoleDataIngest.java | 4 + 3 files changed, 230 insertions(+), 51 deletions(-) diff --git a/warehouse/query-core/src/main/java/datawave/query/planner/FederatedQueryPlanner.java b/warehouse/query-core/src/main/java/datawave/query/planner/FederatedQueryPlanner.java index e20ca09479..8818c695ed 100644 --- a/warehouse/query-core/src/main/java/datawave/query/planner/FederatedQueryPlanner.java +++ b/warehouse/query-core/src/main/java/datawave/query/planner/FederatedQueryPlanner.java @@ -1,7 +1,6 @@ package datawave.query.planner; import java.io.IOException; -import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Collection; @@ -45,7 +44,6 @@ import datawave.query.util.QueryStopwatch; import datawave.util.time.TraceStopwatch; import datawave.webservice.query.exception.DatawaveErrorCode; -import datawave.webservice.query.exception.NotFoundQueryException; import datawave.webservice.query.exception.QueryException; /** @@ -62,7 +60,6 @@ public class FederatedQueryPlanner extends QueryPlanner implements Cloneable { private static final Logger log = ThreadConfigurableLogger.getLogger(FederatedQueryPlanner.class); private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd"); - private final Calendar calendar = Calendar.getInstance(); // we want a unique set of plans, but maintain insertion order (facilitates easier testing) private final Set plans = new LinkedHashSet<>(); @@ -323,13 +320,13 @@ public CloseableIterable process(GenericQueryConfiguration genericCon ShardQueryConfiguration firstConfigCopy = null; UUID queryId = originalConfig.getQuery().getId(); for (Pair dateRange : dateRanges) { - // Format the start and end date of the current sub-query to execute. - String subStartDate = dateFormat.format(dateRange.getLeft()); + // Format the beginDate and endDate of the current sub-query to execute. + String subBeginDate = dateFormat.format(dateRange.getLeft()); String subEndDate = dateFormat.format(dateRange.getRight()); // Start a new stopwatch. TraceStopwatch stopwatch = originalConfig.getTimers().newStartedStopwatch("FederatedQueryPlanner - Executing sub-plan [" + totalProcessed + " of " - + dateRanges.size() + "] against date range (" + subStartDate + "-" + subEndDate + ")"); + + dateRanges.size() + "] against date range (" + subBeginDate + "-" + subEndDate + ")"); // Set the new date range in a copy of the config. ShardQueryConfiguration configCopy = new ShardQueryConfiguration(originalConfig); @@ -347,13 +344,13 @@ public CloseableIterable process(GenericQueryConfiguration genericCon CloseableIterable queryData = subPlan.process(configCopy, query, settings, scannerFactory); results.addIterable(queryData); } catch (Exception e) { - log.warn("Exception occured when processing sub-plan [" + totalProcessed + " of " + dateRanges.size() + "] against date range (" + subStartDate + log.warn("Exception occured when processing sub-plan [" + totalProcessed + " of " + dateRanges.size() + "] against date range (" + subBeginDate + "-" + subEndDate + ")", e); // If an exception occurs, ensure that the planned script and the original config are updated before allowing the exception to bubble up. plans.add(subPlan.plannedScript); updatePlannedScript(); - // Copy over any changes in the sub-config to the original config. This will not affect the start date, end date, or timers of the original + // Copy over any changes in the sub-config to the original config. This will not affect the beginDate, endDate, or timers of the original // config. copySubConfigPropertiesToOriginal(originalConfig, configCopy); throw e; @@ -383,7 +380,7 @@ public CloseableIterable process(GenericQueryConfiguration genericCon // Update the planned script. updatePlannedScript(); - // Copy over any changes from the first sub-config to the original config. This will not affect the start date, end date, or timers of the original + // Copy over any changes from the first sub-config to the original config. This will not affect the beginDate, endDate, or timers of the original // config. copySubConfigPropertiesToOriginal(originalConfig, firstConfigCopy); @@ -433,7 +430,7 @@ private void copySubConfigPropertiesToOriginal(ShardQueryConfiguration original, * Return the set of date ranges that sub-queries should be created for. Each date range will have a consistent index state, meaning that within each date * range, we can expect to either encounter no field index holes, or to always encounter a field index hole. */ - private SortedSet> getSubQueryDateRanges(ShardQueryConfiguration config, String query, ScannerFactory scannerFactory) + protected SortedSet> getSubQueryDateRanges(ShardQueryConfiguration config, String query, ScannerFactory scannerFactory) throws DatawaveQueryException { // Fetch the field index holes for the specified fields and datatypes, using the configured minimum threshold. MetadataHelper metadataHelper = queryPlanner.getMetadataHelper(); @@ -482,79 +479,110 @@ private SortedSet> getSubQueryDateRanges(ShardQueryConfiguration } else { // Otherwise, get the valid date ranges. First, Merge any overlaps. SortedSet> mergedHoles = mergeRanges(relevantHoles); + // Adjust the index holes so that they span from 00:00:00.000 on the first day to 23:59:59.999 on the last day + mergedHoles = spanEntireDays(mergedHoles); Iterator> it = mergedHoles.iterator(); - // If the start of the first hole occurs after the configured start date, add a range spanning from the start date to one day before the start - // of the first hole. + // If the start of the first index hole occurs after the configured start date, add a range spanning from + // the beginDate to one millisecond before the start of the first index hole. Pair firstHole = it.next(); - if (firstHole.getLeft().getTime() > config.getBeginDate().getTime()) { - subDateRanges.add(Pair.of(new Date(config.getBeginDate().getTime()), oneDayBefore(firstHole.getLeft()))); - // If the end of the first hole occurs before or on the configured end date, add the entire span for the first hole. - if (firstHole.getRight().getTime() <= config.getEndDate().getTime()) { - subDateRanges.add(firstHole); - } else { - // Otherwise, add a range from the start of the first hole to the configured end date. - subDateRanges.add(Pair.of(firstHole.getLeft(), new Date(config.getEndDate().getTime()))); + // Track the end of the previous range. + Date endOfPrevRange; + if (firstHole.getLeft().getTime() >= config.getBeginDate().getTime()) { + if (firstHole.getLeft().getTime() > config.getBeginDate().getTime()) { + // Add a range from the configured beginDate to just before + // the start of the first index hole. This date range is indexed + subDateRanges.add(Pair.of(new Date(config.getBeginDate().getTime()), oneMsBefore(firstHole.getLeft()))); } - // If the start of the first hole is equal to the configured start date, check if the entire hole falls within the query's date range. - } else if (firstHole.getLeft().getTime() == config.getBeginDate().getTime()) { - // If the end of the first hole occurs before or on the configured end date, add the entire span for the first hole. + + // the start of the first index hole is on or after the configured beginDate if (firstHole.getRight().getTime() <= config.getEndDate().getTime()) { + // If the end of the first index hole occurs before or on the configured endDate, + // add the entire span for the first index hole. This date range is not indexed subDateRanges.add(firstHole); + endOfPrevRange = firstHole.getRight(); } else { - // Otherwise, the first hole spans over the query's date range. - subDateRanges.add(Pair.of(new Date(config.getBeginDate().getTime()), new Date(config.getEndDate().getTime()))); + // Otherwise, add a range from the start of the first index hole to + // the configured endDate. This date range is not indexed + subDateRanges.add(Pair.of(firstHole.getLeft(), new Date(config.getEndDate().getTime()))); + endOfPrevRange = config.getEndDate(); } - // If the start of the first hole occurs before the configured start date, check how much of the hole falls within the query's date range. - } else if (firstHole.getLeft().getTime() < config.getBeginDate().getTime()) { - // If the end of the first hole occurs before or on the configured end date, add a range spanning from the configured start date to the end of - // the first hole. + } else { + // the start of the first index hole is before the configured beginDate if (firstHole.getRight().getTime() <= config.getEndDate().getTime()) { + // If the end of the first index hole occurs before or on the configured endDate, add a range spanning + // from the configured beginDate to the end of the first index hole. This date range is not indexed subDateRanges.add(Pair.of(new Date(config.getBeginDate().getTime()), firstHole.getRight())); + endOfPrevRange = firstHole.getRight(); } else { - // Otherwise, the first hole spans over the query's date range. + // Otherwise, the first index hole spans over the query's date range. This date range is not indexed subDateRanges.add(Pair.of(new Date(config.getBeginDate().getTime()), new Date(config.getEndDate().getTime()))); + endOfPrevRange = config.getEndDate(); } } - // Track the end of the previous hole. - Date endOfPrevHole = firstHole.getRight(); - while (it.hasNext()) { - // The start of the next hole is guaranteed to fall within the original query's target date range. Add a target date range from one day after - // the end of the previous hole to one day before the start of the next hole. + while (it.hasNext() && (endOfPrevRange.getTime() < config.getEndDate().getTime())) { + // The start of the next index hole is guaranteed to fall within the original query's target date range. Add a date range from + // one millisecond after the end of the previous index hole to one millisecond before the start of the next index hole. + // This date range is between index holes and is indexed Pair currentHole = it.next(); - subDateRanges.add(Pair.of(oneDayAfter(endOfPrevHole), oneDayBefore(currentHole.getLeft()))); + subDateRanges.add(Pair.of(oneMsAfter(endOfPrevRange), oneMsBefore(currentHole.getLeft()))); - // If there is another hole, the current hole is guaranteed to fall within the original target's date range. Add it to the sub ranges. if (it.hasNext()) { + // If there is another index hole, the current index hole is guaranteed to fall within the original + // target's date range. Add it to the sub ranges. This date range is not indexed subDateRanges.add(currentHole); + endOfPrevRange = currentHole.getRight(); } else { - // If this is the last hole, it is possible that the end date falls outside the original query's target date range. If so, shorten it to end - // at the original target end date. + // If this is the last hole, it is possible that the endDate falls outside the original query's target date range. + // If so, shorten it to end at the original query endDate. This date range is not indexed if (currentHole.getRight().getTime() > config.getEndDate().getTime()) { subDateRanges.add(Pair.of(currentHole.getLeft(), config.getEndDate())); + endOfPrevRange = config.getEndDate(); } else { // If it does not fall outside the target date range, include it as is. subDateRanges.add(currentHole); + endOfPrevRange = currentHole.getRight(); } } - endOfPrevHole = currentHole.getRight(); } - // If the last hole we saw ended before the end of the original query's target date range, add a target date range from one day after the end of the - // last hole to the original target end date. - if (endOfPrevHole.getTime() < config.getEndDate().getTime()) { - subDateRanges.add(Pair.of(oneDayAfter(endOfPrevHole), new Date(config.getEndDate().getTime()))); + // If the last hole we saw ended before the end of the original query's target date range, add date range from one + // millisecond after the end of the last index hole to the original query endDate. + if (endOfPrevRange.getTime() < config.getEndDate().getTime()) { + subDateRanges.add(Pair.of(oneMsAfter(endOfPrevRange), config.getEndDate())); } } return subDateRanges; } + private SortedSet> spanEntireDays(Collection> holes) { + SortedSet> holesThatSpanEntireDays = new TreeSet<>(); + holes.stream().forEach(p -> holesThatSpanEntireDays.add(spanEntireDays(p))); + return holesThatSpanEntireDays; + } + + private Pair spanEntireDays(Pair hole) { + Calendar begin = Calendar.getInstance(); + begin.setTime(hole.getLeft()); + begin.set(Calendar.HOUR, 0); + begin.set(Calendar.MINUTE, 0); + begin.set(Calendar.SECOND, 0); + begin.set(Calendar.MILLISECOND, 0); + Calendar end = Calendar.getInstance(); + end.setTime(hole.getRight()); + end.set(Calendar.HOUR, 23); + end.set(Calendar.MINUTE, 59); + end.set(Calendar.SECOND, 59); + end.set(Calendar.MILLISECOND, 999); + return Pair.of(begin.getTime(), end.getTime()); + } + /** * Return the set of fields in the query. */ - private Set getFieldsForQuery(ShardQueryConfiguration config, String query, ScannerFactory scannerFactory) throws NoResultsException { + protected Set getFieldsForQuery(ShardQueryConfiguration config, String query, ScannerFactory scannerFactory) throws NoResultsException { // Parse the query. ASTJexlScript queryTree = queryPlanner.parseQueryAndValidatePattern(query, null); @@ -672,10 +700,31 @@ private Date oneDayBefore(Date date) { return addDays(date, -1); } + /** + * Return one millisecond after the given date. + */ + private Date oneMsAfter(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date(date.getTime())); + calendar.add(Calendar.MILLISECOND, 1); + return calendar.getTime(); + } + + /** + * Return one millisecond before the given date. + */ + private Date oneMsBefore(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date(date.getTime())); + calendar.add(Calendar.MILLISECOND, -1); + return calendar.getTime(); + } + /** * Return the given date with the number of dates added to it. */ private Date addDays(Date date, int daysToAdd) { + Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date(date.getTime())); calendar.add(Calendar.DATE, daysToAdd); return calendar.getTime(); diff --git a/warehouse/query-core/src/test/java/datawave/query/planner/FederatedQueryTest.java b/warehouse/query-core/src/test/java/datawave/query/planner/FederatedQueryTest.java index 3d699133e5..17dc2de16f 100644 --- a/warehouse/query-core/src/test/java/datawave/query/planner/FederatedQueryTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/planner/FederatedQueryTest.java @@ -4,6 +4,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -12,15 +13,17 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.SortedSet; import java.util.StringJoiner; import java.util.TimeZone; +import java.util.TreeSet; import java.util.UUID; import javax.inject.Inject; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.security.Authorizations; -import org.apache.log4j.Level; +import org.apache.commons.lang3.tuple.Pair; import org.apache.log4j.Logger; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; @@ -44,8 +47,6 @@ import datawave.ingest.data.TypeRegistry; import datawave.microservice.query.QueryImpl; import datawave.query.QueryTestTableHelper; -import datawave.query.RebuildingScannerTestHelper; -import datawave.query.function.JexlEvaluation; import datawave.query.function.deserializer.KryoDocumentDeserializer; import datawave.query.tables.ShardQueryLogic; import datawave.query.tables.edge.DefaultEdgeEventQueryLogic; @@ -131,7 +132,8 @@ public String toString() { protected ShardQueryLogic logic; protected KryoDocumentDeserializer deserializer; - private final DateFormat format = new SimpleDateFormat("yyyyMMdd"); + private final DateFormat formatDate = new SimpleDateFormat("yyyyMMdd"); + private final DateFormat formatDateTime = new SimpleDateFormat("yyyyMMdd HHmmss"); private final List eventConfigs = new ArrayList<>(); private final Map queryParameters = new HashMap<>(); private final Set expectedEvents = new HashSet<>(); @@ -192,11 +194,19 @@ private void givenQuery(String query) { } private void givenStartDate(String date) throws ParseException { - this.startDate = format.parse(date); + if (date.length() == 8) { + this.startDate = formatDate.parse(date); + } else { + this.startDate = formatDateTime.parse(date); + } } private void givenEndDate(String date) throws ParseException { - this.endDate = format.parse(date); + if (date.length() == 8) { + this.endDate = formatDate.parse(date); + } else { + this.endDate = formatDateTime.parse(date); + } } private void givenFieldIndexMinThreshold(double threshold) { @@ -218,6 +228,90 @@ private AccumuloClient createClient() throws Exception { return client; } + private Date addDays(Date date, int days) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date(date.getTime())); + calendar.add(Calendar.DATE, days); + return calendar.getTime(); + } + + private Date midnight(Date date) { + Calendar midnight = Calendar.getInstance(); + midnight.setTime(date); + midnight.set(Calendar.HOUR, 0); + midnight.set(Calendar.MINUTE, 0); + midnight.set(Calendar.SECOND, 0); + midnight.set(Calendar.MILLISECOND, 0); + return midnight.getTime(); + } + + /* + * ensure that each subRange has all days with holes or all days with no holes ensure that all milliseconds in the original date range are covered + */ + private void assertSubrangesCorrect() throws Exception { + FederatedQueryPlanner queryPlanner = (FederatedQueryPlanner) logic.getQueryPlanner(); + + // Ensure that each subRange has all days with holes or all days with no holes + Set fieldsInQuery = queryPlanner.getFieldsForQuery(this.logic.getConfig(), this.query, logic.getScannerFactory()); + Set datesWithHoles = new HashSet<>(); + Set datesWithoutHoles = new HashSet<>(); + this.eventConfigs.forEach(config -> { + if (config.getTime() >= this.startDate.getTime() && config.getTime() <= this.endDate.getTime()) { + // field has to be in the query and fieldIndexHoleMinThreshold != null and index / frequency < fieldIndexHoleMinThreshold + boolean hasHoles = config.getMetadataCounts().entrySet().stream().filter(e -> fieldsInQuery.contains(e.getKey())) + .anyMatch(e -> this.fieldIndexHoleMinThreshold != null && ((double) (e.getValue().getValue1()) + / ((double) e.getValue().getValue0())) < this.fieldIndexHoleMinThreshold); + if (hasHoles) { + datesWithHoles.add(new Date(config.getTime())); + } else { + datesWithoutHoles.add(new Date(config.getTime())); + } + } + }); + + SortedSet> subRanges = queryPlanner.getSubQueryDateRanges(logic.getConfig(), this.query, logic.getScannerFactory()); + // Subranges are sorted and should begin with the query beginDate and end with the query endDate + Pair firstSubRange = subRanges.stream().findFirst().get(); + Assert.assertNotNull("firstSubRange should not be null", firstSubRange); + Assert.assertEquals("begin of lastSubRange should equal query beginDate", this.startDate.getTime(), firstSubRange.getLeft().getTime()); + Pair lastSubRange = subRanges.stream().reduce((first, second) -> second).get(); + Assert.assertNotNull("lastSubRange should not be null", lastSubRange); + Assert.assertEquals("end of lastSubRange should equal query endDate", this.endDate.getTime(), lastSubRange.getRight().getTime()); + + Pair previousPair = null; + for (Pair range : subRanges) { + Set datesWithHolesInRange = new TreeSet<>(); + Set datesWithoutHolesInRange = new TreeSet<>(); + // adding 24 hours to b is guaranteed to fall on the next sequential date until we are outside the range + for (Date b = new Date(range.getLeft().getTime()); b.getTime() <= range.getRight().getTime(); b = addDays(b, 1)) { + if (datesWithHoles.contains(midnight(b))) { + datesWithHolesInRange.add(formatDate.format(b)); + } + if (datesWithoutHoles.contains(midnight(b))) { + datesWithoutHolesInRange.add(formatDate.format(b)); + } + } + // adding 24 hours to b is guaranteed to fall on the next sequential date, but this might miss + // the range end date so perform the same check on the range end date here + if (datesWithHoles.contains(midnight(range.getRight()))) { + datesWithHolesInRange.add(formatDate.format(range.getRight())); + } + if (datesWithoutHoles.contains(midnight(range.getRight()))) { + datesWithoutHolesInRange.add(formatDate.format(range.getRight())); + } + + Assert.assertFalse("Subrange " + range + " must have all days with holes or all days with no holes: hasHoles:" + datesWithHolesInRange + + " hasNoHoles:" + datesWithoutHolesInRange, !datesWithHolesInRange.isEmpty() && !datesWithoutHolesInRange.isEmpty()); + + // check that there is one millisecond difference between the end of one range and the beginning of the next + if (previousPair != null) { + long difference = range.getLeft().getTime() - previousPair.getRight().getTime(); + Assert.assertEquals("Expected difference of 1ms, got " + difference, 1, difference); + } + previousPair = range; + } + } + private void assertQueryResults() throws Exception { // Initialize the query settings. QueryImpl settings = new QueryImpl(); @@ -298,6 +392,7 @@ public void testNoFieldIndexHoles() throws Exception { expectEvents("20130105", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); } /** @@ -321,6 +416,7 @@ public void testFieldIndexHolesOutsideDateRange() throws Exception { expectEvents("20130104", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); } /** @@ -345,6 +441,7 @@ public void testFieldIndexHolesWithinDateRange() throws Exception { expectEvents("20130105", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); } /** @@ -368,6 +465,7 @@ public void testFieldIndexHolesPartiallyWithinDateRange() throws Exception { expectEvents("20130104", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); } /** @@ -392,6 +490,7 @@ public void testConsecutiveFieldIndexHolesForDifferentFields() throws Exception expectEvents("20130105", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); } /** @@ -416,6 +515,7 @@ public void testOverlappingFieldIndexHolesForDifferentFields() throws Exception expectEvents("20130105", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); } /** @@ -440,6 +540,7 @@ public void testOverlappingFieldIndexHolesForDifferentFieldsNoSingleDates() thro expectEvents("20130105", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); } /** @@ -464,6 +565,29 @@ public void testFieldIndexHolesAtStartOfRange() throws Exception { expectEvents("20130105", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); + } + + @Test + public void testFieldIndexHolesAtEndOfRange() throws Exception { + configureEvent(FieldIndexHoleDataIngest.EventConfig.forDate("20130101")); + configureEvent(FieldIndexHoleDataIngest.EventConfig.forDate("20130102").withMetadataCount("UUID", 10L, 1L)); + configureEvent(FieldIndexHoleDataIngest.EventConfig.forDate("20130103")); + configureEvent(FieldIndexHoleDataIngest.EventConfig.forDate("20130104").withMetadataCount("UUID", 10L, 1L)); + configureEvent(FieldIndexHoleDataIngest.EventConfig.forDate("20130105").withMetadataCount("UUID", 10L, 1L)); + + givenQuery("UUID =~ '^[CS].*'"); + givenStartDate("20120101"); + givenEndDate("20130105 120000"); + + expectEvents("20130101", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); + expectEvents("20130102", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); + expectEvents("20130103", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); + expectEvents("20130104", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); + expectEvents("20130105", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); + + assertQueryResults(); + assertSubrangesCorrect(); } /** @@ -489,6 +613,7 @@ public void testFieldIndexMinThresholdWithAllMeeting() throws Exception { expectEvents("20130105", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); } /** @@ -514,5 +639,6 @@ public void testFieldIndexMinThresholdWithSomeNotMeeting() throws Exception { expectEvents("20130105", FieldIndexHoleDataIngest.corleoneUID, FieldIndexHoleDataIngest.caponeUID, FieldIndexHoleDataIngest.sopranoUID); assertQueryResults(); + assertSubrangesCorrect(); } } diff --git a/warehouse/query-core/src/test/java/datawave/query/util/FieldIndexHoleDataIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/FieldIndexHoleDataIngest.java index d69946fdb5..5e3b97cc4e 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/FieldIndexHoleDataIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/FieldIndexHoleDataIngest.java @@ -115,6 +115,10 @@ public boolean hasCountsForField(String field) { public Pair getMetadataCounts(String field) { return metadataCounts.get(field); } + + public Map> getMetadataCounts() { + return metadataCounts; + } } public static void writeItAll(AccumuloClient client, Range range, List eventConfigs) throws Exception { From e0703e98471990a98929f4d10c184077dbaac4c2 Mon Sep 17 00:00:00 2001 From: Joseph Alphonso Date: Thu, 9 Jan 2025 07:27:50 -0500 Subject: [PATCH 04/11] refactor query ExcerptTest (#2683) Co-authored-by: Joe Alphonso --- .../test/java/datawave/query/ExcerptTest.java | 219 ++++++++---------- 1 file changed, 103 insertions(+), 116 deletions(-) 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); } } From ee84f3c1565f5c148029eb7f236e1041ec22972c Mon Sep 17 00:00:00 2001 From: hgklohr Date: Thu, 9 Jan 2025 13:53:04 +0000 Subject: [PATCH 05/11] Update pom's for 7.14.0-SNAPSHOT --- common-test/pom.xml | 2 +- contrib/datawave-quickstart/docker/pom.xml | 2 +- core/cached-results/pom.xml | 2 +- core/common-util/pom.xml | 2 +- core/common/pom.xml | 2 +- core/connection-pool/pom.xml | 2 +- core/map-reduce/pom.xml | 2 +- core/modification/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/utils/pom.xml | 2 +- docs/pom.xml | 2 +- microservices/pom.xml | 2 +- microservices/services/pom.xml | 2 +- microservices/starters/pom.xml | 2 +- pom.xml | 2 +- warehouse/accumulo-extensions/pom.xml | 2 +- warehouse/age-off-utils/pom.xml | 2 +- warehouse/age-off/pom.xml | 2 +- warehouse/assemble/datawave/pom.xml | 2 +- warehouse/assemble/pom.xml | 2 +- warehouse/assemble/webservice/pom.xml | 2 +- warehouse/common/pom.xml | 2 +- warehouse/core/pom.xml | 2 +- warehouse/data-dictionary-core/pom.xml | 2 +- warehouse/edge-dictionary-core/pom.xml | 2 +- warehouse/edge-model-configuration-core/pom.xml | 2 +- warehouse/index-stats/pom.xml | 2 +- warehouse/ingest-configuration/pom.xml | 2 +- warehouse/ingest-core/pom.xml | 2 +- warehouse/ingest-csv/pom.xml | 2 +- warehouse/ingest-json/pom.xml | 2 +- warehouse/ingest-nyctlc/pom.xml | 2 +- warehouse/ingest-scripts/pom.xml | 2 +- warehouse/ingest-ssdeep/pom.xml | 2 +- warehouse/ingest-wikipedia/pom.xml | 2 +- warehouse/metrics-core/pom.xml | 2 +- warehouse/ops-tools/config-compare/pom.xml | 2 +- warehouse/ops-tools/index-validation/pom.xml | 2 +- warehouse/ops-tools/pom.xml | 2 +- warehouse/pom.xml | 2 +- warehouse/query-core/pom.xml | 2 +- warehouse/regression-testing/pom.xml | 2 +- warehouse/ssdeep-common/pom.xml | 2 +- web-services/accumulo/pom.xml | 2 +- web-services/atom/pom.xml | 2 +- web-services/cached-results/pom.xml | 2 +- web-services/client/pom.xml | 2 +- web-services/common-util/pom.xml | 2 +- web-services/common/pom.xml | 2 +- web-services/deploy/application/pom.xml | 2 +- web-services/deploy/configuration/pom.xml | 2 +- web-services/deploy/docs/pom.xml | 2 +- web-services/deploy/pom.xml | 2 +- web-services/deploy/spring-framework-integration/pom.xml | 2 +- web-services/dictionary/pom.xml | 2 +- web-services/examples/client-login/pom.xml | 2 +- web-services/examples/http-client/pom.xml | 2 +- web-services/examples/jms-client/pom.xml | 2 +- web-services/examples/pom.xml | 2 +- web-services/examples/query-war/pom.xml | 2 +- web-services/map-reduce-embedded/pom.xml | 2 +- web-services/map-reduce-status/pom.xml | 2 +- web-services/map-reduce/pom.xml | 2 +- web-services/metrics/pom.xml | 2 +- web-services/model/pom.xml | 2 +- web-services/modification/pom.xml | 2 +- web-services/pom.xml | 2 +- web-services/query-websocket/pom.xml | 2 +- web-services/query/pom.xml | 2 +- web-services/rest-api/pom.xml | 2 +- web-services/security/pom.xml | 2 +- web-services/web-root/pom.xml | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) 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/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 From c0eceed9eb2cd0c57ddd14c88554e2d25b24a3fe Mon Sep 17 00:00:00 2001 From: hgklohr Date: Thu, 9 Jan 2025 13:54:36 +0000 Subject: [PATCH 06/11] 7.13.0 --- common-test/pom.xml | 2 +- contrib/datawave-quickstart/docker/pom.xml | 2 +- core/cached-results/pom.xml | 2 +- core/common-util/pom.xml | 2 +- core/common/pom.xml | 2 +- core/connection-pool/pom.xml | 2 +- core/map-reduce/pom.xml | 2 +- core/modification/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/utils/pom.xml | 2 +- docs/pom.xml | 2 +- microservices/pom.xml | 2 +- microservices/services/pom.xml | 2 +- microservices/starters/pom.xml | 2 +- pom.xml | 2 +- warehouse/accumulo-extensions/pom.xml | 2 +- warehouse/age-off-utils/pom.xml | 2 +- warehouse/age-off/pom.xml | 2 +- warehouse/assemble/datawave/pom.xml | 2 +- warehouse/assemble/pom.xml | 2 +- warehouse/assemble/webservice/pom.xml | 2 +- warehouse/common/pom.xml | 2 +- warehouse/core/pom.xml | 2 +- warehouse/data-dictionary-core/pom.xml | 2 +- warehouse/edge-dictionary-core/pom.xml | 2 +- warehouse/edge-model-configuration-core/pom.xml | 2 +- warehouse/index-stats/pom.xml | 2 +- warehouse/ingest-configuration/pom.xml | 2 +- warehouse/ingest-core/pom.xml | 2 +- warehouse/ingest-csv/pom.xml | 2 +- warehouse/ingest-json/pom.xml | 2 +- warehouse/ingest-nyctlc/pom.xml | 2 +- warehouse/ingest-scripts/pom.xml | 2 +- warehouse/ingest-ssdeep/pom.xml | 2 +- warehouse/ingest-wikipedia/pom.xml | 2 +- warehouse/metrics-core/pom.xml | 2 +- warehouse/ops-tools/config-compare/pom.xml | 2 +- warehouse/ops-tools/index-validation/pom.xml | 2 +- warehouse/ops-tools/pom.xml | 2 +- warehouse/pom.xml | 2 +- warehouse/query-core/pom.xml | 2 +- warehouse/regression-testing/pom.xml | 2 +- warehouse/ssdeep-common/pom.xml | 2 +- web-services/accumulo/pom.xml | 2 +- web-services/atom/pom.xml | 2 +- web-services/cached-results/pom.xml | 2 +- web-services/client/pom.xml | 2 +- web-services/common-util/pom.xml | 2 +- web-services/common/pom.xml | 2 +- web-services/deploy/application/pom.xml | 2 +- web-services/deploy/configuration/pom.xml | 2 +- web-services/deploy/docs/pom.xml | 2 +- web-services/deploy/pom.xml | 2 +- web-services/deploy/spring-framework-integration/pom.xml | 2 +- web-services/dictionary/pom.xml | 2 +- web-services/examples/client-login/pom.xml | 2 +- web-services/examples/http-client/pom.xml | 2 +- web-services/examples/jms-client/pom.xml | 2 +- web-services/examples/pom.xml | 2 +- web-services/examples/query-war/pom.xml | 2 +- web-services/map-reduce-embedded/pom.xml | 2 +- web-services/map-reduce-status/pom.xml | 2 +- web-services/map-reduce/pom.xml | 2 +- web-services/metrics/pom.xml | 2 +- web-services/model/pom.xml | 2 +- web-services/modification/pom.xml | 2 +- web-services/pom.xml | 2 +- web-services/query-websocket/pom.xml | 2 +- web-services/query/pom.xml | 2 +- web-services/rest-api/pom.xml | 2 +- web-services/security/pom.xml | 2 +- web-services/web-root/pom.xml | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) diff --git a/common-test/pom.xml b/common-test/pom.xml index c340d1e48a..bc2e978c6e 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.13.0 datawave-common-test ${project.artifactId} diff --git a/contrib/datawave-quickstart/docker/pom.xml b/contrib/datawave-quickstart/docker/pom.xml index de19a23c2d..d345c34523 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.13.0 ../../../pom.xml quickstart diff --git a/core/cached-results/pom.xml b/core/cached-results/pom.xml index 9c5dbd86f1..de7a5073ab 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.13.0 datawave-core-cached-results ${project.artifactId} diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml index f7ee5e356f..2c44666b38 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.13.0 datawave-core-common-util ${project.artifactId} diff --git a/core/common/pom.xml b/core/common/pom.xml index 77522fd9a1..9f35508258 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.13.0 datawave-core-common ${project.artifactId} diff --git a/core/connection-pool/pom.xml b/core/connection-pool/pom.xml index 9c3ed01fa4..650fe3bc4e 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.13.0 datawave-core-connection-pool ${project.artifactId} diff --git a/core/map-reduce/pom.xml b/core/map-reduce/pom.xml index 3545496447..33987689e2 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.13.0 datawave-core-map-reduce ${project.artifactId} diff --git a/core/modification/pom.xml b/core/modification/pom.xml index 3f6e8cf631..adae7736f7 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.13.0 datawave-core-modification ${project.artifactId} diff --git a/core/pom.xml b/core/pom.xml index ebb7175043..a25221a401 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.13.0 gov.nsa.datawave.core datawave-core-parent diff --git a/core/query/pom.xml b/core/query/pom.xml index a80897693a..05c21917ca 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.13.0 datawave-core-query ${project.artifactId} diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 9cfbcece2c..0838e15633 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.13.0 gov.nsa.datawave.core datawave-utils-parent diff --git a/docs/pom.xml b/docs/pom.xml index 3bf8e7133e..6bbdbdbbea 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.13.0 datawave-docs diff --git a/microservices/pom.xml b/microservices/pom.xml index 396af33b29..f478237aa2 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.13.0 gov.nsa.datawave.microservice datawave-microservice-build-parent diff --git a/microservices/services/pom.xml b/microservices/services/pom.xml index af7613a61d..a84b680219 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.13.0 datawave-microservice-service-build-parent pom diff --git a/microservices/starters/pom.xml b/microservices/starters/pom.xml index e59a2a4e49..13d17e2d82 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.13.0 datawave-microservice-starter-build-parent pom diff --git a/pom.xml b/pom.xml index 3d470b98d4..55d8627af0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.13.0 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..303647fc45 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.13.0 datawave-accumulo-extensions ${project.artifactId} diff --git a/warehouse/age-off-utils/pom.xml b/warehouse/age-off-utils/pom.xml index 38a8617dd3..b64d7cbda5 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.13.0 datawave-age-off-utils ${project.artifactId} diff --git a/warehouse/age-off/pom.xml b/warehouse/age-off/pom.xml index 64b5d313f9..23067621ab 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.13.0 datawave-age-off ${project.artifactId} diff --git a/warehouse/assemble/datawave/pom.xml b/warehouse/assemble/datawave/pom.xml index 960c15ee07..b765d92c6b 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.13.0 assemble-datawave jar diff --git a/warehouse/assemble/pom.xml b/warehouse/assemble/pom.xml index 3c8d9a3f09..790c95c1ed 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.13.0 assemble-parent pom diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index 968f755c53..2451fdea67 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.13.0 assemble-webservice ${project.artifactId} diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml index 8fe59a7c3c..b3374e4319 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.13.0 datawave-common ${project.artifactId} diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index fabb7a2798..2f7272a08a 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.13.0 datawave-core jar diff --git a/warehouse/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml index 38e16d610f..aa8c03c98b 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.13.0 datawave-data-dictionary-core jar diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml index 407f1e4272..4639b3d2bd 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.13.0 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..45fb3c706a 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.13.0 datawave-edge-model-configuration-core jar diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index 6b6e9a6506..f22455b20b 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.13.0 datawave-index-stats jar diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml index e48c586147..e12ae2446b 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.13.0 datawave-ingest-configuration diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index 90fb606c9b..959e1c089a 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.13.0 datawave-ingest-core jar diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index 15a7961135..964ba8748f 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.13.0 datawave-ingest-csv jar diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index 7353391f33..a4dd3d81a5 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.13.0 datawave-ingest-json jar diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml index dd9b9acb17..d0cb08d15d 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.13.0 datawave-ingest-nyctlc jar diff --git a/warehouse/ingest-scripts/pom.xml b/warehouse/ingest-scripts/pom.xml index 325bff42ea..ec7f78254a 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.13.0 datawave-ingest-scripts ${project.artifactId} diff --git a/warehouse/ingest-ssdeep/pom.xml b/warehouse/ingest-ssdeep/pom.xml index 6fd679cf76..26a4175171 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.13.0 datawave-ingest-ssdeep diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml index 83d09f468b..90bad0f326 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.13.0 datawave-ingest-wikipedia jar diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml index 136f22bbe6..c0571134f6 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.13.0 datawave-metrics-core jar diff --git a/warehouse/ops-tools/config-compare/pom.xml b/warehouse/ops-tools/config-compare/pom.xml index eefe49bf57..0453915e0b 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.13.0 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..b18447730d 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.13.0 datawave-ops-tools-index-validation jar diff --git a/warehouse/ops-tools/pom.xml b/warehouse/ops-tools/pom.xml index c8e99e19d4..efb7900d97 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.13.0 datawave-ops-tools-parent pom diff --git a/warehouse/pom.xml b/warehouse/pom.xml index b7d8f73fa7..0570198d97 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0-SNAPSHOT + 7.13.0 datawave-warehouse-parent pom diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index 25be249ea0..94a7d6e0cc 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.13.0 datawave-query-core jar diff --git a/warehouse/regression-testing/pom.xml b/warehouse/regression-testing/pom.xml index 1976f124cd..8688ed307c 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.13.0 datawave-regression-testing ${project.artifactId} diff --git a/warehouse/ssdeep-common/pom.xml b/warehouse/ssdeep-common/pom.xml index 419ac4a44a..2a05e582e1 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.13.0 datawave-ssdeep-common diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index d5105ed39d..20b35444b2 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.13.0 datawave-ws-accumulo ejb diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml index ee9adc557d..412aed7380 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.13.0 datawave-ws-atom ejb diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml index 1be0e6f460..0378154e0a 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.13.0 datawave-ws-cached-results ejb diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index b5c61ef65f..45d98a064c 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.13.0 datawave-ws-client jar diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index 220de0a1cd..bab63d6c40 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.13.0 datawave-ws-common-util jar diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index dcf641c672..1501c0b4a6 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.13.0 datawave-ws-common ejb diff --git a/web-services/deploy/application/pom.xml b/web-services/deploy/application/pom.xml index 3902115f4b..2c7c732024 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.13.0 datawave-ws-deploy-application ear diff --git a/web-services/deploy/configuration/pom.xml b/web-services/deploy/configuration/pom.xml index 86c6b5604d..a1fcbdb5fb 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.13.0 datawave-ws-deploy-configuration jar diff --git a/web-services/deploy/docs/pom.xml b/web-services/deploy/docs/pom.xml index 65cdbab645..ca3497638d 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.13.0 datawave-ws-deploy-docs war diff --git a/web-services/deploy/pom.xml b/web-services/deploy/pom.xml index c39e870196..7c0e761b3e 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.13.0 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..c604144e04 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.13.0 spring-framework-integration ${project.artifactId} diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index c26e60c41c..64123d6f14 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.13.0 datawave-ws-dictionary ejb diff --git a/web-services/examples/client-login/pom.xml b/web-services/examples/client-login/pom.xml index 894dc78d8a..22a2b7fcd9 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.13.0 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..725795dd97 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.13.0 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..931b9d58b0 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.13.0 datawave-ws-examples-jms-client jar diff --git a/web-services/examples/pom.xml b/web-services/examples/pom.xml index ff8dc100e5..7ea5d9508a 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.13.0 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..43596713ed 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.13.0 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..036966fb14 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.13.0 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..193a764116 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.13.0 datawave-ws-map-reduce-status ejb diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index 8f1c89a09b..c9e22cff2d 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.13.0 datawave-ws-map-reduce ejb diff --git a/web-services/metrics/pom.xml b/web-services/metrics/pom.xml index 8b7d3c42bd..400ab1ddd6 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.13.0 datawave-ws-metrics ejb diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index c1f606e4cf..719833e826 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.13.0 datawave-ws-model ejb diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml index bfc58214da..4ca92ae8c7 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.13.0 datawave-ws-modification ejb diff --git a/web-services/pom.xml b/web-services/pom.xml index 958283e825..8f2e332875 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.13.0 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..4a725549c1 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.13.0 datawave-ws-query-websocket war diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index 96b02b5e77..55eaa340c0 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.13.0 datawave-ws-query ejb diff --git a/web-services/rest-api/pom.xml b/web-services/rest-api/pom.xml index 3b437cf651..5c9d614979 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.13.0 datawave-ws-rest-api war diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index e40f9d3f84..526bd34aaa 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.13.0 datawave-ws-security ejb diff --git a/web-services/web-root/pom.xml b/web-services/web-root/pom.xml index 4b7d900181..a8a5fc22d6 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.13.0 datawave-ws-web-root war From 0eb3c0d7d53be3149c4aed2960d4021279b10548 Mon Sep 17 00:00:00 2001 From: hgklohr Date: Thu, 9 Jan 2025 13:56:06 +0000 Subject: [PATCH 07/11] 7.13.1-SNAPSHOT --- common-test/pom.xml | 2 +- contrib/datawave-quickstart/docker/pom.xml | 2 +- core/cached-results/pom.xml | 2 +- core/common-util/pom.xml | 2 +- core/common/pom.xml | 2 +- core/connection-pool/pom.xml | 2 +- core/map-reduce/pom.xml | 2 +- core/modification/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/utils/pom.xml | 2 +- docs/pom.xml | 2 +- microservices/pom.xml | 2 +- microservices/services/pom.xml | 2 +- microservices/starters/pom.xml | 2 +- pom.xml | 2 +- warehouse/accumulo-extensions/pom.xml | 2 +- warehouse/age-off-utils/pom.xml | 2 +- warehouse/age-off/pom.xml | 2 +- warehouse/assemble/datawave/pom.xml | 2 +- warehouse/assemble/pom.xml | 2 +- warehouse/assemble/webservice/pom.xml | 2 +- warehouse/common/pom.xml | 2 +- warehouse/core/pom.xml | 2 +- warehouse/data-dictionary-core/pom.xml | 2 +- warehouse/edge-dictionary-core/pom.xml | 2 +- warehouse/edge-model-configuration-core/pom.xml | 2 +- warehouse/index-stats/pom.xml | 2 +- warehouse/ingest-configuration/pom.xml | 2 +- warehouse/ingest-core/pom.xml | 2 +- warehouse/ingest-csv/pom.xml | 2 +- warehouse/ingest-json/pom.xml | 2 +- warehouse/ingest-nyctlc/pom.xml | 2 +- warehouse/ingest-scripts/pom.xml | 2 +- warehouse/ingest-ssdeep/pom.xml | 2 +- warehouse/ingest-wikipedia/pom.xml | 2 +- warehouse/metrics-core/pom.xml | 2 +- warehouse/ops-tools/config-compare/pom.xml | 2 +- warehouse/ops-tools/index-validation/pom.xml | 2 +- warehouse/ops-tools/pom.xml | 2 +- warehouse/pom.xml | 2 +- warehouse/query-core/pom.xml | 2 +- warehouse/regression-testing/pom.xml | 2 +- warehouse/ssdeep-common/pom.xml | 2 +- web-services/accumulo/pom.xml | 2 +- web-services/atom/pom.xml | 2 +- web-services/cached-results/pom.xml | 2 +- web-services/client/pom.xml | 2 +- web-services/common-util/pom.xml | 2 +- web-services/common/pom.xml | 2 +- web-services/deploy/application/pom.xml | 2 +- web-services/deploy/configuration/pom.xml | 2 +- web-services/deploy/docs/pom.xml | 2 +- web-services/deploy/pom.xml | 2 +- web-services/deploy/spring-framework-integration/pom.xml | 2 +- web-services/dictionary/pom.xml | 2 +- web-services/examples/client-login/pom.xml | 2 +- web-services/examples/http-client/pom.xml | 2 +- web-services/examples/jms-client/pom.xml | 2 +- web-services/examples/pom.xml | 2 +- web-services/examples/query-war/pom.xml | 2 +- web-services/map-reduce-embedded/pom.xml | 2 +- web-services/map-reduce-status/pom.xml | 2 +- web-services/map-reduce/pom.xml | 2 +- web-services/metrics/pom.xml | 2 +- web-services/model/pom.xml | 2 +- web-services/modification/pom.xml | 2 +- web-services/pom.xml | 2 +- web-services/query-websocket/pom.xml | 2 +- web-services/query/pom.xml | 2 +- web-services/rest-api/pom.xml | 2 +- web-services/security/pom.xml | 2 +- web-services/web-root/pom.xml | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) diff --git a/common-test/pom.xml b/common-test/pom.xml index bc2e978c6e..045458b58f 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0 + 7.13.1-SNAPSHOT datawave-common-test ${project.artifactId} diff --git a/contrib/datawave-quickstart/docker/pom.xml b/contrib/datawave-quickstart/docker/pom.xml index d345c34523..5383e41252 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 + 7.13.1-SNAPSHOT ../../../pom.xml quickstart diff --git a/core/cached-results/pom.xml b/core/cached-results/pom.xml index de7a5073ab..3978c7efb6 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 + 7.13.1-SNAPSHOT datawave-core-cached-results ${project.artifactId} diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml index 2c44666b38..0d53fe07b6 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 + 7.13.1-SNAPSHOT datawave-core-common-util ${project.artifactId} diff --git a/core/common/pom.xml b/core/common/pom.xml index 9f35508258..53ce69a417 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 + 7.13.1-SNAPSHOT datawave-core-common ${project.artifactId} diff --git a/core/connection-pool/pom.xml b/core/connection-pool/pom.xml index 650fe3bc4e..da23027b4c 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 + 7.13.1-SNAPSHOT datawave-core-connection-pool ${project.artifactId} diff --git a/core/map-reduce/pom.xml b/core/map-reduce/pom.xml index 33987689e2..15c7fe5e47 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 + 7.13.1-SNAPSHOT datawave-core-map-reduce ${project.artifactId} diff --git a/core/modification/pom.xml b/core/modification/pom.xml index adae7736f7..d26ca0e659 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 + 7.13.1-SNAPSHOT datawave-core-modification ${project.artifactId} diff --git a/core/pom.xml b/core/pom.xml index a25221a401..c62c8515a3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0 + 7.13.1-SNAPSHOT gov.nsa.datawave.core datawave-core-parent diff --git a/core/query/pom.xml b/core/query/pom.xml index 05c21917ca..a84c96ef89 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 + 7.13.1-SNAPSHOT datawave-core-query ${project.artifactId} diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 0838e15633..fb43d60afa 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 + 7.13.1-SNAPSHOT gov.nsa.datawave.core datawave-utils-parent diff --git a/docs/pom.xml b/docs/pom.xml index 6bbdbdbbea..53e9a901a8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0 + 7.13.1-SNAPSHOT datawave-docs diff --git a/microservices/pom.xml b/microservices/pom.xml index f478237aa2..f2cbf6d9e2 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0 + 7.13.1-SNAPSHOT gov.nsa.datawave.microservice datawave-microservice-build-parent diff --git a/microservices/services/pom.xml b/microservices/services/pom.xml index a84b680219..4f587dea1e 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 + 7.13.1-SNAPSHOT datawave-microservice-service-build-parent pom diff --git a/microservices/starters/pom.xml b/microservices/starters/pom.xml index 13d17e2d82..36149b31dc 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 + 7.13.1-SNAPSHOT datawave-microservice-starter-build-parent pom diff --git a/pom.xml b/pom.xml index 55d8627af0..3f39f0e4b0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gov.nsa.datawave datawave-parent - 7.13.0 + 7.13.1-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 303647fc45..3e696ddf41 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 + 7.13.1-SNAPSHOT datawave-accumulo-extensions ${project.artifactId} diff --git a/warehouse/age-off-utils/pom.xml b/warehouse/age-off-utils/pom.xml index b64d7cbda5..fcfc2cb712 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 + 7.13.1-SNAPSHOT datawave-age-off-utils ${project.artifactId} diff --git a/warehouse/age-off/pom.xml b/warehouse/age-off/pom.xml index 23067621ab..933b4b473b 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 + 7.13.1-SNAPSHOT datawave-age-off ${project.artifactId} diff --git a/warehouse/assemble/datawave/pom.xml b/warehouse/assemble/datawave/pom.xml index b765d92c6b..894a67be28 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 + 7.13.1-SNAPSHOT assemble-datawave jar diff --git a/warehouse/assemble/pom.xml b/warehouse/assemble/pom.xml index 790c95c1ed..f00cd18f38 100644 --- a/warehouse/assemble/pom.xml +++ b/warehouse/assemble/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0 + 7.13.1-SNAPSHOT assemble-parent pom diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index 2451fdea67..ae4ffbc3df 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 + 7.13.1-SNAPSHOT assemble-webservice ${project.artifactId} diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml index b3374e4319..e5b0569f07 100644 --- a/warehouse/common/pom.xml +++ b/warehouse/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0 + 7.13.1-SNAPSHOT datawave-common ${project.artifactId} diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index 2f7272a08a..37c897827a 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.13.0 + 7.13.1-SNAPSHOT datawave-core jar diff --git a/warehouse/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml index aa8c03c98b..2dded8e8a6 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 + 7.13.1-SNAPSHOT datawave-data-dictionary-core jar diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml index 4639b3d2bd..215e1a9e89 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 + 7.13.1-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 45fb3c706a..c3a0538269 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 + 7.13.1-SNAPSHOT datawave-edge-model-configuration-core jar diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index f22455b20b..86d570b36d 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 + 7.13.1-SNAPSHOT datawave-index-stats jar diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml index e12ae2446b..b172b507bd 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 + 7.13.1-SNAPSHOT datawave-ingest-configuration diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index 959e1c089a..5c4ad6bc05 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 + 7.13.1-SNAPSHOT datawave-ingest-core jar diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index 964ba8748f..b3ad9ee24c 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 + 7.13.1-SNAPSHOT datawave-ingest-csv jar diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index a4dd3d81a5..8a980e8eab 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 + 7.13.1-SNAPSHOT datawave-ingest-json jar diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml index d0cb08d15d..cbc00c35c2 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 + 7.13.1-SNAPSHOT datawave-ingest-nyctlc jar diff --git a/warehouse/ingest-scripts/pom.xml b/warehouse/ingest-scripts/pom.xml index ec7f78254a..e4283d5175 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 + 7.13.1-SNAPSHOT datawave-ingest-scripts ${project.artifactId} diff --git a/warehouse/ingest-ssdeep/pom.xml b/warehouse/ingest-ssdeep/pom.xml index 26a4175171..3dccd9deee 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 + 7.13.1-SNAPSHOT datawave-ingest-ssdeep diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml index 90bad0f326..3c9565b03b 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 + 7.13.1-SNAPSHOT datawave-ingest-wikipedia jar diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml index c0571134f6..6f8a943f7f 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 + 7.13.1-SNAPSHOT datawave-metrics-core jar diff --git a/warehouse/ops-tools/config-compare/pom.xml b/warehouse/ops-tools/config-compare/pom.xml index 0453915e0b..2714566127 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 + 7.13.1-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 b18447730d..bb9390983d 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 + 7.13.1-SNAPSHOT datawave-ops-tools-index-validation jar diff --git a/warehouse/ops-tools/pom.xml b/warehouse/ops-tools/pom.xml index efb7900d97..13fdada416 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 + 7.13.1-SNAPSHOT datawave-ops-tools-parent pom diff --git a/warehouse/pom.xml b/warehouse/pom.xml index 0570198d97..11e9579426 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0 + 7.13.1-SNAPSHOT datawave-warehouse-parent pom diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index 94a7d6e0cc..49aaffee09 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 + 7.13.1-SNAPSHOT datawave-query-core jar diff --git a/warehouse/regression-testing/pom.xml b/warehouse/regression-testing/pom.xml index 8688ed307c..12ae0f4c45 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 + 7.13.1-SNAPSHOT datawave-regression-testing ${project.artifactId} diff --git a/warehouse/ssdeep-common/pom.xml b/warehouse/ssdeep-common/pom.xml index 2a05e582e1..bcde4b548a 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 + 7.13.1-SNAPSHOT datawave-ssdeep-common diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index 20b35444b2..65092c3995 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 + 7.13.1-SNAPSHOT datawave-ws-accumulo ejb diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml index 412aed7380..b6b12084c5 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 + 7.13.1-SNAPSHOT datawave-ws-atom ejb diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml index 0378154e0a..a0e06ca23f 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 + 7.13.1-SNAPSHOT datawave-ws-cached-results ejb diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index 45d98a064c..01ccc3addf 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 + 7.13.1-SNAPSHOT datawave-ws-client jar diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index bab63d6c40..96011db628 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 + 7.13.1-SNAPSHOT datawave-ws-common-util jar diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index 1501c0b4a6..81a6c79324 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 + 7.13.1-SNAPSHOT datawave-ws-common ejb diff --git a/web-services/deploy/application/pom.xml b/web-services/deploy/application/pom.xml index 2c7c732024..0bac66fde1 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 + 7.13.1-SNAPSHOT datawave-ws-deploy-application ear diff --git a/web-services/deploy/configuration/pom.xml b/web-services/deploy/configuration/pom.xml index a1fcbdb5fb..18ccce5b57 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 + 7.13.1-SNAPSHOT datawave-ws-deploy-configuration jar diff --git a/web-services/deploy/docs/pom.xml b/web-services/deploy/docs/pom.xml index ca3497638d..b50f089e62 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 + 7.13.1-SNAPSHOT datawave-ws-deploy-docs war diff --git a/web-services/deploy/pom.xml b/web-services/deploy/pom.xml index 7c0e761b3e..58bb213649 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 + 7.13.1-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 c604144e04..28216f183c 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 + 7.13.1-SNAPSHOT spring-framework-integration ${project.artifactId} diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index 64123d6f14..f43836f233 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 + 7.13.1-SNAPSHOT datawave-ws-dictionary ejb diff --git a/web-services/examples/client-login/pom.xml b/web-services/examples/client-login/pom.xml index 22a2b7fcd9..f49d96e0a0 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 + 7.13.1-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 725795dd97..fb01c99dc5 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 + 7.13.1-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 931b9d58b0..b8d09eec6c 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 + 7.13.1-SNAPSHOT datawave-ws-examples-jms-client jar diff --git a/web-services/examples/pom.xml b/web-services/examples/pom.xml index 7ea5d9508a..543a355018 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 + 7.13.1-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 43596713ed..59db34bb49 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 + 7.13.1-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 036966fb14..37b4d012a0 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 + 7.13.1-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 193a764116..a3f7b5459a 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 + 7.13.1-SNAPSHOT datawave-ws-map-reduce-status ejb diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index c9e22cff2d..8800b39a93 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 + 7.13.1-SNAPSHOT datawave-ws-map-reduce ejb diff --git a/web-services/metrics/pom.xml b/web-services/metrics/pom.xml index 400ab1ddd6..b46bb03f26 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 + 7.13.1-SNAPSHOT datawave-ws-metrics ejb diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index 719833e826..4d4134198c 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 + 7.13.1-SNAPSHOT datawave-ws-model ejb diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml index 4ca92ae8c7..55cce5b9cc 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 + 7.13.1-SNAPSHOT datawave-ws-modification ejb diff --git a/web-services/pom.xml b/web-services/pom.xml index 8f2e332875..0768dde985 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.13.0 + 7.13.1-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 4a725549c1..6dfadb80e2 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 + 7.13.1-SNAPSHOT datawave-ws-query-websocket war diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index 55eaa340c0..0526cc9cc4 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 + 7.13.1-SNAPSHOT datawave-ws-query ejb diff --git a/web-services/rest-api/pom.xml b/web-services/rest-api/pom.xml index 5c9d614979..70d8f3fece 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 + 7.13.1-SNAPSHOT datawave-ws-rest-api war diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index 526bd34aaa..a57651e14a 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 + 7.13.1-SNAPSHOT datawave-ws-security ejb diff --git a/web-services/web-root/pom.xml b/web-services/web-root/pom.xml index a8a5fc22d6..9096745650 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 + 7.13.1-SNAPSHOT datawave-ws-web-root war From 99ae8d6f12d50af14ffc6e79918872da2eb15a79 Mon Sep 17 00:00:00 2001 From: Bill Oley Date: Thu, 9 Jan 2025 17:51:37 -0500 Subject: [PATCH 08/11] MarkingFunctionsFactory.createMarkingFunctions() should not be called as a static initializer (#2288) (#2289) Co-authored-by: Ivan Bella <347158+ivakegg@users.noreply.github.com> --- .../core/query/cachedresults/CacheableQueryRowImpl.java | 1 - .../handler/dateindex/DateIndexDataTypeHandler.java | 4 +--- .../java/datawave/ingest/csv/mr/input/CSVRecordReader.java | 3 +-- .../iterators/FieldIndexCountingIteratorPerVisibility.java | 3 +-- .../core/iterators/GlobalIndexDateSummaryIterator.java | 3 +-- .../datawave/core/iterators/ResultCountingIterator.java | 3 +-- .../main/java/datawave/query/attributes/AttributeBag.java | 7 ++----- .../java/datawave/query/discovery/TermInfoAggregation.java | 5 ++--- .../query/iterators/FieldIndexCountingIterator.java | 4 +--- .../query/metrics/ShardTableQueryMetricHandler.java | 7 +++---- 10 files changed, 13 insertions(+), 27 deletions(-) diff --git a/core/cached-results/src/main/java/datawave/core/query/cachedresults/CacheableQueryRowImpl.java b/core/cached-results/src/main/java/datawave/core/query/cachedresults/CacheableQueryRowImpl.java index ab4673fb27..ce7fd04ef5 100644 --- a/core/cached-results/src/main/java/datawave/core/query/cachedresults/CacheableQueryRowImpl.java +++ b/core/cached-results/src/main/java/datawave/core/query/cachedresults/CacheableQueryRowImpl.java @@ -19,7 +19,6 @@ import datawave.data.type.Type; import datawave.marking.MarkingFunctions; -import datawave.marking.MarkingFunctionsFactory; import datawave.webservice.query.cachedresults.CacheableQueryRow; import datawave.webservice.query.data.ObjectSizeOf; import datawave.webservice.query.util.TypedValue; diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/dateindex/DateIndexDataTypeHandler.java b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/dateindex/DateIndexDataTypeHandler.java index c4c3da5553..25fa6caee2 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/dateindex/DateIndexDataTypeHandler.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/dateindex/DateIndexDataTypeHandler.java @@ -83,8 +83,6 @@ public class DateIndexDataTypeHandler implements DataTypeHandler, public static final String DATEINDEX_TNAME = "date.index.table.name"; public static final String DATEINDEX_LPRIORITY = "date.index.table.loader.priority"; - private static final MarkingFunctions markingFunctions = MarkingFunctions.Factory.createMarkingFunctions(); - // comma delimited = values public static final String DATEINDEX_TYPE_TO_FIELDS = ".date.index.type.to.field.map"; @@ -367,7 +365,7 @@ private Value createDateIndexValue(int shard) { * @return the flattened visibility */ protected byte[] flatten(ColumnVisibility vis) { - return markingFunctions.flatten(vis); + return MarkingFunctions.Factory.createMarkingFunctions().flatten(vis); } public Text getDateIndexTableName() { diff --git a/warehouse/ingest-csv/src/main/java/datawave/ingest/csv/mr/input/CSVRecordReader.java b/warehouse/ingest-csv/src/main/java/datawave/ingest/csv/mr/input/CSVRecordReader.java index 52899115f0..f09c886b62 100644 --- a/warehouse/ingest-csv/src/main/java/datawave/ingest/csv/mr/input/CSVRecordReader.java +++ b/warehouse/ingest-csv/src/main/java/datawave/ingest/csv/mr/input/CSVRecordReader.java @@ -35,7 +35,6 @@ public class CSVRecordReader extends CSVReaderBase implements EventFixer { private static final Logger log = Logger.getLogger(CSVRecordReader.class); private static final IngestConfiguration ingestConfig = IngestConfigurationFactory.getIngestConfiguration(); - private static final MarkingFunctions markingFunctions = MarkingFunctionsFactory.createMarkingFunctions(); protected String csvEventId; private final Multimap metadataForValidation = ArrayListMultimap.create(100, 1); @@ -128,7 +127,7 @@ protected void decorateEvent() { if (null != this.securityMarkings && !this.securityMarkings.isEmpty()) { event.setSecurityMarkings(securityMarkings); try { - event.setVisibility(markingFunctions.translateToColumnVisibility(securityMarkings)); + event.setVisibility(MarkingFunctionsFactory.createMarkingFunctions().translateToColumnVisibility(securityMarkings)); } catch (MarkingFunctions.Exception e) { log.error("Could not set default ColumnVisibility for the event", e); throw new RuntimeException(e); diff --git a/warehouse/query-core/src/main/java/datawave/core/iterators/FieldIndexCountingIteratorPerVisibility.java b/warehouse/query-core/src/main/java/datawave/core/iterators/FieldIndexCountingIteratorPerVisibility.java index d250133bf4..9fa11756fe 100644 --- a/warehouse/query-core/src/main/java/datawave/core/iterators/FieldIndexCountingIteratorPerVisibility.java +++ b/warehouse/query-core/src/main/java/datawave/core/iterators/FieldIndexCountingIteratorPerVisibility.java @@ -98,7 +98,6 @@ public class FieldIndexCountingIteratorPerVisibility extends WrappingIterator im private Set columnVisibilities = Sets.newHashSet(); private TreeMap keyCache = null; - protected static final MarkingFunctions markingFunctions = MarkingFunctions.Factory.createMarkingFunctions(); // ------------------------------------------------------------------------- // ------------- Constructors @@ -566,7 +565,7 @@ private Map buildReturnKeys() { ColumnVisibility cv = null; try { // Calculate the columnVisibility for this key from the combiner. - cv = markingFunctions.combine(columnVisibilities); + cv = MarkingFunctions.Factory.createMarkingFunctions().combine(columnVisibilities); } catch (Exception e) { log.error("Could not create combined columnVisibility for the count", e); return null; diff --git a/warehouse/query-core/src/main/java/datawave/core/iterators/GlobalIndexDateSummaryIterator.java b/warehouse/query-core/src/main/java/datawave/core/iterators/GlobalIndexDateSummaryIterator.java index 081a275d2a..6329697cc9 100644 --- a/warehouse/query-core/src/main/java/datawave/core/iterators/GlobalIndexDateSummaryIterator.java +++ b/warehouse/query-core/src/main/java/datawave/core/iterators/GlobalIndexDateSummaryIterator.java @@ -45,7 +45,6 @@ public class GlobalIndexDateSummaryIterator implements SortedKeyValueIterator returnCache = new TreeMap<>(); protected Set columnVisibilities = Sets.newHashSet(); - private static MarkingFunctions markingFunctions = MarkingFunctions.Factory.createMarkingFunctions(); public GlobalIndexDateSummaryIterator() {} @@ -257,7 +256,7 @@ public Map getKeyValues() throws IOException { Set columnVisibilities = this.columnVisibilitiesMap.get(datatype); // Note that the access controls found in the combined ColumnVisibility will be pulled out appropriately here - ColumnVisibility cv = markingFunctions.combine(columnVisibilities); + ColumnVisibility cv = MarkingFunctions.Factory.createMarkingFunctions().combine(columnVisibilities); // Create a new Key compatible with the shardIndex key format Key k = new Key(this.fieldValue, this.fieldName, this.date + '\0' + datatype, new String(cv.getExpression())); diff --git a/warehouse/query-core/src/main/java/datawave/core/iterators/ResultCountingIterator.java b/warehouse/query-core/src/main/java/datawave/core/iterators/ResultCountingIterator.java index d704738a36..04027b8bea 100644 --- a/warehouse/query-core/src/main/java/datawave/core/iterators/ResultCountingIterator.java +++ b/warehouse/query-core/src/main/java/datawave/core/iterators/ResultCountingIterator.java @@ -66,7 +66,6 @@ public long read() { private String threadName = null; protected Set columnVisibilities = Sets.newHashSet(); - private static MarkingFunctions markingFunctions = MarkingFunctions.Factory.createMarkingFunctions(); public ResultCountingIterator() { threadName = Thread.currentThread().getName(); @@ -210,7 +209,7 @@ public Value getTopValue() { ColumnVisibility cv = null; try { - cv = markingFunctions.combine(columnVisibilities); + cv = MarkingFunctions.Factory.createMarkingFunctions().combine(columnVisibilities); } catch (MarkingFunctions.Exception e) { log.error("Could not create combined columnVisibility for the count", e); return null; diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/AttributeBag.java b/warehouse/query-core/src/main/java/datawave/query/attributes/AttributeBag.java index 4278f2235f..4467808c24 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/AttributeBag.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/AttributeBag.java @@ -12,7 +12,6 @@ import datawave.marking.MarkingFunctions; import datawave.marking.MarkingFunctions.Exception; -import datawave.marking.MarkingFunctionsFactory; public abstract class AttributeBag> extends Attribute implements Serializable { @@ -23,10 +22,8 @@ public abstract class AttributeBag> extends Attribute private static final long ONE_DAY_MS = 1000l * 60 * 60 * 24; - protected static final MarkingFunctions markingFunctions = MarkingFunctionsFactory.createMarkingFunctions(); - public MarkingFunctions getMarkingFunctions() { - return markingFunctions; + return MarkingFunctions.Factory.createMarkingFunctions(); } protected AttributeBag() { @@ -83,7 +80,7 @@ protected ColumnVisibility combineAndSetColumnVisibilities(Collection attr : attributes) { columnVisibilities.add(attr.getColumnVisibility()); } - return AttributeBag.markingFunctions.combine(columnVisibilities); + return MarkingFunctions.Factory.createMarkingFunctions().combine(columnVisibilities); } private long updateTimestamps() { diff --git a/warehouse/query-core/src/main/java/datawave/query/discovery/TermInfoAggregation.java b/warehouse/query-core/src/main/java/datawave/query/discovery/TermInfoAggregation.java index a8b82a790a..960a83e188 100644 --- a/warehouse/query-core/src/main/java/datawave/query/discovery/TermInfoAggregation.java +++ b/warehouse/query-core/src/main/java/datawave/query/discovery/TermInfoAggregation.java @@ -21,7 +21,6 @@ public class TermInfoAggregation implements Function,Discov private static final Logger log = Logger.getLogger(TermInfoAggregation.class); private Set columnVisibilities = Sets.newHashSet(); - private static MarkingFunctions markingFunctions = MarkingFunctions.Factory.createMarkingFunctions(); private final boolean separateCountsByColumnVisibility; private boolean showReferenceCountInsteadOfTermCount = false; private boolean reverseIndex = false; @@ -74,7 +73,7 @@ public DiscoveredThing apply(Collection from) { chosenCount = showReferenceCountInsteadOfTermCount ? referenceCount : termCount; try { - markingFunctions.translateFromColumnVisibility(ti.vis); // just to test parsing + MarkingFunctions.Factory.createMarkingFunctions().translateFromColumnVisibility(ti.vis); // just to test parsing columnVisibilities.add(ti.vis); // Keep track of counts for individual vis @@ -108,7 +107,7 @@ public DiscoveredThing apply(Collection from) { ColumnVisibility columnVisibility = null; try { - columnVisibility = markingFunctions.combine(columnVisibilities); + columnVisibility = MarkingFunctions.Factory.createMarkingFunctions().combine(columnVisibilities); } catch (Exception e) { log.warn("Invalid columnvisibility after combining!", e); diff --git a/warehouse/query-core/src/main/java/datawave/query/iterators/FieldIndexCountingIterator.java b/warehouse/query-core/src/main/java/datawave/query/iterators/FieldIndexCountingIterator.java index 263dd99ee3..360f604b25 100644 --- a/warehouse/query-core/src/main/java/datawave/query/iterators/FieldIndexCountingIterator.java +++ b/warehouse/query-core/src/main/java/datawave/query/iterators/FieldIndexCountingIterator.java @@ -91,8 +91,6 @@ public class FieldIndexCountingIterator extends WrappingIterator implements Sort private Set visibilitySet = new HashSet<>(); - protected static final MarkingFunctions markingFunctions = MarkingFunctions.Factory.createMarkingFunctions(); - // ------------------------------------------------------------------------- // ------------- Constructors public FieldIndexCountingIterator() { @@ -588,7 +586,7 @@ private Key buildReturnKey() { } ColumnVisibility cv; try { - cv = markingFunctions.combine(columnVisibilities); + cv = MarkingFunctions.Factory.createMarkingFunctions().combine(columnVisibilities); } catch (MarkingFunctions.Exception e) { log.error("Could not combine visibilities: " + visibilitySet + " " + e); return null; diff --git a/web-services/metrics/src/main/java/datawave/query/metrics/ShardTableQueryMetricHandler.java b/web-services/metrics/src/main/java/datawave/query/metrics/ShardTableQueryMetricHandler.java index 4ce461b03d..1e067dbdc8 100644 --- a/web-services/metrics/src/main/java/datawave/query/metrics/ShardTableQueryMetricHandler.java +++ b/web-services/metrics/src/main/java/datawave/query/metrics/ShardTableQueryMetricHandler.java @@ -137,7 +137,6 @@ public class ShardTableQueryMetricHandler extends BaseQueryMetricHandler connectorAuthorizationCollection = null; private String connectorAuthorizations = null; - private MarkingFunctions markingFunctions = null; @SuppressWarnings("FieldCanBeLocal") private final String JOB_ID = "job_201109071404_1"; @@ -165,7 +164,6 @@ public ShardTableQueryMetricHandler() { String accumuloPassword = conf.get("AccumuloRecordWriter.password"); byte[] encodedAccumuloPassword = Base64.encodeBase64(accumuloPassword.getBytes()); conf.set("AccumuloRecordWriter.password", new String(encodedAccumuloPassword)); - markingFunctions = MarkingFunctions.Factory.createMarkingFunctions(); } @PostConstruct @@ -286,11 +284,12 @@ private Multimap getEntries(AbstractColumnBasedHandler event.setDate(storedQueryMetric.getCreateDate().getTime()); // get security markings from metric, otherwise default to PUBLIC Map markings = updatedQueryMetric.getMarkings(); - if (markingFunctions == null || markings == null || markings.isEmpty()) { + if (markings == null || markings.isEmpty()) { event.setVisibility(new ColumnVisibility(DEFAULT_SECURITY_MARKING)); } else { try { - event.setVisibility(this.markingFunctions.translateToColumnVisibility(markings)); + MarkingFunctions markingFunctions = MarkingFunctions.Factory.createMarkingFunctions(); + event.setVisibility(markingFunctions.translateToColumnVisibility(markings)); } catch (Exception e) { log.error(e.getMessage(), e); event.setVisibility(new ColumnVisibility(DEFAULT_SECURITY_MARKING)); From a6d488bbfe64fa476e9084a5217715f941b59868 Mon Sep 17 00:00:00 2001 From: Moon Moon Date: Fri, 10 Jan 2025 13:29:57 -0500 Subject: [PATCH 09/11] Removing unused reduced response from various Attribute methods (#2630) * Removing unused calls from Attribute-based classes --- .../datawave/query/attributes/Attribute.java | 8 ++--- .../datawave/query/attributes/Attributes.java | 14 ++------ .../query/attributes/Cardinality.java | 14 ++------ .../datawave/query/attributes/Content.java | 18 +++------- .../query/attributes/DateContent.java | 14 ++------ .../query/attributes/DiacriticContent.java | 14 ++------ .../datawave/query/attributes/Document.java | 35 ++++--------------- .../query/attributes/DocumentKey.java | 14 ++------ .../datawave/query/attributes/GeoPoint.java | 14 ++------ .../datawave/query/attributes/Geometry.java | 14 ++------ .../datawave/query/attributes/IpAddress.java | 14 ++------ .../datawave/query/attributes/Latitude.java | 14 ++------ .../datawave/query/attributes/Longitude.java | 14 ++------ .../datawave/query/attributes/Numeric.java | 14 ++------ .../attributes/PreNormalizedAttribute.java | 14 ++------ .../query/attributes/TypeAttribute.java | 14 ++------ .../query/function/DataTypeAsField.java | 2 +- .../query/function/DocumentProjection.java | 12 +++---- .../query/function/FacetedGrouping.java | 2 +- .../datawave/query/function/GroupFields.java | 2 +- .../KryoCVAwareSerializableSerializer.java | 2 +- .../datawave/query/function/LimitFields.java | 2 +- .../query/function/RemoveGroupingContext.java | 2 +- .../WritableDocumentSerializer.java | 2 +- .../query/iterator/GroupingIterator.java | 2 +- .../query/transformer/ContentTransform.java | 2 +- .../transformer/FieldMappingTransform.java | 2 +- .../transformer/FieldRenameTransform.java | 2 +- .../common/grouping/DocumentGrouperTest.java | 4 +-- .../transformer/FieldRenameTransformTest.java | 6 ++-- .../transformer/UniqueTransformTest.java | 2 +- 31 files changed, 63 insertions(+), 226 deletions(-) diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/Attribute.java b/warehouse/query-core/src/main/java/datawave/query/attributes/Attribute.java index 976f310594..b425e6451f 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/Attribute.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/Attribute.java @@ -160,7 +160,7 @@ protected void clearMetadata() { metadata = null; } - protected void writeMetadata(DataOutput out, Boolean reducedResponse) throws IOException { + protected void writeMetadata(DataOutput out) throws IOException { out.writeBoolean(isMetadataSet()); if (isMetadataSet()) { byte[] cvBytes = getColumnVisibility().getExpression(); @@ -172,7 +172,7 @@ protected void writeMetadata(DataOutput out, Boolean reducedResponse) throws IOE } } - protected void writeMetadata(Kryo kryo, Output output, Boolean reducedResponse) { + protected void writeMetadata(Kryo kryo, Output output) { output.writeBoolean(isMetadataSet()); if (isMetadataSet()) { byte[] cvBytes = getColumnVisibility().getExpression(); @@ -324,9 +324,9 @@ public Attribute reduceToKeep() { } } - public abstract void write(DataOutput output, boolean reducedResponse) throws IOException; + public abstract void write(DataOutput output) throws IOException; - public abstract void write(Kryo kryo, Output output, Boolean reducedResponse); + public abstract void write(Kryo kryo, Output output); public abstract Object getData(); diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/Attributes.java b/warehouse/query-core/src/main/java/datawave/query/attributes/Attributes.java index 50a2e5ea68..2701959bd9 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/Attributes.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/Attributes.java @@ -111,11 +111,6 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { WritableUtils.writeVInt(out, _count); out.writeBoolean(trackSizes); // Write out the number of Attributes we're going to store @@ -126,7 +121,7 @@ public void write(DataOutput out, boolean reducedResponse) throws IOException { WritableUtils.writeString(out, attr.getClass().getName()); // Defer to the concrete instance to write() itself - attr.write(out, reducedResponse); + attr.write(out); } } @@ -284,11 +279,6 @@ public Attribute reduceToKeep() { @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { output.writeInt(this._count, true); output.writeBoolean(this.trackSizes); // Write out the number of Attributes we're going to store @@ -299,7 +289,7 @@ public void write(Kryo kryo, Output output, Boolean reducedResponse) { output.writeString(attr.getClass().getName()); // Defer to the concrete instance to write() itself - attr.write(kryo, output, reducedResponse); + attr.write(kryo, output); } } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/Cardinality.java b/warehouse/query-core/src/main/java/datawave/query/attributes/Cardinality.java index e2f91a2d2a..1f430fab40 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/Cardinality.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/Cardinality.java @@ -62,12 +62,7 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, content.fieldName); WritableUtils.writeString(out, content.lower); WritableUtils.writeString(out, content.upper); @@ -151,12 +146,7 @@ public int hashCode() { @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - super.writeMetadata(kryo, output, reducedResponse); + super.writeMetadata(kryo, output); output.writeString(this.content.fieldName); output.writeString(this.content.lower); output.writeString(this.content.upper); diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/Content.java b/warehouse/query-core/src/main/java/datawave/query/attributes/Content.java index 4f31949b33..e1aaf04ccb 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/Content.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/Content.java @@ -62,18 +62,13 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, content); WritableUtils.writeVInt(out, toKeep ? 1 : 0); out.writeBoolean(source != null); if (source != null) { WritableUtils.writeString(out, source.getClass().getCanonicalName()); - source.write(out, reducedResponse); + source.write(out); } } @@ -137,18 +132,13 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - super.writeMetadata(kryo, output, reducedResponse); + super.writeMetadata(kryo, output); output.writeString(this.content); output.writeBoolean(this.toKeep); output.writeBoolean(this.source != null); if (source != null) { output.writeString(this.source.getClass().getCanonicalName()); - source.write(kryo, output, reducedResponse); + source.write(kryo, output); } } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/DateContent.java b/warehouse/query-core/src/main/java/datawave/query/attributes/DateContent.java index a548dffa10..33ac90f1e0 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/DateContent.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/DateContent.java @@ -102,12 +102,7 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, normalizer.parseToString(this.value.getTime())); } @@ -160,12 +155,7 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - writeMetadata(kryo, output, reducedResponse); + writeMetadata(kryo, output); output.writeString(normalizer.parseToString(this.value.getTime())); } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/DiacriticContent.java b/warehouse/query-core/src/main/java/datawave/query/attributes/DiacriticContent.java index 3d41f49445..c23e07e6d4 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/DiacriticContent.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/DiacriticContent.java @@ -51,12 +51,7 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, content); WritableUtils.writeVInt(out, toKeep ? 1 : 0); } @@ -108,12 +103,7 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - writeMetadata(kryo, output, reducedResponse); + writeMetadata(kryo, output); output.writeString(this.content); output.writeBoolean(this.toKeep); } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/Document.java b/warehouse/query-core/src/main/java/datawave/query/attributes/Document.java index 8bb3d14658..68448abcaa 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/Document.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/Document.java @@ -238,7 +238,7 @@ public Attribute get(String key) { } public void put(String key, Attribute value) { - put(key, value, false, false); + put(key, value, false); } /** @@ -250,10 +250,8 @@ public void put(String key, Attribute value) { * a value * @param includeGroupingContext * flag to include grouping context - * @param reducedResponse - * flag for reducedResponse */ - public void replace(String key, Attribute value, Boolean includeGroupingContext, boolean reducedResponse) { + public void replace(String key, Attribute value, Boolean includeGroupingContext) { dict.put(key, value); } @@ -268,10 +266,8 @@ public void replace(String key, Attribute value, Boolean includeGroupingConte * the attribute value * @param includeGroupingContext * flag to include grouping context - * @param reducedResponse - * flag for reducedResponse */ - public void put(String key, Attribute value, Boolean includeGroupingContext, boolean reducedResponse) { + public void put(String key, Attribute value, Boolean includeGroupingContext) { if (0 == value.size()) { if (log.isTraceEnabled()) { @@ -383,25 +379,16 @@ public void put(String key, Attribute value, Boolean includeGroupingContext, public void put(Entry>> entry, Boolean includeGroupingContext) { // No grouping context in the document. - this.put(entry.getKey(), entry.getValue(), includeGroupingContext, false); - } - - public void put(Entry>> entry, Boolean includeGroupingContext, boolean reducedResponse) { - // No grouping context in the document. - this.put(entry.getKey(), entry.getValue(), includeGroupingContext, reducedResponse); + this.put(entry.getKey(), entry.getValue(), includeGroupingContext); } public void putAll(Iterator>>> iterator, Boolean includeGroupingContext) { - putAll(iterator, includeGroupingContext, false); - } - - public void putAll(Iterator>>> iterator, Boolean includeGroupingContext, boolean reducedResponse) { if (null == iterator) { return; } while (iterator.hasNext()) { - put(iterator.next(), includeGroupingContext, reducedResponse); + put(iterator.next(), includeGroupingContext); } } @@ -546,11 +533,6 @@ public Attribute reduceToKeep() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { WritableUtils.writeVInt(out, _count); out.writeBoolean(trackSizes); WritableUtils.writeVLong(out, _bytes); @@ -782,11 +764,6 @@ public Collection visit(Collection queryFieldNames, Datawave @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { output.writeInt(this._count, true); output.writeBoolean(trackSizes); output.writeLong(this._bytes, true); @@ -801,7 +778,7 @@ public void write(Kryo kryo, Output output, Boolean reducedResponse) { Attribute attribute = entry.getValue(); output.writeString(attribute.getClass().getName()); - attribute.write(kryo, output, reducedResponse); + attribute.write(kryo, output); } output.writeLong(this.shardTimestamp); diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/DocumentKey.java b/warehouse/query-core/src/main/java/datawave/query/attributes/DocumentKey.java index ebf06d7cbd..19928c386a 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/DocumentKey.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/DocumentKey.java @@ -85,12 +85,7 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, getShardId()); WritableUtils.writeString(out, getDataType()); WritableUtils.writeString(out, getUid()); @@ -133,12 +128,7 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - super.writeMetadata(kryo, output, reducedResponse); + super.writeMetadata(kryo, output); output.writeString(this.getShardId()); output.writeString(this.getDataType()); output.writeString(this.getUid()); diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/GeoPoint.java b/warehouse/query-core/src/main/java/datawave/query/attributes/GeoPoint.java index c1eae1841a..2546a80058 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/GeoPoint.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/GeoPoint.java @@ -60,12 +60,7 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, this.point); WritableUtils.writeVInt(out, toKeep ? 1 : 0); } @@ -134,12 +129,7 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - writeMetadata(kryo, output, reducedResponse); + writeMetadata(kryo, output); output.writeString(this.point); output.writeBoolean(this.toKeep); } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/Geometry.java b/warehouse/query-core/src/main/java/datawave/query/attributes/Geometry.java index 705278d621..d3232df9a5 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/Geometry.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/Geometry.java @@ -75,12 +75,7 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeCompressedByteArray(out, write()); WritableUtils.writeVInt(out, toKeep ? 1 : 0); } @@ -154,12 +149,7 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - writeMetadata(kryo, output, reducedResponse); + writeMetadata(kryo, output); output.writeBoolean(this.toKeep); byte[] wellKnownBinary = write(); output.writeInt(wellKnownBinary.length); diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/IpAddress.java b/warehouse/query-core/src/main/java/datawave/query/attributes/IpAddress.java index 01550a4834..4c2c334ef7 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/IpAddress.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/IpAddress.java @@ -61,12 +61,7 @@ private void setNormalizedValue(String value) { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, this.value.toString()); WritableUtils.writeVInt(out, toKeep ? 1 : 0); } @@ -122,12 +117,7 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - writeMetadata(kryo, output, reducedResponse); + writeMetadata(kryo, output); output.writeString(this.value.toString()); output.writeBoolean(this.toKeep); } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/Latitude.java b/warehouse/query-core/src/main/java/datawave/query/attributes/Latitude.java index be7f1ecade..3eadc7da6e 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/Latitude.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/Latitude.java @@ -61,12 +61,7 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, this.latitude); WritableUtils.writeVInt(out, toKeep ? 1 : 0); } @@ -134,12 +129,7 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - writeMetadata(kryo, output, reducedResponse); + writeMetadata(kryo, output); output.writeString(this.latitude); output.writeBoolean(this.toKeep); } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/Longitude.java b/warehouse/query-core/src/main/java/datawave/query/attributes/Longitude.java index 1f0960fc62..6c998ddddf 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/Longitude.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/Longitude.java @@ -61,12 +61,7 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, this.longitude); WritableUtils.writeVInt(out, toKeep ? 1 : 0); } @@ -134,12 +129,7 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - writeMetadata(kryo, output, reducedResponse); + writeMetadata(kryo, output); output.writeString(this.longitude); output.writeBoolean(this.toKeep); } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/Numeric.java b/warehouse/query-core/src/main/java/datawave/query/attributes/Numeric.java index f18e17d861..80a154b5dc 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/Numeric.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/Numeric.java @@ -110,12 +110,7 @@ private void setNormalizedValue(Number value) { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, normalizedValue); WritableUtils.writeVInt(out, toKeep ? 1 : 0); } @@ -173,12 +168,7 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - writeMetadata(kryo, output, reducedResponse); + writeMetadata(kryo, output); output.writeString(this.normalizedValue); output.writeBoolean(this.toKeep); } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/PreNormalizedAttribute.java b/warehouse/query-core/src/main/java/datawave/query/attributes/PreNormalizedAttribute.java index 1858ac6e6a..3bdb3e68f6 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/PreNormalizedAttribute.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/PreNormalizedAttribute.java @@ -77,12 +77,7 @@ public int compareTo(PreNormalizedAttribute o) { @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { - super.writeMetadata(kryo, output, reducedResponse); + super.writeMetadata(kryo, output); output.writeString(this.value); output.writeBoolean(this.toKeep); } @@ -96,12 +91,7 @@ public void read(Kryo kryo, Input input) { @Override public void write(DataOutput output) throws IOException { - write(output, false); - } - - @Override - public void write(DataOutput output, boolean reducedResponse) throws IOException { - super.writeMetadata(output, reducedResponse); + super.writeMetadata(output); WritableUtils.writeString(output, this.value); WritableUtils.writeVInt(output, toKeep ? 1 : 0); } diff --git a/warehouse/query-core/src/main/java/datawave/query/attributes/TypeAttribute.java b/warehouse/query-core/src/main/java/datawave/query/attributes/TypeAttribute.java index 6dd0c7185b..4ad28d7f4a 100644 --- a/warehouse/query-core/src/main/java/datawave/query/attributes/TypeAttribute.java +++ b/warehouse/query-core/src/main/java/datawave/query/attributes/TypeAttribute.java @@ -58,13 +58,8 @@ public Object getData() { @Override public void write(DataOutput out) throws IOException { - write(out, false); - } - - @Override - public void write(DataOutput out, boolean reducedResponse) throws IOException { WritableUtils.writeString(out, datawaveType.getClass().toString()); - writeMetadata(out, reducedResponse); + writeMetadata(out); WritableUtils.writeString(out, datawaveType.getDelegateAsString()); WritableUtils.writeVInt(out, toKeep ? 1 : 0); } @@ -131,13 +126,8 @@ public Collection visit(Collection fieldNames, DatawaveJexlC @Override public void write(Kryo kryo, Output output) { - write(kryo, output, false); - } - - @Override - public void write(Kryo kryo, Output output, Boolean reducedResponse) { output.writeString(datawaveType.getClass().getName()); - super.writeMetadata(kryo, output, reducedResponse); + super.writeMetadata(kryo, output); output.writeString(this.datawaveType.getDelegateAsString()); output.writeBoolean(this.toKeep); } diff --git a/warehouse/query-core/src/main/java/datawave/query/function/DataTypeAsField.java b/warehouse/query-core/src/main/java/datawave/query/function/DataTypeAsField.java index 2ad6ef47fe..3881b1ebb6 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/DataTypeAsField.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/DataTypeAsField.java @@ -29,7 +29,7 @@ public DataTypeAsField(String key) { @Override public Entry apply(Entry from) { Content dataType = extractDataType(from.getKey(), from.getValue().isToKeep()); - from.getValue().put(key, dataType, false, false); + from.getValue().put(key, dataType, false); return from; } diff --git a/warehouse/query-core/src/main/java/datawave/query/function/DocumentProjection.java b/warehouse/query-core/src/main/java/datawave/query/function/DocumentProjection.java index e676eb118b..4f5f042438 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/DocumentProjection.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/DocumentProjection.java @@ -121,7 +121,7 @@ private Document trim(Document d) { Document newSubDoc = trim((Document) attr); if (0 < newSubDoc.size()) { - newDoc.put(fieldName, newSubDoc.copy(), this.includeGroupingContext, this.reducedResponse); + newDoc.put(fieldName, newSubDoc.copy(), this.includeGroupingContext); } continue; @@ -129,7 +129,7 @@ private Document trim(Document d) { Attributes subAttrs = trim((Attributes) attr, fieldName); if (0 < subAttrs.size()) { - newDoc.put(fieldName, subAttrs.copy(), this.includeGroupingContext, this.reducedResponse); + newDoc.put(fieldName, subAttrs.copy(), this.includeGroupingContext); } continue; @@ -137,7 +137,7 @@ private Document trim(Document d) { } // We just want to add this subtree - newDoc.put(fieldName, (Attribute) attr.copy(), this.includeGroupingContext, this.reducedResponse); + newDoc.put(fieldName, (Attribute) attr.copy(), this.includeGroupingContext); } else if (!projection.isUseExcludes()) { // excludes will completely exclude a subtree, but an includes may @@ -147,16 +147,16 @@ private Document trim(Document d) { Document newSubDoc = trim((Document) attr); if (0 < newSubDoc.size()) { - newDoc.put(fieldName, newSubDoc.copy(), this.includeGroupingContext, this.reducedResponse); + newDoc.put(fieldName, newSubDoc.copy(), this.includeGroupingContext); } } else if (attr instanceof Attributes) { - // Since Document instances can be nested under attributes and vice-versa + // Since Document instances can be nested under attributes and vice versa // all the way down, we need to pass along the fieldName so that when we // have come up with a nested document it can be evaluated by its own name Attributes subAttrs = trim((Attributes) attr, fieldName); if (0 < subAttrs.size()) { - newDoc.put(fieldName, subAttrs.copy(), this.includeGroupingContext, this.reducedResponse); + newDoc.put(fieldName, subAttrs.copy(), this.includeGroupingContext); } } } diff --git a/warehouse/query-core/src/main/java/datawave/query/function/FacetedGrouping.java b/warehouse/query-core/src/main/java/datawave/query/function/FacetedGrouping.java index 7ce2111c55..78b31d4f8c 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/FacetedGrouping.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/FacetedGrouping.java @@ -142,7 +142,7 @@ public Entry apply(Entry input) { if (log.isTraceEnabled()) log.trace("entries" + newDocumentAttributes.entries()); for (Entry> newAttr : newDocumentAttributes.entries()) { - currentDoc.replace(newAttr.getKey(), newAttr.getValue(), false, false); + currentDoc.replace(newAttr.getKey(), newAttr.getValue(), false); } if (log.isTraceEnabled()) log.trace("currentDoc" + currentDoc); diff --git a/warehouse/query-core/src/main/java/datawave/query/function/GroupFields.java b/warehouse/query-core/src/main/java/datawave/query/function/GroupFields.java index bd49cc5942..43483e64a6 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/GroupFields.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/GroupFields.java @@ -83,7 +83,7 @@ private void applyCounts(Document doc, Map groupFieldsMap) { for (Entry groupFieldCountEntry : groupFieldsMap.entrySet()) { Attribute removedAttr = doc.remove(groupFieldCountEntry.getKey()); log.debug("removed from document:" + groupFieldCountEntry.getKey()); - doc.put(groupFieldCountEntry.getKey(), new Numeric(groupFieldCountEntry.getValue(), doc.getMetadata(), removedAttr.isToKeep()), true, false); + doc.put(groupFieldCountEntry.getKey(), new Numeric(groupFieldCountEntry.getValue(), doc.getMetadata(), removedAttr.isToKeep()), true); log.debug("added to document:" + groupFieldCountEntry.getKey() + " with count of " + groupFieldCountEntry.getValue()); } } diff --git a/warehouse/query-core/src/main/java/datawave/query/function/KryoCVAwareSerializableSerializer.java b/warehouse/query-core/src/main/java/datawave/query/function/KryoCVAwareSerializableSerializer.java index 56a75e97c9..af6379cc91 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/KryoCVAwareSerializableSerializer.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/KryoCVAwareSerializableSerializer.java @@ -25,7 +25,7 @@ public void setReducedResponse(Boolean reducedResponse) { @Override public void write(Kryo kryo, Output output, KryoSerializable object) { if (object instanceof Document) { - ((Document) object).write(kryo, output, getReducedResponse()); + ((Document) object).write(kryo, output); } else { object.write(kryo, output); } diff --git a/warehouse/query-core/src/main/java/datawave/query/function/LimitFields.java b/warehouse/query-core/src/main/java/datawave/query/function/LimitFields.java index 9a7e9aaa94..9c879c4719 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/LimitFields.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/LimitFields.java @@ -259,7 +259,7 @@ public Entry apply(Entry entry) { int keepers = countKeepersForFieldMap.get(keyNoGrouping); int originalCount = countForFieldMap.get(keyNoGrouping); if (originalCount > keepers) { - document.put(keyNoGrouping + ORIGINAL_COUNT_SUFFIX, new Numeric(originalCount, document.getMetadata(), document.isToKeep()), true, false); + document.put(keyNoGrouping + ORIGINAL_COUNT_SUFFIX, new Numeric(originalCount, document.getMetadata(), document.isToKeep()), true); // some sanity checks int missesRemaining = countMissesRemainingForFieldMap.get(keyNoGrouping); diff --git a/warehouse/query-core/src/main/java/datawave/query/function/RemoveGroupingContext.java b/warehouse/query-core/src/main/java/datawave/query/function/RemoveGroupingContext.java index 9e12e02173..6573ff9c62 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/RemoveGroupingContext.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/RemoveGroupingContext.java @@ -34,7 +34,7 @@ public Entry apply(Entry entry) { } // put them all back without the grouping context for (Entry>> goner : toRemove) { - entry.getValue().put(goner.getKey(), goner.getValue(), false, false); + entry.getValue().put(goner.getKey(), goner.getValue(), false); } return entry; } diff --git a/warehouse/query-core/src/main/java/datawave/query/function/serializer/WritableDocumentSerializer.java b/warehouse/query-core/src/main/java/datawave/query/function/serializer/WritableDocumentSerializer.java index 1a85136aa1..822dedd161 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/serializer/WritableDocumentSerializer.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/serializer/WritableDocumentSerializer.java @@ -26,7 +26,7 @@ public byte[] serialize(Document doc) { DataOutputStream dos = new DataOutputStream(baos); try { - doc.write(dos, reducedResponse); + doc.write(dos); } catch (IOException e) { throw new RuntimeException("Could not convert Document through write().", e); } diff --git a/warehouse/query-core/src/main/java/datawave/query/iterator/GroupingIterator.java b/warehouse/query-core/src/main/java/datawave/query/iterator/GroupingIterator.java index 557bfa5da6..f7aa52e2d1 100644 --- a/warehouse/query-core/src/main/java/datawave/query/iterator/GroupingIterator.java +++ b/warehouse/query-core/src/main/java/datawave/query/iterator/GroupingIterator.java @@ -194,7 +194,7 @@ private Document flatten(List documents) { attribute.setColumnVisibility(entry.getValue().getColumnVisibility()); // Call copy() on the GroupingTypeAttribute to get a plain TypeAttribute instead of a GroupingTypeAttribute that is package protected and won't // serialize. - flattened.put(entry.getKey() + "." + Integer.toHexString(context).toUpperCase(), (TypeAttribute) attribute.copy(), true, false); + flattened.put(entry.getKey() + "." + Integer.toHexString(context).toUpperCase(), (TypeAttribute) attribute.copy(), true); } // Increment the context by one. context++; diff --git a/warehouse/query-core/src/main/java/datawave/query/transformer/ContentTransform.java b/warehouse/query-core/src/main/java/datawave/query/transformer/ContentTransform.java index 02c2f45fba..15030c8408 100644 --- a/warehouse/query-core/src/main/java/datawave/query/transformer/ContentTransform.java +++ b/warehouse/query-core/src/main/java/datawave/query/transformer/ContentTransform.java @@ -38,7 +38,7 @@ public Map.Entry apply(@Nullable Map.Entry keyDocume Attribute contentField = document.remove(contentFieldName); if (contentField.getData().toString().equalsIgnoreCase("true")) { Content c = new Content(uid, contentField.getMetadata(), document.isToKeep()); - document.put(contentFieldName, c, false, this.reducedResponse); + document.put(contentFieldName, c, false); } } } diff --git a/warehouse/query-core/src/main/java/datawave/query/transformer/FieldMappingTransform.java b/warehouse/query-core/src/main/java/datawave/query/transformer/FieldMappingTransform.java index c5f2210eca..3d82452ea1 100644 --- a/warehouse/query-core/src/main/java/datawave/query/transformer/FieldMappingTransform.java +++ b/warehouse/query-core/src/main/java/datawave/query/transformer/FieldMappingTransform.java @@ -33,7 +33,7 @@ public Map.Entry apply(@Nullable Map.Entry keyDocume if (!document.containsKey(primaryField)) { for (String secondaryField : this.primaryToSecondaryFieldMap.get(primaryField)) { if (document.containsKey(secondaryField)) { - document.put(primaryField, document.get(secondaryField), includeGroupingContext, this.reducedResponse); + document.put(primaryField, document.get(secondaryField), includeGroupingContext); break; } } diff --git a/warehouse/query-core/src/main/java/datawave/query/transformer/FieldRenameTransform.java b/warehouse/query-core/src/main/java/datawave/query/transformer/FieldRenameTransform.java index dc0f0e6269..fd4cad3a35 100644 --- a/warehouse/query-core/src/main/java/datawave/query/transformer/FieldRenameTransform.java +++ b/warehouse/query-core/src/main/java/datawave/query/transformer/FieldRenameTransform.java @@ -60,7 +60,7 @@ public Map.Entry apply(@Nullable Map.Entry keyDocume for (String mappedField : mappedFields) { if (!mappedField.equals(baseField)) { String newField = field.replace(baseField, mappedField); - document.put(newField, document.get(field), this.includeGroupingContext, this.reducedResponse); + document.put(newField, document.get(field), this.includeGroupingContext); } } if (!mappedFields.contains(baseField)) { diff --git a/warehouse/query-core/src/test/java/datawave/query/common/grouping/DocumentGrouperTest.java b/warehouse/query-core/src/test/java/datawave/query/common/grouping/DocumentGrouperTest.java index 9afa59ec01..93bba6524f 100644 --- a/warehouse/query-core/src/test/java/datawave/query/common/grouping/DocumentGrouperTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/common/grouping/DocumentGrouperTest.java @@ -1163,9 +1163,9 @@ public void addEntryTo(Document document) { if (attributes.isEmpty()) { throw new IllegalArgumentException("No attributes set for document entry"); } else if (attributes.size() == 1) { - document.put(fieldName, this.attributes.get(0), true, false); + document.put(fieldName, this.attributes.get(0), true); } else { - document.put(fieldName, new Attributes(this.attributes, true), true, false); + document.put(fieldName, new Attributes(this.attributes, true), true); } } } diff --git a/warehouse/query-core/src/test/java/datawave/query/transformer/FieldRenameTransformTest.java b/warehouse/query-core/src/test/java/datawave/query/transformer/FieldRenameTransformTest.java index dcbedc6741..d9e179e315 100644 --- a/warehouse/query-core/src/test/java/datawave/query/transformer/FieldRenameTransformTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/transformer/FieldRenameTransformTest.java @@ -106,9 +106,9 @@ public void renameWithGroupingContextAndMultipleMappings() throws MarkingFunctio fieldMap.add("field1=field6"); Document d = new Document(); - d.put("field1.field.11", new Numeric("1", key, true), true, false); - d.put("field2.field.12", new Numeric("2", key, true), true, false); - d.put("field3.field.13", new Numeric("3", key, true), true, false); + d.put("field1.field.11", new Numeric("1", key, true), true); + d.put("field2.field.12", new Numeric("2", key, true), true); + d.put("field3.field.13", new Numeric("3", key, true), true); DocumentTransform transformer = new FieldRenameTransform(fieldMap, true, false); diff --git a/warehouse/query-core/src/test/java/datawave/query/transformer/UniqueTransformTest.java b/warehouse/query-core/src/test/java/datawave/query/transformer/UniqueTransformTest.java index ba0354c12e..3eb407a43a 100644 --- a/warehouse/query-core/src/test/java/datawave/query/transformer/UniqueTransformTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/transformer/UniqueTransformTest.java @@ -598,7 +598,7 @@ private String getRandomValue() { } InputDocumentBuilder withKeyValue(String key, String value) { - document.put(key, new DiacriticContent(value, document.getMetadata(), true), true, false); + document.put(key, new DiacriticContent(value, document.getMetadata(), true), true); return this; } From cdde21fb73205b713467fdb680683044d657d03a Mon Sep 17 00:00:00 2001 From: Ivan Bella <347158+ivakegg@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:38:34 +0000 Subject: [PATCH 10/11] 7.14.0 --- common-test/pom.xml | 2 +- contrib/datawave-quickstart/docker/pom.xml | 2 +- core/cached-results/pom.xml | 2 +- core/common-util/pom.xml | 2 +- core/common/pom.xml | 2 +- core/connection-pool/pom.xml | 2 +- core/map-reduce/pom.xml | 2 +- core/modification/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/utils/pom.xml | 2 +- docs/pom.xml | 2 +- microservices/pom.xml | 2 +- microservices/services/pom.xml | 2 +- microservices/starters/pom.xml | 2 +- pom.xml | 2 +- warehouse/accumulo-extensions/pom.xml | 2 +- warehouse/age-off-utils/pom.xml | 2 +- warehouse/age-off/pom.xml | 2 +- warehouse/assemble/datawave/pom.xml | 2 +- warehouse/assemble/pom.xml | 2 +- warehouse/assemble/webservice/pom.xml | 2 +- warehouse/common/pom.xml | 2 +- warehouse/core/pom.xml | 2 +- warehouse/data-dictionary-core/pom.xml | 2 +- warehouse/edge-dictionary-core/pom.xml | 2 +- warehouse/edge-model-configuration-core/pom.xml | 2 +- warehouse/index-stats/pom.xml | 2 +- warehouse/ingest-configuration/pom.xml | 2 +- warehouse/ingest-core/pom.xml | 2 +- warehouse/ingest-csv/pom.xml | 2 +- warehouse/ingest-json/pom.xml | 2 +- warehouse/ingest-nyctlc/pom.xml | 2 +- warehouse/ingest-scripts/pom.xml | 2 +- warehouse/ingest-ssdeep/pom.xml | 2 +- warehouse/ingest-wikipedia/pom.xml | 2 +- warehouse/metrics-core/pom.xml | 2 +- warehouse/ops-tools/config-compare/pom.xml | 2 +- warehouse/ops-tools/index-validation/pom.xml | 2 +- warehouse/ops-tools/pom.xml | 2 +- warehouse/pom.xml | 2 +- warehouse/query-core/pom.xml | 2 +- warehouse/regression-testing/pom.xml | 2 +- warehouse/ssdeep-common/pom.xml | 2 +- web-services/accumulo/pom.xml | 2 +- web-services/atom/pom.xml | 2 +- web-services/cached-results/pom.xml | 2 +- web-services/client/pom.xml | 2 +- web-services/common-util/pom.xml | 2 +- web-services/common/pom.xml | 2 +- web-services/deploy/application/pom.xml | 2 +- web-services/deploy/configuration/pom.xml | 2 +- web-services/deploy/docs/pom.xml | 2 +- web-services/deploy/pom.xml | 2 +- web-services/deploy/spring-framework-integration/pom.xml | 2 +- web-services/dictionary/pom.xml | 2 +- web-services/examples/client-login/pom.xml | 2 +- web-services/examples/http-client/pom.xml | 2 +- web-services/examples/jms-client/pom.xml | 2 +- web-services/examples/pom.xml | 2 +- web-services/examples/query-war/pom.xml | 2 +- web-services/map-reduce-embedded/pom.xml | 2 +- web-services/map-reduce-status/pom.xml | 2 +- web-services/map-reduce/pom.xml | 2 +- web-services/metrics/pom.xml | 2 +- web-services/model/pom.xml | 2 +- web-services/modification/pom.xml | 2 +- web-services/pom.xml | 2 +- web-services/query-websocket/pom.xml | 2 +- web-services/query/pom.xml | 2 +- web-services/rest-api/pom.xml | 2 +- web-services/security/pom.xml | 2 +- web-services/web-root/pom.xml | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) diff --git a/common-test/pom.xml b/common-test/pom.xml index fbc23678c5..58cc2d57bb 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-common-test ${project.artifactId} diff --git a/contrib/datawave-quickstart/docker/pom.xml b/contrib/datawave-quickstart/docker/pom.xml index 4654e03c5d..9e8b887877 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.14.0-SNAPSHOT + 7.14.0 ../../../pom.xml quickstart diff --git a/core/cached-results/pom.xml b/core/cached-results/pom.xml index 55a29764ef..5e8d74ee72 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.14.0-SNAPSHOT + 7.14.0 datawave-core-cached-results ${project.artifactId} diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml index 69474bf072..12d7f9309d 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.14.0-SNAPSHOT + 7.14.0 datawave-core-common-util ${project.artifactId} diff --git a/core/common/pom.xml b/core/common/pom.xml index 43dc72494c..b08ef93286 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-core-common ${project.artifactId} diff --git a/core/connection-pool/pom.xml b/core/connection-pool/pom.xml index b0605d6bc9..aace93f68c 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.14.0-SNAPSHOT + 7.14.0 datawave-core-connection-pool ${project.artifactId} diff --git a/core/map-reduce/pom.xml b/core/map-reduce/pom.xml index 188fdc32cb..6d2a2eb60c 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.14.0-SNAPSHOT + 7.14.0 datawave-core-map-reduce ${project.artifactId} diff --git a/core/modification/pom.xml b/core/modification/pom.xml index 71d992f575..83b808aa29 100644 --- a/core/modification/pom.xml +++ b/core/modification/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-core-modification ${project.artifactId} diff --git a/core/pom.xml b/core/pom.xml index 0661dcc530..0edba4a179 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0-SNAPSHOT + 7.14.0 gov.nsa.datawave.core datawave-core-parent diff --git a/core/query/pom.xml b/core/query/pom.xml index de90c5439d..105d2b86bf 100644 --- a/core/query/pom.xml +++ b/core/query/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-core-query ${project.artifactId} diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 5ed3ac15a9..9d5d9d110c 100644 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.14.0-SNAPSHOT + 7.14.0 gov.nsa.datawave.core datawave-utils-parent diff --git a/docs/pom.xml b/docs/pom.xml index e81315e71a..c13a63eb4d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-docs diff --git a/microservices/pom.xml b/microservices/pom.xml index bd4754c3fc..353e155fd5 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0-SNAPSHOT + 7.14.0 gov.nsa.datawave.microservice datawave-microservice-build-parent diff --git a/microservices/services/pom.xml b/microservices/services/pom.xml index d15a19b13c..4693df1a32 100644 --- a/microservices/services/pom.xml +++ b/microservices/services/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.microservice datawave-microservice-build-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-microservice-service-build-parent pom diff --git a/microservices/starters/pom.xml b/microservices/starters/pom.xml index cea898e34b..60e7638b98 100644 --- a/microservices/starters/pom.xml +++ b/microservices/starters/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.microservice datawave-microservice-build-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-microservice-starter-build-parent pom diff --git a/pom.xml b/pom.xml index e3a202412a..7db793f3df 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gov.nsa.datawave datawave-parent - 7.14.0-SNAPSHOT + 7.14.0 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 635d99fa0f..a6d6eeca42 100644 --- a/warehouse/accumulo-extensions/pom.xml +++ b/warehouse/accumulo-extensions/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-accumulo-extensions ${project.artifactId} diff --git a/warehouse/age-off-utils/pom.xml b/warehouse/age-off-utils/pom.xml index 3143df48f7..d98e5353b4 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.14.0-SNAPSHOT + 7.14.0 datawave-age-off-utils ${project.artifactId} diff --git a/warehouse/age-off/pom.xml b/warehouse/age-off/pom.xml index 209b787775..d175826977 100644 --- a/warehouse/age-off/pom.xml +++ b/warehouse/age-off/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-age-off ${project.artifactId} diff --git a/warehouse/assemble/datawave/pom.xml b/warehouse/assemble/datawave/pom.xml index 08bb03c2ad..0ffa7478ec 100644 --- a/warehouse/assemble/datawave/pom.xml +++ b/warehouse/assemble/datawave/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave assemble-parent - 7.14.0-SNAPSHOT + 7.14.0 assemble-datawave jar diff --git a/warehouse/assemble/pom.xml b/warehouse/assemble/pom.xml index d5995e4e24..a74410a9cc 100644 --- a/warehouse/assemble/pom.xml +++ b/warehouse/assemble/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 assemble-parent pom diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index 15df642902..d677ed5010 100644 --- a/warehouse/assemble/webservice/pom.xml +++ b/warehouse/assemble/webservice/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave assemble-parent - 7.14.0-SNAPSHOT + 7.14.0 assemble-webservice ${project.artifactId} diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml index 4abb6170c9..5271dbf3df 100644 --- a/warehouse/common/pom.xml +++ b/warehouse/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-common ${project.artifactId} diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index 8eda4ab399..13acd12da5 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-core jar diff --git a/warehouse/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml index 4d1f0a5d6d..ada91aab26 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.14.0-SNAPSHOT + 7.14.0 datawave-data-dictionary-core jar diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml index 7fef2af5ae..1128baa071 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.14.0-SNAPSHOT + 7.14.0 datawave-edge-dictionary-core jar diff --git a/warehouse/edge-model-configuration-core/pom.xml b/warehouse/edge-model-configuration-core/pom.xml index a1afa6009d..7a1d65e6f1 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.14.0-SNAPSHOT + 7.14.0 datawave-edge-model-configuration-core jar diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index aace1d2f9a..bbe4737ea9 100644 --- a/warehouse/index-stats/pom.xml +++ b/warehouse/index-stats/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-index-stats jar diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml index c872c25840..95cd249b43 100644 --- a/warehouse/ingest-configuration/pom.xml +++ b/warehouse/ingest-configuration/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ingest-configuration diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index 4aa75ea7c9..66cf556e1c 100644 --- a/warehouse/ingest-core/pom.xml +++ b/warehouse/ingest-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ingest-core jar diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index e11abd91a5..ca2c9caba2 100644 --- a/warehouse/ingest-csv/pom.xml +++ b/warehouse/ingest-csv/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ingest-csv jar diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index e6d5e728d6..327f50b9a2 100644 --- a/warehouse/ingest-json/pom.xml +++ b/warehouse/ingest-json/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ingest-json jar diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml index 23a1e339ff..ab15851399 100644 --- a/warehouse/ingest-nyctlc/pom.xml +++ b/warehouse/ingest-nyctlc/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ingest-nyctlc jar diff --git a/warehouse/ingest-scripts/pom.xml b/warehouse/ingest-scripts/pom.xml index 2a1a58a8ad..2ecaa643b4 100644 --- a/warehouse/ingest-scripts/pom.xml +++ b/warehouse/ingest-scripts/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ingest-scripts ${project.artifactId} diff --git a/warehouse/ingest-ssdeep/pom.xml b/warehouse/ingest-ssdeep/pom.xml index 8880548c93..8cd9f5fb83 100644 --- a/warehouse/ingest-ssdeep/pom.xml +++ b/warehouse/ingest-ssdeep/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ingest-ssdeep diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml index 6e1d0be980..83b2b06a92 100644 --- a/warehouse/ingest-wikipedia/pom.xml +++ b/warehouse/ingest-wikipedia/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ingest-wikipedia jar diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml index 13d08f1c2e..63ce271c28 100644 --- a/warehouse/metrics-core/pom.xml +++ b/warehouse/metrics-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-metrics-core jar diff --git a/warehouse/ops-tools/config-compare/pom.xml b/warehouse/ops-tools/config-compare/pom.xml index 436882d33d..095546f7c7 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.14.0-SNAPSHOT + 7.14.0 datawave-ops-tools-config-compare diff --git a/warehouse/ops-tools/index-validation/pom.xml b/warehouse/ops-tools/index-validation/pom.xml index a060e0fecb..0ecedf212c 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.14.0-SNAPSHOT + 7.14.0 datawave-ops-tools-index-validation jar diff --git a/warehouse/ops-tools/pom.xml b/warehouse/ops-tools/pom.xml index d3217a980a..eb6dd49d69 100644 --- a/warehouse/ops-tools/pom.xml +++ b/warehouse/ops-tools/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ops-tools-parent pom diff --git a/warehouse/pom.xml b/warehouse/pom.xml index 1ba8b40b6e..aed5f2b9ca 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-warehouse-parent pom diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index c21ddfb8f7..64300b4d94 100644 --- a/warehouse/query-core/pom.xml +++ b/warehouse/query-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-query-core jar diff --git a/warehouse/regression-testing/pom.xml b/warehouse/regression-testing/pom.xml index af9b2ee69f..1a3914e166 100644 --- a/warehouse/regression-testing/pom.xml +++ b/warehouse/regression-testing/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-regression-testing ${project.artifactId} diff --git a/warehouse/ssdeep-common/pom.xml b/warehouse/ssdeep-common/pom.xml index 795b07133b..3a88da068d 100644 --- a/warehouse/ssdeep-common/pom.xml +++ b/warehouse/ssdeep-common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0-SNAPSHOT + 7.14.0 datawave-ssdeep-common diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index b2b1cc31a0..516818fe1a 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-accumulo ejb diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml index 8f05782cb5..601aec79d8 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-atom ejb diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml index f5f3d3a59a..37bc5c05f1 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-cached-results ejb diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index 0f9d305fce..3f0a7fd18f 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-client jar diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index 7e864febec..a2c35d504a 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-common-util jar diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index 037e3f1c04..f933600d21 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-common ejb diff --git a/web-services/deploy/application/pom.xml b/web-services/deploy/application/pom.xml index 530c7d228f..70c7e85d2c 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-deploy-application ear diff --git a/web-services/deploy/configuration/pom.xml b/web-services/deploy/configuration/pom.xml index b35ce86386..04cf3f157f 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-deploy-configuration jar diff --git a/web-services/deploy/docs/pom.xml b/web-services/deploy/docs/pom.xml index dfcdbeffdc..89e96d95e1 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-deploy-docs war diff --git a/web-services/deploy/pom.xml b/web-services/deploy/pom.xml index b520bf5a80..e83ec3087a 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.14.0-SNAPSHOT + 7.14.0 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 ac7344f102..aeccf97f9e 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.14.0-SNAPSHOT + 7.14.0 spring-framework-integration ${project.artifactId} diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index 529ac31f81..7ac930510f 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-dictionary ejb diff --git a/web-services/examples/client-login/pom.xml b/web-services/examples/client-login/pom.xml index 329e08a01f..00fa98a8bf 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.14.0-SNAPSHOT + 7.14.0 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 6f95e15453..3956cf1896 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.14.0-SNAPSHOT + 7.14.0 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 5a9a628792..61ad2960d0 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-examples-jms-client jar diff --git a/web-services/examples/pom.xml b/web-services/examples/pom.xml index 84fc3c573b..c90c61ce4c 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-examples-parent pom diff --git a/web-services/examples/query-war/pom.xml b/web-services/examples/query-war/pom.xml index faf6b8660f..d1c53d16b4 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.14.0-SNAPSHOT + 7.14.0 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 813c0b801e..13b36289a1 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.14.0-SNAPSHOT + 7.14.0 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 41cc05335d..9ee0c406da 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-map-reduce-status ejb diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index 3a06f4950b..9a4021ef62 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-map-reduce ejb diff --git a/web-services/metrics/pom.xml b/web-services/metrics/pom.xml index 5fc064eb7d..283fcceee9 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-metrics ejb diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index 0db6186c20..1447beb983 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-model ejb diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml index 3e856b4844..6126cc290d 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-modification ejb diff --git a/web-services/pom.xml b/web-services/pom.xml index 5887806da9..2a4feae2c4 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0-SNAPSHOT + 7.14.0 gov.nsa.datawave.webservices datawave-ws-parent diff --git a/web-services/query-websocket/pom.xml b/web-services/query-websocket/pom.xml index a1e50539da..a103976c7c 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-query-websocket war diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index 83fb4234fe..1c316d12d8 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-query ejb diff --git a/web-services/rest-api/pom.xml b/web-services/rest-api/pom.xml index bc81188ade..2fb85df0cc 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-rest-api war diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index 020c2dd1a5..da96be125d 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-security ejb diff --git a/web-services/web-root/pom.xml b/web-services/web-root/pom.xml index 52133ee5b3..97e7992979 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.14.0-SNAPSHOT + 7.14.0 datawave-ws-web-root war From 01270ec9b7be690071731fa2e2b1aec7cdc50780 Mon Sep 17 00:00:00 2001 From: Ivan Bella <347158+ivakegg@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:38:47 +0000 Subject: [PATCH 11/11] 7.15.0-SNAPSHOT --- common-test/pom.xml | 2 +- contrib/datawave-quickstart/docker/pom.xml | 2 +- core/cached-results/pom.xml | 2 +- core/common-util/pom.xml | 2 +- core/common/pom.xml | 2 +- core/connection-pool/pom.xml | 2 +- core/map-reduce/pom.xml | 2 +- core/modification/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/utils/pom.xml | 2 +- docs/pom.xml | 2 +- microservices/pom.xml | 2 +- microservices/services/pom.xml | 2 +- microservices/starters/pom.xml | 2 +- pom.xml | 2 +- warehouse/accumulo-extensions/pom.xml | 2 +- warehouse/age-off-utils/pom.xml | 2 +- warehouse/age-off/pom.xml | 2 +- warehouse/assemble/datawave/pom.xml | 2 +- warehouse/assemble/pom.xml | 2 +- warehouse/assemble/webservice/pom.xml | 2 +- warehouse/common/pom.xml | 2 +- warehouse/core/pom.xml | 2 +- warehouse/data-dictionary-core/pom.xml | 2 +- warehouse/edge-dictionary-core/pom.xml | 2 +- warehouse/edge-model-configuration-core/pom.xml | 2 +- warehouse/index-stats/pom.xml | 2 +- warehouse/ingest-configuration/pom.xml | 2 +- warehouse/ingest-core/pom.xml | 2 +- warehouse/ingest-csv/pom.xml | 2 +- warehouse/ingest-json/pom.xml | 2 +- warehouse/ingest-nyctlc/pom.xml | 2 +- warehouse/ingest-scripts/pom.xml | 2 +- warehouse/ingest-ssdeep/pom.xml | 2 +- warehouse/ingest-wikipedia/pom.xml | 2 +- warehouse/metrics-core/pom.xml | 2 +- warehouse/ops-tools/config-compare/pom.xml | 2 +- warehouse/ops-tools/index-validation/pom.xml | 2 +- warehouse/ops-tools/pom.xml | 2 +- warehouse/pom.xml | 2 +- warehouse/query-core/pom.xml | 2 +- warehouse/regression-testing/pom.xml | 2 +- warehouse/ssdeep-common/pom.xml | 2 +- web-services/accumulo/pom.xml | 2 +- web-services/atom/pom.xml | 2 +- web-services/cached-results/pom.xml | 2 +- web-services/client/pom.xml | 2 +- web-services/common-util/pom.xml | 2 +- web-services/common/pom.xml | 2 +- web-services/deploy/application/pom.xml | 2 +- web-services/deploy/configuration/pom.xml | 2 +- web-services/deploy/docs/pom.xml | 2 +- web-services/deploy/pom.xml | 2 +- web-services/deploy/spring-framework-integration/pom.xml | 2 +- web-services/dictionary/pom.xml | 2 +- web-services/examples/client-login/pom.xml | 2 +- web-services/examples/http-client/pom.xml | 2 +- web-services/examples/jms-client/pom.xml | 2 +- web-services/examples/pom.xml | 2 +- web-services/examples/query-war/pom.xml | 2 +- web-services/map-reduce-embedded/pom.xml | 2 +- web-services/map-reduce-status/pom.xml | 2 +- web-services/map-reduce/pom.xml | 2 +- web-services/metrics/pom.xml | 2 +- web-services/model/pom.xml | 2 +- web-services/modification/pom.xml | 2 +- web-services/pom.xml | 2 +- web-services/query-websocket/pom.xml | 2 +- web-services/query/pom.xml | 2 +- web-services/rest-api/pom.xml | 2 +- web-services/security/pom.xml | 2 +- web-services/web-root/pom.xml | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) diff --git a/common-test/pom.xml b/common-test/pom.xml index 58cc2d57bb..dcf70ae2fb 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-common-test ${project.artifactId} diff --git a/contrib/datawave-quickstart/docker/pom.xml b/contrib/datawave-quickstart/docker/pom.xml index 9e8b887877..d27009a8ed 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.14.0 + 7.15.0-SNAPSHOT ../../../pom.xml quickstart diff --git a/core/cached-results/pom.xml b/core/cached-results/pom.xml index 5e8d74ee72..7080f4c795 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.14.0 + 7.15.0-SNAPSHOT datawave-core-cached-results ${project.artifactId} diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml index 12d7f9309d..4f6a1403e9 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.14.0 + 7.15.0-SNAPSHOT datawave-core-common-util ${project.artifactId} diff --git a/core/common/pom.xml b/core/common/pom.xml index b08ef93286..3a4e92a120 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-core-common ${project.artifactId} diff --git a/core/connection-pool/pom.xml b/core/connection-pool/pom.xml index aace93f68c..5cd352e0ca 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.14.0 + 7.15.0-SNAPSHOT datawave-core-connection-pool ${project.artifactId} diff --git a/core/map-reduce/pom.xml b/core/map-reduce/pom.xml index 6d2a2eb60c..fae52b0e7a 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.14.0 + 7.15.0-SNAPSHOT datawave-core-map-reduce ${project.artifactId} diff --git a/core/modification/pom.xml b/core/modification/pom.xml index 83b808aa29..d1857e45d0 100644 --- a/core/modification/pom.xml +++ b/core/modification/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-core-modification ${project.artifactId} diff --git a/core/pom.xml b/core/pom.xml index 0edba4a179..aa424368bb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0 + 7.15.0-SNAPSHOT gov.nsa.datawave.core datawave-core-parent diff --git a/core/query/pom.xml b/core/query/pom.xml index 105d2b86bf..6d8bf3b705 100644 --- a/core/query/pom.xml +++ b/core/query/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-core-query ${project.artifactId} diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 9d5d9d110c..79569c5d66 100644 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.14.0 + 7.15.0-SNAPSHOT gov.nsa.datawave.core datawave-utils-parent diff --git a/docs/pom.xml b/docs/pom.xml index c13a63eb4d..9e159c3fe2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-docs diff --git a/microservices/pom.xml b/microservices/pom.xml index 353e155fd5..48bad56571 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0 + 7.15.0-SNAPSHOT gov.nsa.datawave.microservice datawave-microservice-build-parent diff --git a/microservices/services/pom.xml b/microservices/services/pom.xml index 4693df1a32..1e4d573885 100644 --- a/microservices/services/pom.xml +++ b/microservices/services/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.microservice datawave-microservice-build-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-microservice-service-build-parent pom diff --git a/microservices/starters/pom.xml b/microservices/starters/pom.xml index 60e7638b98..03269ea066 100644 --- a/microservices/starters/pom.xml +++ b/microservices/starters/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.microservice datawave-microservice-build-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-microservice-starter-build-parent pom diff --git a/pom.xml b/pom.xml index 7db793f3df..b96ba02f80 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gov.nsa.datawave datawave-parent - 7.14.0 + 7.15.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 a6d6eeca42..eeccfec916 100644 --- a/warehouse/accumulo-extensions/pom.xml +++ b/warehouse/accumulo-extensions/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-accumulo-extensions ${project.artifactId} diff --git a/warehouse/age-off-utils/pom.xml b/warehouse/age-off-utils/pom.xml index d98e5353b4..18bb50160c 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.14.0 + 7.15.0-SNAPSHOT datawave-age-off-utils ${project.artifactId} diff --git a/warehouse/age-off/pom.xml b/warehouse/age-off/pom.xml index d175826977..1e0fe883ef 100644 --- a/warehouse/age-off/pom.xml +++ b/warehouse/age-off/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-age-off ${project.artifactId} diff --git a/warehouse/assemble/datawave/pom.xml b/warehouse/assemble/datawave/pom.xml index 0ffa7478ec..734877489a 100644 --- a/warehouse/assemble/datawave/pom.xml +++ b/warehouse/assemble/datawave/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave assemble-parent - 7.14.0 + 7.15.0-SNAPSHOT assemble-datawave jar diff --git a/warehouse/assemble/pom.xml b/warehouse/assemble/pom.xml index a74410a9cc..d786a6c20f 100644 --- a/warehouse/assemble/pom.xml +++ b/warehouse/assemble/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT assemble-parent pom diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index d677ed5010..1854c6910d 100644 --- a/warehouse/assemble/webservice/pom.xml +++ b/warehouse/assemble/webservice/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave assemble-parent - 7.14.0 + 7.15.0-SNAPSHOT assemble-webservice ${project.artifactId} diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml index 5271dbf3df..44312fb194 100644 --- a/warehouse/common/pom.xml +++ b/warehouse/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-common ${project.artifactId} diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index 13acd12da5..cc642399a6 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-core jar diff --git a/warehouse/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml index ada91aab26..3fc2803a40 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.14.0 + 7.15.0-SNAPSHOT datawave-data-dictionary-core jar diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml index 1128baa071..de97cfc056 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.14.0 + 7.15.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 7a1d65e6f1..7a114a3591 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.14.0 + 7.15.0-SNAPSHOT datawave-edge-model-configuration-core jar diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index bbe4737ea9..a221de2816 100644 --- a/warehouse/index-stats/pom.xml +++ b/warehouse/index-stats/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-index-stats jar diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml index 95cd249b43..41b977533f 100644 --- a/warehouse/ingest-configuration/pom.xml +++ b/warehouse/ingest-configuration/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ingest-configuration diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index 66cf556e1c..e45839c5c0 100644 --- a/warehouse/ingest-core/pom.xml +++ b/warehouse/ingest-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ingest-core jar diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index ca2c9caba2..142d793bc4 100644 --- a/warehouse/ingest-csv/pom.xml +++ b/warehouse/ingest-csv/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ingest-csv jar diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index 327f50b9a2..5a1e50d89a 100644 --- a/warehouse/ingest-json/pom.xml +++ b/warehouse/ingest-json/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ingest-json jar diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml index ab15851399..c95b136e18 100644 --- a/warehouse/ingest-nyctlc/pom.xml +++ b/warehouse/ingest-nyctlc/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ingest-nyctlc jar diff --git a/warehouse/ingest-scripts/pom.xml b/warehouse/ingest-scripts/pom.xml index 2ecaa643b4..da40c0614d 100644 --- a/warehouse/ingest-scripts/pom.xml +++ b/warehouse/ingest-scripts/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ingest-scripts ${project.artifactId} diff --git a/warehouse/ingest-ssdeep/pom.xml b/warehouse/ingest-ssdeep/pom.xml index 8cd9f5fb83..85c3f7707c 100644 --- a/warehouse/ingest-ssdeep/pom.xml +++ b/warehouse/ingest-ssdeep/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ingest-ssdeep diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml index 83b2b06a92..07bc7e9f8c 100644 --- a/warehouse/ingest-wikipedia/pom.xml +++ b/warehouse/ingest-wikipedia/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ingest-wikipedia jar diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml index 63ce271c28..f7fd1f79d7 100644 --- a/warehouse/metrics-core/pom.xml +++ b/warehouse/metrics-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.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 095546f7c7..5c1a586666 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.14.0 + 7.15.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 0ecedf212c..7a7ab8416c 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.14.0 + 7.15.0-SNAPSHOT datawave-ops-tools-index-validation jar diff --git a/warehouse/ops-tools/pom.xml b/warehouse/ops-tools/pom.xml index eb6dd49d69..139ed74be3 100644 --- a/warehouse/ops-tools/pom.xml +++ b/warehouse/ops-tools/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ops-tools-parent pom diff --git a/warehouse/pom.xml b/warehouse/pom.xml index aed5f2b9ca..da60b2d81f 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-warehouse-parent pom diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index 64300b4d94..04c543989b 100644 --- a/warehouse/query-core/pom.xml +++ b/warehouse/query-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-query-core jar diff --git a/warehouse/regression-testing/pom.xml b/warehouse/regression-testing/pom.xml index 1a3914e166..f6f35a2c5c 100644 --- a/warehouse/regression-testing/pom.xml +++ b/warehouse/regression-testing/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-regression-testing ${project.artifactId} diff --git a/warehouse/ssdeep-common/pom.xml b/warehouse/ssdeep-common/pom.xml index 3a88da068d..9580dadb25 100644 --- a/warehouse/ssdeep-common/pom.xml +++ b/warehouse/ssdeep-common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.14.0 + 7.15.0-SNAPSHOT datawave-ssdeep-common diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index 516818fe1a..7669e315e6 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-accumulo ejb diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml index 601aec79d8..ddaaed6572 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-atom ejb diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml index 37bc5c05f1..410007dded 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-cached-results ejb diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index 3f0a7fd18f..738641fb23 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-client jar diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index a2c35d504a..51cfe90457 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-common-util jar diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index f933600d21..2f0eb0e5a6 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-common ejb diff --git a/web-services/deploy/application/pom.xml b/web-services/deploy/application/pom.xml index 70c7e85d2c..4fe946f6f4 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-deploy-application ear diff --git a/web-services/deploy/configuration/pom.xml b/web-services/deploy/configuration/pom.xml index 04cf3f157f..3b6d6fb395 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-deploy-configuration jar diff --git a/web-services/deploy/docs/pom.xml b/web-services/deploy/docs/pom.xml index 89e96d95e1..c95a2f2781 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-deploy-docs war diff --git a/web-services/deploy/pom.xml b/web-services/deploy/pom.xml index e83ec3087a..858dbd27d3 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.14.0 + 7.15.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 aeccf97f9e..838a270b7e 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.14.0 + 7.15.0-SNAPSHOT spring-framework-integration ${project.artifactId} diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index 7ac930510f..eb21dc0119 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.14.0 + 7.15.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 00fa98a8bf..72ead4e5aa 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.14.0 + 7.15.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 3956cf1896..ca5023c63a 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.14.0 + 7.15.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 61ad2960d0..dd3ca900b0 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-examples-jms-client jar diff --git a/web-services/examples/pom.xml b/web-services/examples/pom.xml index c90c61ce4c..871772f3dc 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.14.0 + 7.15.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 d1c53d16b4..7bb3f5ba60 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.14.0 + 7.15.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 13b36289a1..488f5dd8df 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.14.0 + 7.15.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 9ee0c406da..311108ca0a 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.14.0 + 7.15.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 9a4021ef62..e1ce201a11 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-map-reduce ejb diff --git a/web-services/metrics/pom.xml b/web-services/metrics/pom.xml index 283fcceee9..7310f743b7 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-metrics ejb diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index 1447beb983..51dc071ca3 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-model ejb diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml index 6126cc290d..ab5d29308d 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-modification ejb diff --git a/web-services/pom.xml b/web-services/pom.xml index 2a4feae2c4..6a45047963 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.14.0 + 7.15.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 a103976c7c..0e7f2ec0be 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-query-websocket war diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index 1c316d12d8..ab8e41e3a2 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-query ejb diff --git a/web-services/rest-api/pom.xml b/web-services/rest-api/pom.xml index 2fb85df0cc..3d80982681 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-rest-api war diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index da96be125d..8d6208bf50 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-security ejb diff --git a/web-services/web-root/pom.xml b/web-services/web-root/pom.xml index 97e7992979..f075f5fa5d 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.14.0 + 7.15.0-SNAPSHOT datawave-ws-web-root war