Merge pull request #215 from samply/release-v7.9.1

Release v7.9.1
samply · Nov 22, 2022 · 5414c54 · 5414c54
2 parents 9e39150 + 691e4ad
commit 5414c54
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [7.9.1 - 2022-11-22]
+### Fixed
+- Fix Monitoring Query ([#211](https://github.com/samply/share-client/pull/211))
+### Security
+- Updated various dependencies
+
 ## [7.9.0 - 2022-10-19]
 ### Added
 - Add Rest api for the XML specification of nNGM

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
   </parent>
 
   <artifactId>share-client</artifactId>
-  <version>7.9.0</version>
+  <version>7.9.1</version>
   <packaging>war</packaging>
 
   <name>Connector</name>
@@ -110,16 +110,16 @@
     <jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
     <json-path.version>2.7.0</json-path.version>
     <primefaces.version>11.0.0</primefaces.version>
-    <junit-jupiter.version>5.8.2</junit-jupiter.version>
-    <mockito-core.version>4.2.0</mockito-core.version>
-    <jackson-dataformat-xml.version>2.13.2</jackson-dataformat-xml.version>
+    <junit-jupiter.version>5.9.1</junit-jupiter.version>
+    <mockito-core.version>4.9.0</mockito-core.version>
+    <jackson-dataformat-xml.version>2.14.0</jackson-dataformat-xml.version>
 
     <sonar.organization>samply</sonar.organization>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     <commons-io.version>2.11.0</commons-io.version>
-    <log4j.version>2.17.2</log4j.version>
+    <log4j.version>2.19.0</log4j.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <protobuf-java.version>3.19.4</protobuf-java.version>
+    <protobuf-java.version>3.21.9</protobuf-java.version>
     <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
     <json-smart.version>1.3.3</json-smart.version>
   </properties>
@@ -174,17 +174,6 @@
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
       <version>${jackson-dataformat-xml.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-databind</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.13.2.2</version>
     </dependency>
 
     <dependency>

diff --git a/src/main/java/de/samply/share/client/util/connector/LdmConnectorCql.java b/src/main/java/de/samply/share/client/util/connector/LdmConnectorCql.java
@@ -255,11 +255,15 @@ public ReferenceQueryCheckResult getReferenceQueryCheckResult(String referenceQu
   }
 
   private String createQueryForMonitoring() {
+    // Gender and AgeClass are necessary because the Measure Resource references that Expressions
     return "library Retrieve\n"
         + "using FHIR version '4.0.0'\n"
         + "\n"
         + "define InInitialPopulation:\n"
-        + "  true";
+        + "  true\n"
+        + "define Gender:\n"
+        + "    null\n"
+        + "define AgeClass:\n"
+        + "    null\n";
   }
-
 }