Skip to content

Commit

Permalink
hapi version property for api v2, version properties in bpe jetty pom
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@hhund
hhund committed Oct 9, 2024
1 parent f95cae6 commit 3f539d0
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-process-api-v2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
72 changes: 36 additions & 36 deletions dsf-bpe/dsf-bpe-server-jetty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 3f539d0

Please sign in to comment.