From 3f539d0f88acbf8a3d328228226e247d6f7f659f Mon Sep 17 00:00:00 2001
From: Hauke Hund <hauke.hund@hs-heilbronn.de>
Date: Wed, 9 Oct 2024 13:52:33 +0200
Subject: [PATCH] hapi version property for api v2, version properties in bpe
 jetty pom

Introduced new HAPI version property for plugin API v2.
Replaced hard-coded HAPI version numbers in dsf-bpe-server-jetty and api
v2 modules with version properties.
---
 dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml |  2 +-
 dsf-bpe/dsf-bpe-process-api-v2/pom.xml      |  2 +-
 dsf-bpe/dsf-bpe-server-jetty/pom.xml        | 72 ++++++++++-----------
 pom.xml                                     |  1 +
 4 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml b/dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml
index f4abc2eb5..9018032a9 100644
--- a/dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-r4</artifactId>
-			<version>${hapi.fhir.version}</version>
+			<version>${hapi.fhir.version.v2}</version>
 		</dependency>
 		
 		<dependency>
diff --git a/dsf-bpe/dsf-bpe-process-api-v2/pom.xml b/dsf-bpe/dsf-bpe-process-api-v2/pom.xml
index 532ff08c0..ca81616fa 100644
--- a/dsf-bpe/dsf-bpe-process-api-v2/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-api-v2/pom.xml
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-r4</artifactId>
-			<version>${hapi.fhir.version}</version>
+			<version>${hapi.fhir.version.v2}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.camunda.bpm</groupId>
diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml
index ed2418229..d193662fa 100755
--- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml
+++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml
@@ -108,12 +108,12 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-structures-r4</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-base</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.google.j2objc</groupId>
@@ -123,37 +123,37 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.utilities</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.r4</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-structures-r5</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.r5</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-validation</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-converter</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.convertors</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.sf.saxon</groupId>
@@ -163,22 +163,22 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.validation</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.dstu2</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.dstu2016may</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.dstu3</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.apache.commons</groupId>
@@ -213,12 +213,12 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-validation-resources-r4</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-validation-resources-r5</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 							</artifactItems>
 							<outputDirectory>docker/api/v1</outputDirectory>
@@ -243,12 +243,12 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-structures-r4</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-base</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.google.j2objc</groupId>
@@ -258,37 +258,37 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.utilities</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.r4</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-structures-r5</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.r5</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-validation</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-converter</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.convertors</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.sf.saxon</groupId>
@@ -298,22 +298,22 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.validation</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.dstu2</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.dstu2016may</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>org.hl7.fhir.dstu3</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.apache.commons</groupId>
@@ -348,12 +348,12 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-validation-resources-r4</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-validation-resources-r5</artifactId>
-									<version>5.1.0</version>
+									<version>${hapi.fhir.version.v1}</version>
 								</artifactItem>
 							</artifactItems>
 							<outputDirectory>api/v1</outputDirectory>
@@ -388,17 +388,17 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-base</artifactId>
-									<version>7.4.0</version>
+									<version>${hapi.fhir.version.v2}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-caching-api</artifactId>
-									<version>7.4.0</version>
+									<version>${hapi.fhir.version.v2}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-structures-r4</artifactId>
-									<version>7.4.0</version>
+									<version>${hapi.fhir.version.v2}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.ibm.icu</groupId>
@@ -468,17 +468,17 @@
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-base</artifactId>
-									<version>7.4.0</version>
+									<version>${hapi.fhir.version.v2}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-caching-api</artifactId>
-									<version>7.4.0</version>
+									<version>${hapi.fhir.version.v2}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>ca.uhn.hapi.fhir</groupId>
 									<artifactId>hapi-fhir-structures-r4</artifactId>
-									<version>7.4.0</version>
+									<version>${hapi.fhir.version.v2}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.ibm.icu</groupId>
diff --git a/pom.xml b/pom.xml
index 21672708c..44682aa65 100755
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
 		<jackson.version>2.17.2</jackson.version>
 		<camunda.version>7.21.0</camunda.version>
 		<hapi.fhir.version.v1>5.1.0</hapi.fhir.version.v1>
+		<hapi.fhir.version.v2>7.4.0</hapi.fhir.version.v2>
 		<hapi.fhir.version>7.4.0</hapi.fhir.version>
 		<bouncycastle.version>1.78.1</bouncycastle.version>
 	</properties>