Merge remote-tracking branch 'origin/main' into issues/44_new_dev_cycle

hhund · hhund · commit bbde1273fef7 · 2021-09-02T20:42:32.000+02:00
diff --git a/codex-process-data-transfer/pom.xml b/codex-process-data-transfer/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
 		<artifactId>codex-processes-ap1</artifactId>
-		<version>0.4.0-SNAPSHOT</version>
+		<version>0.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/spring/config/TransferDataConfig.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/spring/config/TransferDataConfig.java
@@ -108,10 +108,10 @@ public class TransferDataConfig
 	@Value("${de.netzwerk.universitaetsmedizin.codex.gecco.server.proxy.url:#{null}}")
 	private String fhirStoreProxyUrl;
 
-	@Value("${de.netzwerk.universitaetsmedizin.codex.gecco.server.username:#{null}}")
+	@Value("${de.netzwerk.universitaetsmedizin.codex.gecco.server.proxy.username:#{null}}")
 	private String fhirStoreProxyUsername;
 
-	@Value("${de.netzwerk.universitaetsmedizin.codex.gecco.server.password:#{null}}")
+	@Value("${de.netzwerk.universitaetsmedizin.codex.gecco.server.proxy.password:#{null}}")
 	private String fhirStoreProxyPassword;
 
 	@Value("${de.netzwerk.universitaetsmedizin.codex.gecco.server.use.chained.parameter.not.logical.reference:true}")
@@ -126,7 +126,7 @@ public class TransferDataConfig
 	@Value("${de.netzwerk.universitaetsmedizin.codex.crr.private.key:#{null}}")
 	private String crrPrivateKeyFile;
 
-	@Value("${de.netzwerk.universitaetsmedizin.codex.gth.identifier.value:gth.hs-heilbronn.de}")
+	@Value("${de.netzwerk.universitaetsmedizin.codex.gth.identifier.value:hs-heilbronn.de}")
 	private String geccoTransferHubIdentifierValue;
 
 	@Value("${de.netzwerk.universitaetsmedizin.codex.crr.identifier.value:num-codex.de}")
@@ -183,10 +183,10 @@ public class TransferDataConfig
 	@Value("${de.netzwerk.universitaetsmedizin.codex.fttp.proxy.url:#{null}}")
 	private String fttpProxyUrl;
 
-	@Value("${de.netzwerk.universitaetsmedizin.codex.fttp.username:#{null}}")
+	@Value("${de.netzwerk.universitaetsmedizin.codex.fttp.proxy.username:#{null}}")
 	private String fttpProxyUsername;
 
-	@Value("${de.netzwerk.universitaetsmedizin.codex.fttp.password:#{null}}")
+	@Value("${de.netzwerk.universitaetsmedizin.codex.fttp.proxy.password:#{null}}")
 	private String fttpProxyPassword;
 
 	@Value("${org.highmed.dsf.bpe.fhir.server.organization.identifier.value}")
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-receive.xml b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-receive.xml
@@ -49,7 +49,7 @@
 	<!-- status managed by bpe -->
 	<status value="unknown" />
 	<experimental value="false" />
-	<date value="2021-08-23" />
+	<date value="2021-08-25" />
 	<publisher value="NUM-CODEX" />
 	<contact>
 		<name value="NUM-CODEX" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-send.xml b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-send.xml
@@ -65,7 +65,7 @@
 	<!-- status managed by bpe -->
 	<status value="unknown" />
 	<experimental value="false" />
-	<date value="2021-08-23" />
+	<date value="2021-08-25" />
 	<publisher value="NUM-CODEX" />
 	<contact>
 		<name value="NUM-CODEX" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-translate.xml b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-translate.xml
@@ -57,7 +57,7 @@
 	<!-- status managed by bpe -->
 	<status value="unknown" />
 	<experimental value="false" />
-	<date value="2021-08-23" />
+	<date value="2021-08-25" />
 	<publisher value="NUM-CODEX" />
 	<contact>
 		<name value="NUM-CODEX" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-trigger.xml b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-trigger.xml
@@ -115,7 +115,7 @@
 	<!-- status managed by bpe -->
 	<status value="unknown" />
 	<experimental value="false" />
-	<date value="2021-08-23" />
+	<date value="2021-08-25" />
 	<publisher value="NUM-CODEX" />
 	<contact>
 		<name value="NUM-CODEX" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/CodeSystem/num-codex-data-transfer.xml b/codex-process-data-transfer/src/main/resources/fhir/CodeSystem/num-codex-data-transfer.xml
@@ -13,7 +13,7 @@
 	<!-- status managed by bpe -->
 	<status value="unknown" />
 	<experimental value="false" />
-	<date value="2021-08-23" />
+	<date value="2021-08-25" />
 	<publisher value="NUM-CODEX" />
 	<description value="CodeSystem with standard values for the NUM-CODEX data-transfer processes" />
 	<caseSensitive value="true" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-bloom-filter-identifier.xml b/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-bloom-filter-identifier.xml
@@ -8,7 +8,7 @@
 	<name value="NUM-CODEX_Bloom-Filter_Identifier"/>
 	<status value="active" />
 	<kind value="identifier"/>
-	<date value="2021-08-23"/>
+	<date value="2021-08-25"/>
 	<publisher value="NUM-Codex"/>
 	<responsible value="THS Greifswald"/>
 	<description value="Bloom Filter"/>
diff --git a/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-crr-pseudonym-identifier.xml b/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-crr-pseudonym-identifier.xml
@@ -8,7 +8,7 @@
 	<name value="NUM-CODEX_CRR_Pseudonym_Identifier"/>
 	<status value="active" />
 	<kind value="identifier"/>
-	<date value="2021-08-23"/>
+	<date value="2021-08-25"/>
 	<publisher value="NUM-Codex"/>
 	<responsible value="THS Greifswald"/>
 	<description value="CODEX specific pseudonym"/>
diff --git a/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-dic-pseudonym-identifier.xml b/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-dic-pseudonym-identifier.xml
@@ -8,7 +8,7 @@
 	<name value="NUM-CODEX_DIC_Pseudonym_Identifier"/>
 	<status value="active" />
 	<kind value="identifier"/>
-	<date value="2021-08-23"/>
+	<date value="2021-08-25"/>
 	<publisher value="NUM-Codex"/>
 	<responsible value="THS Greifswald"/>
 	<description value="DIZ specific pseudonym"/>
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml
@@ -11,7 +11,7 @@
   <name value="TaskStartDataReceive" />
   <status value="unknown" />
   <experimental value="false" />
-  <date value="2021-08-23" />
+  <date value="2021-08-25" />
   <fhirVersion value="4.0.1" />
   <kind value="resource" />
   <abstract value="false" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml
@@ -11,7 +11,7 @@
   <name value="TaskStartDataSend" />
   <status value="unknown" />
   <experimental value="false" />
-  <date value="2021-08-23" />
+  <date value="2021-08-25" />
   <fhirVersion value="4.0.1" />
   <kind value="resource" />
   <abstract value="false" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml
@@ -11,7 +11,7 @@
   <name value="TaskStartDataTranslate" />
   <status value="unknown" />
   <experimental value="false" />
-  <date value="2021-08-23" />
+  <date value="2021-08-25" />
   <fhirVersion value="4.0.1" />
   <kind value="resource" />
   <abstract value="false" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml
@@ -11,7 +11,7 @@
   <name value="TaskStartDataTrigger" />
   <status value="unknown" />
   <experimental value="false" />
-  <date value="2021-08-23" />
+  <date value="2021-08-25" />
   <fhirVersion value="4.0.1" />
   <kind value="resource" />
   <abstract value="false" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-stop-data-trigger.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-stop-data-trigger.xml
@@ -11,7 +11,7 @@
   <name value="TaskStopDataTrigger" />
   <status value="unknown" />
   <experimental value="false" />
-  <date value="2021-08-23" />
+  <date value="2021-08-25" />
   <fhirVersion value="4.0.1" />
   <kind value="resource" />
   <abstract value="false" />
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ValueSet/num-codex-data-transfer.xml b/codex-process-data-transfer/src/main/resources/fhir/ValueSet/num-codex-data-transfer.xml
@@ -13,7 +13,7 @@
 	<!-- status managed by bpe -->
 	<status value="unknown" />
 	<experimental value="false"/>
-	<date value="2021-08-23"/>
+	<date value="2021-08-25"/>
 	<publisher value="NUM-CODEX"/>
 	<description value="CodeSystem with standard values for the NUM-CODEX data-transfer processes"/>
 	<immutable value="true"/>
diff --git a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSendWithAbsoluteReference.xml b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSendWithAbsoluteReference.xml
@@ -5,7 +5,7 @@
    <instantiatesUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataSend/0.4.0"/>
    <status value="requested"/>
    <intent value="order"/>
-   <authoredOn value="2021-07-07T13:40:00+01:00"/>
+   <authoredOn value="2021-08-25T16:00:00+01:00"/>
    <requester>
       <type value="Organization"/>
       <identifier>
@@ -54,7 +54,7 @@
             <code value="export-to"/>
          </coding>
       </type>
-      <valueInstant value="2021-08-23T13:40:00+01:00"/>
+      <valueInstant value="2021-08-25T16:00:00+01:00"/>
    </input>
    <!-- optional parameter specifying GECCO resources should be send starting 
 		at the defined date, resources older than the specified date will not be 
diff --git a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSendWithIdentifierReference.xml b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSendWithIdentifierReference.xml
@@ -5,7 +5,7 @@
    <instantiatesUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataSend/0.4.0"/>
    <status value="requested"/>
    <intent value="order"/>
-   <authoredOn value="2021-07-07T13:40:00+01:00"/>
+   <authoredOn value="2021-08-25T16:00:00+01:00"/>
    <requester>
       <type value="Organization"/>
       <identifier>
@@ -59,7 +59,7 @@
             <code value="export-to"/>
          </coding>
       </type>
-      <valueInstant value="2021-08-23T13:40:00+01:00"/>
+      <valueInstant value="2021-08-25T16:00:00+01:00"/>
    </input>
    <!-- optional parameter specifying GECCO resources should be send starting 
 		at the defined date, resources older than the specified date will not be 
diff --git a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataTrigger.xml b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataTrigger.xml
@@ -5,7 +5,7 @@
    <instantiatesUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTrigger/0.4.0"/>
    <status value="requested"/>
    <intent value="order"/>
-   <authoredOn value="2021-07-07T13:40:00+01:00"/>
+   <authoredOn value="2021-08-25T16:00:00+01:00"/>
    <requester>
       <type value="Organization"/>
       <identifier>
diff --git a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStopDataTrigger.xml b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStopDataTrigger.xml
@@ -5,7 +5,7 @@
    <instantiatesUri value="http://www.netzwerk-universitaetsmedizin.de/bpe/Process/dataTrigger/0.4.0"/>
    <status value="requested"/>
    <intent value="order"/>
-   <authoredOn value="2021-07-07T13:40:00+01:00"/>
+   <authoredOn value="2021-08-25T16:00:00+01:00"/>
    <requester>
       <type value="Organization"/>
       <identifier>
diff --git a/codex-processes-ap1-test-data-generator/pom.xml b/codex-processes-ap1-test-data-generator/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
 		<artifactId>codex-processes-ap1</artifactId>
-		<version>0.4.0-SNAPSHOT</version>
+		<version>0.4.0</version>
 	</parent>
 
 	<properties>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>de.netzwerk-universitaetsmedizin.codex</groupId>
 	<artifactId>codex-processes-ap1</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.4.0</version>
 	<packaging>pom</packaging>
 
 	<modules>
@@ -21,7 +21,7 @@
 
 		<main.basedir>${project.basedir}</main.basedir>
 		<hapi.version>5.1.0</hapi.version>
-		<dsf.version>0.5.0-SNAPSHOT</dsf.version>
+		<dsf.version>0.5.0</dsf.version>
 	</properties>
 
 	<description>Business processes for the NUM CODEX project (AP1) as plugins for the HiGHmed Data Sharing Framework.</description>
@@ -125,7 +125,7 @@
 			<dependency>
 				<groupId>org.highmed.dsf</groupId>
 				<artifactId>dsf-bpe-process-base</artifactId>
-				<version>0.4.0</version>
+				<version>${dsf.version}</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
