Merge pull request #39 from samply/release/1.3.3

release 1.3.3
samply · Feb 21, 2024 · 8b06cca · 8b06cca
2 parents f112e3b + 6f8e9be
commit 8b06cca
Show file tree

Hide file tree

Showing 5 changed files with 4,750 additions and 79 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 # ADT2FHIR
 
-Using the two XSLT files (/src/main/resources/ADT2MDS_FHIR.xsl and /src/main/resources/MDS2FHIR.xsl), XML Files 
-conforming to ADT/GEKID (/src/main/resources/ ADT_GEKID_v2.1.*x*-dktk_v1.0.0.xsd ) can be transformed into FHIR 
-resources conforming to [de.dktk.oncology 1.2.0](https://simplifier.net/packages/de.dktk.oncology/1.2.0).
+Using the two XSLT files ([ADT2MDS_FHIR.xsl](https://github.com/samply/adt2fhir/blob/main/src/main/resources/ADT2MDS_FHIR.xsl) and [MDS2FHIR.xsl](https://github.com/samply/adt2fhir/blob/main/src/main/resources/MDS2FHIR.xsl)), XML files conforming to [ADT/GEKID V2*](https://basisdatensatz.de/xml/) can be transformed into FHIR 
+resources conforming to [de.dktk.oncology](https://simplifier.net/packages/de.dktk.oncology/).
 
 
 ## Usage

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.samply.common</groupId>
     <artifactId>adt2fhir</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -54,7 +54,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.2.5</version>
             </plugin>
         </plugins>
     </build>
@@ -63,12 +63,12 @@
         <dependency>
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>
-            <version>12.3</version>
+            <version>12.4</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.14</version>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -95,13 +95,13 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.1.2</version>
+            <version>3.2.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.10.0</version>
+            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -113,13 +113,13 @@
         <dependency>
             <groupId>uk.org.webcompere</groupId>
             <artifactId>system-stubs-jupiter</artifactId>
-            <version>2.1.3</version>
+            <version>2.1.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.13.0</version>
+            <version>2.15.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/de/samply/adt2fhir/Adt2fhir.java b/src/main/java/de/samply/adt2fhir/Adt2fhir.java
@@ -7,6 +7,7 @@
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.concurrent.TimeUnit;
 import javax.xml.transform.*;
@@ -125,6 +126,7 @@ public static void processXmlFiles (String inputData, Transformer transformer, T
         }
         else {
             int counter=0;
+            Arrays.sort(listOfFiles);
             for (File inputFile : listOfFiles) {
                 //System.out.println(inputFile);
                 if (inputFile.isFile() & inputFile.getName().toLowerCase().endsWith(".xml")) {