diff --git a/cqf-fhir-api/pom.xml b/cqf-fhir-api/pom.xml
index 109992891..ab5dcd27e 100644
--- a/cqf-fhir-api/pom.xml
+++ b/cqf-fhir-api/pom.xml
@@ -5,14 +5,14 @@
org.opencds.cqf.fhir
cqf-fhir-api
- 3.11.0-SNAPSHOT
+ 3.11.0
FHIR Clinical Reasoning (APIs)
FHIR Repository APIs used by this project. Implement these to incorporate clinical reasoning on your platform
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
diff --git a/cqf-fhir-benchmark/pom.xml b/cqf-fhir-benchmark/pom.xml
index a56fac833..b970d8941 100644
--- a/cqf-fhir-benchmark/pom.xml
+++ b/cqf-fhir-benchmark/pom.xml
@@ -5,26 +5,26 @@
org.opencds.cqf.fhir
cqf-fhir-benchmark
- 3.11.0-SNAPSHOT
+ 3.11.0
FHIR Clinical Reasoning (Benchmarks)
Tests validating performance of FHIR Clinical Reasoning operations
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-cr
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-test
- 3.11.0-SNAPSHOT
+ 3.11.0
org.openjdk.jmh
@@ -34,14 +34,14 @@
org.opencds.cqf.fhir
cqf-fhir-cr
- 3.11.0-SNAPSHOT
+ 3.11.0
test-jar
org.opencds.cqf.fhir
cqf-fhir-jackson
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
test
diff --git a/cqf-fhir-bom/pom.xml b/cqf-fhir-bom/pom.xml
index 5359ffb03..ee029d87e 100644
--- a/cqf-fhir-bom/pom.xml
+++ b/cqf-fhir-bom/pom.xml
@@ -5,7 +5,7 @@
org.opencds.cqf.fhir
cqf-fhir-bom
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
FHIR Clinical Reasoning (Bill Of Materials)
This bom can be used to simplify dependency management when using this project
@@ -13,7 +13,7 @@
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
@@ -21,44 +21,44 @@
org.opencds.cqf.fhir
cqf-fhir-api
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-test
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-utility
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-cql
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-jackson
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
org.opencds.cqf.fhir
cqf-fhir-jaxb
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
org.opencds.cqf.fhir
cqf-fhir-cr
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-cr-cli
- 3.11.0-SNAPSHOT
+ 3.11.0
diff --git a/cqf-fhir-cql/pom.xml b/cqf-fhir-cql/pom.xml
index 23744ea03..761b52701 100644
--- a/cqf-fhir-cql/pom.xml
+++ b/cqf-fhir-cql/pom.xml
@@ -5,26 +5,26 @@
org.opencds.cqf.fhir
cqf-fhir-cql
- 3.11.0-SNAPSHOT
+ 3.11.0
FHIR Clinical Reasoning (CQL)
Tools, utilities, code gen to support CQL in FHIR Clinical Reasoning operations
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-api
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-utility
- 3.11.0-SNAPSHOT
+ 3.11.0
org.mockito
@@ -62,13 +62,13 @@
org.opencds.cqf.fhir
cqf-fhir-test
- 3.11.0-SNAPSHOT
+ 3.11.0
test
org.opencds.cqf.fhir
cqf-fhir-jackson
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
test
diff --git a/cqf-fhir-cr-cli/pom.xml b/cqf-fhir-cr-cli/pom.xml
index 98e4ee7a0..f1aca638b 100644
--- a/cqf-fhir-cr-cli/pom.xml
+++ b/cqf-fhir-cr-cli/pom.xml
@@ -6,36 +6,36 @@
org.opencds.cqf.fhir
cqf-fhir-cr-cli
- 3.11.0-SNAPSHOT
+ 3.11.0
FHIR Clinical Reasoning (CLI)
CLI for running FHIR Clincial Reasoning operations
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-api
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-utility
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-cql
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-jackson
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
@@ -69,7 +69,7 @@
org.opencds.cqf.fhir
cqf-fhir-test
- 3.11.0-SNAPSHOT
+ 3.11.0
test
diff --git a/cqf-fhir-cr-cli/src/main/java/org/opencds/cqf/fhir/cr/cli/command/CqlCommand.java b/cqf-fhir-cr-cli/src/main/java/org/opencds/cqf/fhir/cr/cli/command/CqlCommand.java
index b2a7602ed..12b3723a3 100644
--- a/cqf-fhir-cr-cli/src/main/java/org/opencds/cqf/fhir/cr/cli/command/CqlCommand.java
+++ b/cqf-fhir-cr-cli/src/main/java/org/opencds/cqf/fhir/cr/cli/command/CqlCommand.java
@@ -124,6 +124,7 @@ static class ParameterParameter {
}
}
+ @SuppressWarnings("removal")
private static class Logger implements ILoggingService {
private final org.slf4j.Logger log = LoggerFactory.getLogger(Logger.class);
diff --git a/cqf-fhir-cr-spring/pom.xml b/cqf-fhir-cr-spring/pom.xml
index a871febb3..0e66e7c36 100644
--- a/cqf-fhir-cr-spring/pom.xml
+++ b/cqf-fhir-cr-spring/pom.xml
@@ -7,21 +7,21 @@
org.opencds.cqf.fhir
cqf-fhir-cr-spring
- 3.11.0-SNAPSHOT
+ 3.11.0
FHIR Clinical Reasoning (Spring)
Spring configurations for FHIR Clinical Reasoning
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-cr
- 3.11.0-SNAPSHOT
+ 3.11.0
org.springframework
diff --git a/cqf-fhir-cr/pom.xml b/cqf-fhir-cr/pom.xml
index 1f5890b5c..9739bc86c 100644
--- a/cqf-fhir-cr/pom.xml
+++ b/cqf-fhir-cr/pom.xml
@@ -5,45 +5,45 @@
org.opencds.cqf.fhir
cqf-fhir-cr
- 3.11.0-SNAPSHOT
+ 3.11.0
FHIR Clinical Reasoning (Operations)
Implementations of clinical reasoning operations
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-api
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-cql
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-utility
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-jackson
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
test
org.opencds.cqf.fhir
cqf-fhir-test
- 3.11.0-SNAPSHOT
+ 3.11.0
test
diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java
index 8a0ce273d..6800ffcdc 100644
--- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java
+++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/dstu3/Dstu3MeasureProcessor.java
@@ -6,7 +6,6 @@
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.cqframework.cql.cql2elm.CqlIncludeException;
import org.cqframework.cql.cql2elm.model.CompiledLibrary;
@@ -180,7 +179,9 @@ private Map resolveParameterMap(Parameters parameters) {
}
if (parameterMap.containsKey(param.getName())) {
if (parameterMap.get(param.getName()) instanceof List) {
- CollectionUtils.addIgnoreNull((List>) parameterMap.get(param.getName()), value);
+ if (value != null) {
+ ((List) parameterMap.get(param.getName())).add(value);
+ }
} else {
parameterMap.put(param.getName(), Arrays.asList(parameterMap.get(param.getName()), value));
}
diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java
index db8854088..dc3a68032 100644
--- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java
+++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/measure/r4/R4MeasureProcessor.java
@@ -8,7 +8,6 @@
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.cqframework.cql.cql2elm.CqlIncludeException;
import org.cqframework.cql.cql2elm.model.CompiledLibrary;
@@ -221,7 +220,9 @@ private Map resolveParameterMap(Parameters parameters) {
}
if (parameterMap.containsKey(param.getName())) {
if (parameterMap.get(param.getName()) instanceof List) {
- CollectionUtils.addIgnoreNull((List>) parameterMap.get(param.getName()), value);
+ if (value != null) {
+ ((List) parameterMap.get(param.getName())).add(value);
+ }
} else {
parameterMap.put(param.getName(), Arrays.asList(parameterMap.get(param.getName()), value));
}
diff --git a/cqf-fhir-jackson/pom.xml b/cqf-fhir-jackson/pom.xml
index ee45106f4..c82efb8d4 100644
--- a/cqf-fhir-jackson/pom.xml
+++ b/cqf-fhir-jackson/pom.xml
@@ -5,7 +5,7 @@
org.opencds.cqf.fhir
cqf-fhir-jackson
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
FHIR Clinical Reasoning (Jackson)
Aggregator module for Jackson dependencies
@@ -13,7 +13,7 @@
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
diff --git a/cqf-fhir-jaxb/pom.xml b/cqf-fhir-jaxb/pom.xml
index f88589a95..2b873d28a 100644
--- a/cqf-fhir-jaxb/pom.xml
+++ b/cqf-fhir-jaxb/pom.xml
@@ -5,7 +5,7 @@
org.opencds.cqf.fhir
cqf-fhir-jaxb
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
FHIR Clinical Reasoning (JAXB)
Aggregator module for JAXB dependencies
@@ -13,7 +13,7 @@
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
diff --git a/cqf-fhir-test/pom.xml b/cqf-fhir-test/pom.xml
index 1e2f71e6a..ef7e9c1c5 100644
--- a/cqf-fhir-test/pom.xml
+++ b/cqf-fhir-test/pom.xml
@@ -5,21 +5,21 @@
org.opencds.cqf.fhir
cqf-fhir-test
- 3.11.0-SNAPSHOT
+ 3.11.0
FHIR Clinical Reasoning (Test Utilities)
Utilities to support unit testing clinical reasoning operations
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-api
- 3.11.0-SNAPSHOT
+ 3.11.0
ca.uhn.hapi.fhir
diff --git a/cqf-fhir-utility/pom.xml b/cqf-fhir-utility/pom.xml
index c97231cf4..f469acafa 100644
--- a/cqf-fhir-utility/pom.xml
+++ b/cqf-fhir-utility/pom.xml
@@ -5,21 +5,21 @@
org.opencds.cqf.fhir
cqf-fhir-utility
- 3.11.0-SNAPSHOT
+ 3.11.0
FHIR Clinical Reasoning (Utilities)
Utilities to help develop clinical reasoning operations
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
org.opencds.cqf.fhir
cqf-fhir-api
- 3.11.0-SNAPSHOT
+ 3.11.0
org.mockito
@@ -29,7 +29,7 @@
org.opencds.cqf.fhir
cqf-fhir-test
- 3.11.0-SNAPSHOT
+ 3.11.0
test
diff --git a/docs/pom.xml b/docs/pom.xml
index 357304d39..510f7855e 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@
org.opencds.cqf.fhir
docs
- 3.11.0-SNAPSHOT
+ 3.11.0
FHIR Clinical Reasoning (Documentation)
Documentation website for FHIR Clinical Reasoning
@@ -13,7 +13,7 @@
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
@@ -23,7 +23,7 @@
cqf-fhir-bom
pom
import
- 3.11.0-SNAPSHOT
+ 3.11.0
diff --git a/pom.xml b/pom.xml
index c1c5c5a18..8f7505767 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.opencds.cqf.fhir
cqf-fhir
- 3.11.0-SNAPSHOT
+ 3.11.0
pom
FHIR Clinical Reasoning
FHIR Clinical Reasoning Implementations
@@ -20,10 +20,10 @@
5.9.1
2.0.4
- 3.14.0
+ 3.15.0
1.36
5.3.32
- 7.2.2
+ 7.4.0
4.6.1
32.1.2-jre
2.24.1