Merge remote-tracking branch 'origin/issues/10_start_0.5.0_dev_cycle'

hhund · hhund · commit 0f1d6dc0b9f6 · 2021-01-26T20:01:11.000+01:00
into develop
diff --git a/dsf-bpe-process-feasibility/pom.xml b/dsf-bpe-process-feasibility/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>dsf-bpe-highmed-processes-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/FeasibilityProcessPluginDefinition.java b/dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/FeasibilityProcessPluginDefinition.java
@@ -18,7 +18,7 @@
 
 public class FeasibilityProcessPluginDefinition implements ProcessPluginDefinition
 {
-	public static final String VERSION = "0.4.0";
+	public static final String VERSION = "0.5.0";
 
 	@Override
 	public String getName()
diff --git a/dsf-bpe-process-feasibility/src/test/java/org/highmed/dsf/fhir/profile/TaskProfileTest.java b/dsf-bpe-process-feasibility/src/test/java/org/highmed/dsf/fhir/profile/TaskProfileTest.java
@@ -68,14 +68,14 @@ public class TaskProfileTest
 
 	@ClassRule
 	public static final ValidationSupportRule validationRule = new ValidationSupportRule(VERSION,
-			Arrays.asList("highmed-task-base-0.4.0.xml", "highmed-group-0.4.0.xml",
-					"highmed-extension-group-id-0.4.0.xml", "highmed-research-study-0.4.0.xml",
+			Arrays.asList("highmed-task-base-0.5.0.xml", "highmed-group-0.5.0.xml",
+					"highmed-extension-group-id-0.5.0.xml", "highmed-research-study-0.5.0.xml",
 					"highmed-task-request-feasibility.xml", "highmed-task-execute-feasibility.xml",
 					"highmed-task-single-medic-result-feasibility.xml", "highmed-task-compute-feasibility.xml",
 					"highmed-task-multi-medic-result-feasibility.xml", "highmed-task-error-feasibility.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml",
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml",
 					"highmed-feasibility.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml",
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml",
 					"highmed-feasibility.xml"));
 
 	private ResourceValidator resourceValidator = new ResourceValidatorImpl(validationRule.getFhirContext(),
diff --git a/dsf-bpe-process-local-services/pom.xml b/dsf-bpe-process-local-services/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<artifactId>dsf-bpe-highmed-processes-pom</artifactId>
 		<groupId>org.highmed.dsf</groupId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/dsf-bpe-process-local-services/src/main/java/org/highmed/dsf/bpe/LocalServicesProcessPluginDefinition.java b/dsf-bpe-process-local-services/src/main/java/org/highmed/dsf/bpe/LocalServicesProcessPluginDefinition.java
@@ -18,10 +18,10 @@
 
 public class LocalServicesProcessPluginDefinition implements ProcessPluginDefinition
 {
-	public static final String VERSION = "0.4.0";
+	public static final String VERSION = "0.5.0";
 
-	private static final String DEPENDENCY_FEASIBILITY_VERSION = "0.4.0";
-	private static final String DEPENDENCY_FEASIBILITY_NAME_AND_VERSION = "dsf-bpe-process-feasibility-0.4.0";
+	private static final String DEPENDENCY_FEASIBILITY_VERSION = "0.5.0";
+	private static final String DEPENDENCY_FEASIBILITY_NAME_AND_VERSION = "dsf-bpe-process-feasibility-0.5.0";
 
 	@Override
 	public String getName()
diff --git a/dsf-bpe-process-local-services/src/test/java/org/highmed/dsf/fhir/profile/TaskProfileTest.java b/dsf-bpe-process-local-services/src/test/java/org/highmed/dsf/fhir/profile/TaskProfileTest.java
@@ -41,13 +41,13 @@ public class TaskProfileTest
 
 	@ClassRule
 	public static final ValidationSupportRule validationRule = new ValidationSupportRule(VERSION,
-			Arrays.asList("highmed-task-base-0.4.0.xml", "highmed-group-0.4.0.xml",
-					"highmed-extension-group-id-0.4.0.xml", "highmed-extension-query-0.4.0.xml",
+			Arrays.asList("highmed-task-base-0.5.0.xml", "highmed-group-0.5.0.xml",
+					"highmed-extension-group-id-0.5.0.xml", "highmed-extension-query-0.5.0.xml",
 					"highmed-task-local-services-integration.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml",
-					"highmed-feasibility.xml", "highmed-query-type-0.4.0.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml",
-					"highmed-feasibility.xml", "highmed-query-type-0.4.0.xml"));
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml",
+					"highmed-feasibility.xml", "highmed-query-type-0.5.0.xml"),
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml",
+					"highmed-feasibility.xml", "highmed-query-type-0.5.0.xml"));
 
 	private ResourceValidator resourceValidator = new ResourceValidatorImpl(validationRule.getFhirContext(),
 			validationRule.getValidationSupport());
diff --git a/dsf-bpe-process-ping/pom.xml b/dsf-bpe-process-ping/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-highmed-processes-pom</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/dsf-bpe-process-ping/src/main/java/org/highmed/dsf/bpe/PingProcessPluginDefinition.java b/dsf-bpe-process-ping/src/main/java/org/highmed/dsf/bpe/PingProcessPluginDefinition.java
@@ -15,7 +15,7 @@
 
 public class PingProcessPluginDefinition implements ProcessPluginDefinition
 {
-	public static final String VERSION = "0.4.0";
+	public static final String VERSION = "0.5.0";
 
 	@Override
 	public String getName()
diff --git a/dsf-bpe-process-ping/src/test/java/org/highmed/dsf/fhir/profiles/TaskProfileTest.java b/dsf-bpe-process-ping/src/test/java/org/highmed/dsf/fhir/profiles/TaskProfileTest.java
@@ -42,10 +42,10 @@ public class TaskProfileTest
 
 	@ClassRule
 	public static final ValidationSupportRule validationRule = new ValidationSupportRule(VERSION,
-			Arrays.asList("highmed-task-base-0.4.0.xml", "highmed-task-start-ping-process.xml", "highmed-task-ping.xml",
+			Arrays.asList("highmed-task-base-0.5.0.xml", "highmed-task-start-ping-process.xml", "highmed-task-ping.xml",
 					"highmed-task-pong.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml"));
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml"),
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml"));
 
 	private ResourceValidator resourceValidator = new ResourceValidatorImpl(validationRule.getFhirContext(),
 			validationRule.getValidationSupport());
diff --git a/dsf-bpe-process-update-allow-list/pom.xml b/dsf-bpe-process-update-allow-list/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-highmed-processes-pom</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/dsf-bpe-process-update-allow-list/src/main/java/org/highmed/dsf/bpe/UpdateAllowListProcessPluginDefinition.java b/dsf-bpe-process-update-allow-list/src/main/java/org/highmed/dsf/bpe/UpdateAllowListProcessPluginDefinition.java
@@ -17,7 +17,7 @@
 
 public class UpdateAllowListProcessPluginDefinition implements ProcessPluginDefinition
 {
-	public static final String VERSION = "0.4.0";
+	public static final String VERSION = "0.5.0";
 
 	@Override
 	public String getName()
diff --git a/dsf-bpe-process-update-allow-list/src/test/java/org/highmed/dsf/fhir/profile/TaskProfileTest.java b/dsf-bpe-process-update-allow-list/src/test/java/org/highmed/dsf/fhir/profile/TaskProfileTest.java
@@ -42,11 +42,11 @@ public class TaskProfileTest
 
 	@ClassRule
 	public static final ValidationSupportRule validationRule = new ValidationSupportRule(VERSION,
-			Arrays.asList("highmed-task-base-0.4.0.xml", "highmed-task-update-allow-list.xml",
+			Arrays.asList("highmed-task-base-0.5.0.xml", "highmed-task-update-allow-list.xml",
 					"highmed-task-download-allow-list.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml",
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml",
 					"highmed-update-allow-list.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml",
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml",
 					"highmed-update-allow-list.xml"));
 
 	private ResourceValidator resourceValidator = new ResourceValidatorImpl(validationRule.getFhirContext(),
diff --git a/dsf-bpe-process-update-resources/pom.xml b/dsf-bpe-process-update-resources/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.highmed.dsf</groupId>
 		<artifactId>dsf-bpe-highmed-processes-pom</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/dsf-bpe-process-update-resources/src/main/java/org/highmed/dsf/bpe/UpdateResourcesProcessPluginDefinition.java b/dsf-bpe-process-update-resources/src/main/java/org/highmed/dsf/bpe/UpdateResourcesProcessPluginDefinition.java
@@ -17,7 +17,7 @@
 
 public class UpdateResourcesProcessPluginDefinition implements ProcessPluginDefinition
 {
-	public static final String VERSION = "0.4.0";
+	public static final String VERSION = "0.5.0";
 
 	@Override
 	public String getName()
diff --git a/dsf-bpe-process-update-resources/src/test/java/org/highmed/dsf/fhir/profile/TaskProfileTest.java b/dsf-bpe-process-update-resources/src/test/java/org/highmed/dsf/fhir/profile/TaskProfileTest.java
@@ -53,11 +53,11 @@ public class TaskProfileTest
 
 	@ClassRule
 	public static final ValidationSupportRule validationRule = new ValidationSupportRule(VERSION,
-			Arrays.asList("highmed-task-base-0.4.0.xml", "highmed-task-request-update-resources.xml",
+			Arrays.asList("highmed-task-base-0.5.0.xml", "highmed-task-request-update-resources.xml",
 					"highmed-task-execute-update-resources.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml",
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml",
 					"highmed-update-resources.xml"),
-			Arrays.asList("highmed-authorization-role-0.4.0.xml", "highmed-bpmn-message-0.4.0.xml",
+			Arrays.asList("highmed-authorization-role-0.5.0.xml", "highmed-bpmn-message-0.5.0.xml",
 					"highmed-update-resources.xml"));
 
 	private ResourceValidator resourceValidator = new ResourceValidatorImpl(validationRule.getFhirContext(),
@@ -68,7 +68,7 @@ public void testGenerateSnapshotNotWorkingWithoutBaseSnapshot() throws Exception
 	{
 		var reader = new StructureDefinitionReader(validationRule.getFhirContext());
 
-		StructureDefinition base = reader.readXml("/fhir/StructureDefinition/highmed-task-base-0.4.0.xml");
+		StructureDefinition base = reader.readXml("/fhir/StructureDefinition/highmed-task-base-0.5.0.xml");
 		StructureDefinition differential = reader
 				.readXml("/fhir/StructureDefinition/highmed-task-execute-update-resources.xml");
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.highmed.dsf</groupId>
 	<artifactId>dsf-bpe-highmed-processes-pom</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
@@ -62,12 +62,12 @@
 			<dependency>
 				<groupId>org.highmed.dsf</groupId>
 				<artifactId>dsf-bpe-process-base</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.highmed.dsf</groupId>
 				<artifactId>dsf-fhir-validation</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
@@ -125,7 +125,7 @@
 			<dependency>
 				<groupId>org.highmed.dsf</groupId>
 				<artifactId>dsf-bpe-process-base</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`public class FeasibilityProcessPluginDefinition implements ProcessPluginDefinition`
`20`	`20`	`{`
`21`		`- public static final String VERSION = "0.4.0";`
	`21`	`+ public static final String VERSION = "0.5.0";`
`22`	`22`
`23`	`23`	`@Override`
`24`	`24`	`public String getName()`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`public class PingProcessPluginDefinition implements ProcessPluginDefinition`
`17`	`17`	`{`
`18`		`- public static final String VERSION = "0.4.0";`
	`18`	`+ public static final String VERSION = "0.5.0";`
`19`	`19`
`20`	`20`	`@Override`
`21`	`21`	`public String getName()`