Merge branch 'release/v2.17.0'

ehrbase · Aug 27, 2024 · d5cc26c · d5cc26c
2 parents 74053fe + 712aee2
commit d5cc26c
Show file tree

Hide file tree

Showing 25 changed files with 58 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## [2.17.0]
+ ### Changed
+- Deprecated `response-dto` `EHR_(STATUS)` related classes that are only used by EHRbase ([621](https://github.com/ehrbase/openEHR_SDK/pull/621))
+ ### Added 
+ ### Fixed 
+
 ## [2.16.0]
  ### Added 
  ### Fixed 
@@ -434,3 +440,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 [2.14.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.13.0...v2.14.0
 [2.15.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.14.0...v2.15.0
 [2.16.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.15.0...v2.16.0
+[2.17.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.16.0...v2.17.0
diff --git a/aql/pom.xml b/aql/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>aql</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -8,7 +8,7 @@
 
     <artifactId>bom</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>2.16.0</version>
+    <version>2.17.0</version>
     <packaging>pom</packaging>
 
     <name>openEHR SDK</name>
@@ -42,19 +42,19 @@
         <archie.version>3.3.0</archie.version>
         <assertj.version>3.26.0</assertj.version>
         <cglib.version>3.3.0</cglib.version>
-        <classgraph.version>4.8.165</classgraph.version>
-        <commons-cli.version>1.6.0</commons-cli.version>
+        <classgraph.version>4.8.175</classgraph.version>
+        <commons-cli.version>1.9.0</commons-cli.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <commons-lang3.version>3.14.0</commons-lang3.version>
         <commons-io.version>2.16.1</commons-io.version>
         <commons-csv.version>1.10.0</commons-csv.version>
-        <commons-text.version>1.11.0</commons-text.version>
+        <commons-text.version>1.12.0</commons-text.version>
         <ehcache.version>3.10.8</ehcache.version>
         <everit-json-schema.version>1.14.4</everit-json-schema.version>
         <guava.version>32.1.3-jre</guava.version>
         <gson.version>2.10.1</gson.version>
         <httpclient.version>4.5.14</httpclient.version>
-        <jackson-bom.version>2.17.1</jackson-bom.version>
+        <jackson-bom.version>2.17.2</jackson-bom.version>
         <javapoet.version>1.13.0</javapoet.version>
         <javax-annotation.version>1.3.2</javax-annotation.version>
         <javax-cache.version>1.1.1</javax-cache.version>

diff --git a/client/pom.xml b/client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>client</artifactId>

diff --git a/example-generator/pom.xml b/example-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sdk-parent</artifactId>
         <groupId>org.ehrbase.openehr.sdk</groupId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/generator-commons/pom.xml b/generator-commons/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>generator-commons</artifactId>

diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>sdk-parent</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>2.16.0</version>
+    <version>2.17.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/generator/pom.xml b/generator/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>generator</artifactId>

diff --git a/opt-1.4/pom.xml b/opt-1.4/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>opt-1.4</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>bom</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
         <relativePath>./bom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>2.16.0</version>
+    <version>2.17.0</version>
     <packaging>pom</packaging>
     <name>openEHR SDK</name>
 

diff --git a/response-dto/pom.xml b/response-dto/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>2.16.0</version>
+    <version>2.17.0</version>
   </parent>
 
   <artifactId>response-dto</artifactId>

diff --git a/response-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/ContributionCreateDto.java b/response-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/ContributionCreateDto.java
@@ -18,6 +18,7 @@
 package org.ehrbase.openehr.sdk.response.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.nedap.archie.rm.RMObject;
@@ -34,6 +35,7 @@
  * The duplicate of Contribution from com.nedap.archie.rm.changecontrol
  * with changed field versions list of ObjectRef to list of OriginalVersion.
  */
+@JsonRootName(value = "CONTRIBUTION")
 @XmlType(
         name = "CONTRIBUTION",
         propOrder = {"uid", "versions", "audit"})

diff --git a/response-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/EhrResponseData.java b/response-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/EhrResponseData.java
@@ -28,8 +28,12 @@
 
 /**
  * Basic set of response data regarding EHR operations. Used as default or when `PREFER` header requests minimal response.
+ *
+ * @deprecated without replaced because used by EHRbase only.
  */
 @JacksonXmlRootElement(localName = "ehr")
+@Deprecated(since = "2.14.0", forRemoval = true)
+@SuppressWarnings("java:S1133")
 public class EhrResponseData {
 
     @JsonProperty(value = "system_id")

diff --git a/response-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/EhrStatusResponseData.java b/response-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/EhrStatusResponseData.java
@@ -24,7 +24,12 @@
 import com.nedap.archie.rm.generic.PartySelf;
 import com.nedap.archie.rm.support.identification.UIDBasedId;
 
+/**
+ * @deprecated without replaced because used by EHRbase only.
+ */
 @JacksonXmlRootElement(localName = "ehr_status")
+@Deprecated(since = "2.14.0", forRemoval = true)
+@SuppressWarnings("java:S1133")
 public class EhrStatusResponseData {
 
     @JsonProperty(value = "_type")

diff --git a/.../src/main/java/org/ehrbase/openehr/sdk/response/dto/VersionedCompositionResponseData.java b/.../src/main/java/org/ehrbase/openehr/sdk/response/dto/VersionedCompositionResponseData.java
@@ -19,7 +19,12 @@
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
+/**
+ * @deprecated without replaced because used by EHRbase only.
+ */
 @JacksonXmlRootElement
+@Deprecated(since = "2.14.0", forRemoval = true)
+@SuppressWarnings("java:S1133")
 public class VersionedCompositionResponseData {
     // TODO only for stub for now. Need to change it to real RM versioned_composition or alike later! makes swagger-ui
     // fail right with: Maximum call stack size exceeded

diff --git a/...e-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/VersionedObjectResponseData.java b/...e-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/VersionedObjectResponseData.java
@@ -26,8 +26,12 @@
 import com.nedap.archie.rm.support.identification.ObjectRef;
 import java.time.format.DateTimeFormatter;
 
+/**
+ * @deprecated without replaced because used by EHRbase only.
+ */
 @JacksonXmlRootElement(localName = "ehr_status")
-@SuppressWarnings("java:S1452")
+@Deprecated(since = "2.14.0", forRemoval = true)
+@SuppressWarnings({"java:S1133", "java:S1452"})
 public class VersionedObjectResponseData<T> {
 
     @JsonProperty(value = "_type")
@@ -52,8 +56,8 @@ public VersionedObjectResponseData(VersionedObject<T> versionedObject) {
         setType(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, className));
         setUid(versionedObject.getUid());
         setOwnerId(versionedObject.getOwnerId());
-        DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
-        setTimeCreated(formatter.format(versionedObject.getTimeCreated().getValue()));
+        setTimeCreated(DateTimeFormatter.ISO_DATE_TIME.format(
+                versionedObject.getTimeCreated().getValue()));
     }
 
     public String getType() {

diff --git a/response-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/ehrscape/EhrStatusDto.java b/response-dto/src/main/java/org/ehrbase/openehr/sdk/response/dto/ehrscape/EhrStatusDto.java
@@ -17,6 +17,11 @@
  */
 package org.ehrbase.openehr.sdk.response.dto.ehrscape;
 
+/**
+ * @deprecated without replaced because used by EHRbase only.
+ */
+@Deprecated(since = "2.14.0", forRemoval = true)
+@SuppressWarnings("java:S1133")
 public class EhrStatusDto {
 
     String subjectId;

diff --git a/serialisation/pom.xml b/serialisation/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>serialisation</artifactId>

diff --git a/serialisation_conformance_test/pom.xml b/serialisation_conformance_test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>serialisation_conformance_test</artifactId>

diff --git a/terminology/pom.xml b/terminology/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>terminology</artifactId>

diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>test-coverage</artifactId>

diff --git a/test-data/pom.xml b/test-data/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>test-data</artifactId>

diff --git a/util/pom.xml b/util/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>util</artifactId>

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>validation</artifactId>

diff --git a/web-template/pom.xml b/web-template/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.16.0</version>
+        <version>2.17.0</version>
     </parent>
 
     <artifactId>web-template</artifactId>