This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git


The following commit(s) were added to refs/heads/master by this push:
     new 11d10d89d SM-5744: Create OSGi bundles for FHIR 7.2.1
11d10d89d is described below

commit 11d10d89d7e2839966ccbd8d6f98ee3d549a0e9a
Author: JB Onofré <[email protected]>
AuthorDate: Mon Jul 15 08:50:10 2024 +0200

    SM-5744: Create OSGi bundles for FHIR 7.2.1
---
 .../pom.xml                                                 | 13 +++++++------
 .../src/main/resources/OSGI-INF/bundle.info                 |  0
 .../pom.xml                                                 |  9 +++++----
 .../src/main/resources/OSGI-INF/bundle.info                 |  0
 .../pom.xml                                                 | 13 +++++++------
 .../src/main/resources/OSGI-INF/bundle.info                 |  0
 .../pom.xml                                                 |  9 +++++----
 .../src/main/resources/OSGI-INF/bundle.info                 |  0
 .../pom.xml                                                 | 13 +++++++------
 .../src/main/resources/OSGI-INF/bundle.info                 |  0
 .../pom.xml                                                 |  7 +++----
 .../src/main/resources/OSGI-INF/bundle.info                 |  0
 pom.xml                                                     |  6 ++++++
 13 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/hapi-fhir-structures-dstu2-7.0.0/pom.xml 
b/hapi-fhir-structures-dstu2-7.2.1/pom.xml
similarity index 93%
rename from hapi-fhir-structures-dstu2-7.0.0/pom.xml
rename to hapi-fhir-structures-dstu2-7.2.1/pom.xml
index c1d873d3b..d63be8ab9 100644
--- a/hapi-fhir-structures-dstu2-7.0.0/pom.xml
+++ b/hapi-fhir-structures-dstu2-7.2.1/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2</artifactId>
-    <version>7.0.0_2-SNAPSHOT</version>
+    <version>7.2.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar 
file.</description>
@@ -39,17 +39,18 @@
         
<connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>ca.uhn.hapi.fhir</pkgGroupId>
         <pkgArtifactId>hapi-fhir-structures-dstu2</pkgArtifactId>
-        <pkgVersion>7.0.0</pkgVersion>
-             
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
+        <pkgVersion>7.2.1</pkgVersion>
+             
<servicemix.osgi.source.version>7.2.1.1</servicemix.osgi.source.version>
         <servicemix.osgi.import.pkg>
-               javax.servlet;resolution:=optional;version="[3,5)",
-               javax.servlet.http;resolution:=optional;version="[3,5)",
+    javax.servlet;resolution:=optional;version="[3,6)",
+    javax.servlet.http;resolution:=optional;version="[3,6)",
+    jakarta.servlet;resolution:=optional;version="[3,6)",
+    jakarta.servlet.http;resolution:=optional;version="[3,6)",
                ca.uhn.fhir.context;version="[7,8)",
                ca.uhn.fhir.context.api;version="[7,8)",
                ca.uhn.fhir.context.support;version="[7,8)",
diff --git 
a/hapi-fhir-structures-dstu2-7.0.0/src/main/resources/OSGI-INF/bundle.info 
b/hapi-fhir-structures-dstu2-7.2.1/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from 
hapi-fhir-structures-dstu2-7.0.0/src/main/resources/OSGI-INF/bundle.info
rename to 
hapi-fhir-structures-dstu2-7.2.1/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-dstu2.1-7.0.0/pom.xml 
b/hapi-fhir-structures-dstu2.1-7.2.1/pom.xml
similarity index 96%
rename from hapi-fhir-structures-dstu2.1-7.0.0/pom.xml
rename to hapi-fhir-structures-dstu2.1-7.2.1/pom.xml
index c47da589d..f5598cbdf 100644
--- a/hapi-fhir-structures-dstu2.1-7.0.0/pom.xml
+++ b/hapi-fhir-structures-dstu2.1-7.2.1/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2.1</artifactId>
-    <version>7.0.0_2-SNAPSHOT</version>
+    <version>7.2.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar 
file.</description>
@@ -39,17 +39,18 @@
         
<connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>ca.uhn.hapi.fhir</pkgGroupId>
         <pkgArtifactId>hapi-fhir-structures-dstu2.1</pkgArtifactId>
-        <pkgVersion>7.0.0</pkgVersion>
-             
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
+        <pkgVersion>7.2.1</pkgVersion>
+             
<servicemix.osgi.source.version>7.2.1.1</servicemix.osgi.source.version>
         <servicemix.osgi.import.pkg>
                javax.servlet;resolution:=optional,
                javax.servlet.http;resolution:=optional,
+               jakarta.servlet;resolution:=optional,
+               jakarta.servlet.http;resolution:=optional,
                ca.uhn.fhir.context;version="[7,8)",
                ca.uhn.fhir.context.api;version="[7,8)",
                ca.uhn.fhir.context.support;version="[7,8)",
diff --git 
a/hapi-fhir-structures-dstu2.1-7.0.0/src/main/resources/OSGI-INF/bundle.info 
b/hapi-fhir-structures-dstu2.1-7.2.1/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from 
hapi-fhir-structures-dstu2.1-7.0.0/src/main/resources/OSGI-INF/bundle.info
rename to 
hapi-fhir-structures-dstu2.1-7.2.1/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-dstu3-7.0.0/pom.xml 
b/hapi-fhir-structures-dstu3-7.2.1/pom.xml
similarity index 95%
rename from hapi-fhir-structures-dstu3-7.0.0/pom.xml
rename to hapi-fhir-structures-dstu3-7.2.1/pom.xml
index ffc2dcb9c..8059f63dd 100644
--- a/hapi-fhir-structures-dstu3-7.0.0/pom.xml
+++ b/hapi-fhir-structures-dstu3-7.2.1/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu3</artifactId>
-    <version>7.0.0_2-SNAPSHOT</version>
+    <version>7.2.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar 
file.</description>
@@ -39,14 +39,13 @@
         
<connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>ca.uhn.hapi.fhir</pkgGroupId>
         <pkgArtifactId>hapi-fhir-structures-dstu3</pkgArtifactId>
-        <pkgVersion>7.0.0</pkgVersion>
-             
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
+        <pkgVersion>7.2.1</pkgVersion>
+             
<servicemix.osgi.source.version>7.2.1.1</servicemix.osgi.source.version>
         <servicemix.osgi.import.pkg>
                ca.uhn.fhir.context;version="[7,8)",
                ca.uhn.fhir.context.api;version="[7,8)",
@@ -69,8 +68,10 @@
                com.github.benmanes.caffeine.cache;resolution:=optional,
                com.google.gson;version="[2.8,3)",
                com.google.gson.stream;version="[2.8,3)",
-               javax.servlet;resolution:=optional;version="[3,5)",
-               javax.servlet.http;resolution:=optional;version="[3,5)",
+               javax.servlet;resolution:=optional;version="[3,6)",
+               javax.servlet.http;resolution:=optional;version="[3,6)",
+               jakarta.servlet;resolution:=optional;version="[3,6)",
+               jakarta.servlet.http;resolution:=optional;version="[3,6)",
                javax.xml.parsers,
                javax.xml.transform,
                javax.xml.transform.dom,
diff --git 
a/hapi-fhir-structures-dstu3-7.0.0/src/main/resources/OSGI-INF/bundle.info 
b/hapi-fhir-structures-dstu3-7.2.1/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from 
hapi-fhir-structures-dstu3-7.0.0/src/main/resources/OSGI-INF/bundle.info
rename to 
hapi-fhir-structures-dstu3-7.2.1/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-hl7org-dstu2-7.0.0/pom.xml 
b/hapi-fhir-structures-hl7org-dstu2-7.2.1/pom.xml
similarity index 96%
rename from hapi-fhir-structures-hl7org-dstu2-7.0.0/pom.xml
rename to hapi-fhir-structures-hl7org-dstu2-7.2.1/pom.xml
index d79e6dbd7..da638089c 100644
--- a/hapi-fhir-structures-hl7org-dstu2-7.0.0/pom.xml
+++ b/hapi-fhir-structures-hl7org-dstu2-7.2.1/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-hl7org-dstu2</artifactId>
-    <version>7.0.0_2-SNAPSHOT</version>
+    <version>7.2.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar 
file.</description>
@@ -39,17 +39,18 @@
         
<connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>ca.uhn.hapi.fhir</pkgGroupId>
         <pkgArtifactId>hapi-fhir-structures-hl7org-dstu2</pkgArtifactId>
-        <pkgVersion>7.0.0</pkgVersion>
-             
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
+        <pkgVersion>7.2.1</pkgVersion>
+             
<servicemix.osgi.source.version>7.2.1.1</servicemix.osgi.source.version>
         <servicemix.osgi.import.pkg>
                javax.servlet;resolution:=optional,
                javax.servlet.http;resolution:=optional,
+               jakarta.servlet;resolution:=optional,
+               jakarta.servlet.http;resolution:=optional,
                ca.uhn.fhir.context;version="[7,8)",
                ca.uhn.fhir.context.api;version="[7,8)",
                ca.uhn.fhir.context.support;version="[7,8)",
diff --git 
a/hapi-fhir-structures-hl7org-dstu2-7.0.0/src/main/resources/OSGI-INF/bundle.info
 
b/hapi-fhir-structures-hl7org-dstu2-7.2.1/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from 
hapi-fhir-structures-hl7org-dstu2-7.0.0/src/main/resources/OSGI-INF/bundle.info
rename to 
hapi-fhir-structures-hl7org-dstu2-7.2.1/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-r4-7.0.0/pom.xml 
b/hapi-fhir-structures-r4-7.2.1/pom.xml
similarity index 95%
rename from hapi-fhir-structures-r4-7.0.0/pom.xml
rename to hapi-fhir-structures-r4-7.2.1/pom.xml
index d5221ab3a..e93a6b396 100644
--- a/hapi-fhir-structures-r4-7.0.0/pom.xml
+++ b/hapi-fhir-structures-r4-7.2.1/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-r4</artifactId>
-    <version>7.0.0_2-SNAPSHOT</version>
+    <version>7.2.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar 
file.</description>
@@ -39,14 +39,13 @@
         
<connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>ca.uhn.hapi.fhir</pkgGroupId>
         <pkgArtifactId>hapi-fhir-structures-r4</pkgArtifactId>
-        <pkgVersion>7.0.0</pkgVersion>
-             
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
+        <pkgVersion>7.2.1</pkgVersion>
+             
<servicemix.osgi.source.version>7.2.1.1</servicemix.osgi.source.version>
         <servicemix.osgi.import.pkg>
                ca.uhn.fhir.context;version="[7,8)",
                ca.uhn.fhir.context.api;version="[7,8)",
@@ -69,8 +68,10 @@
                com.github.benmanes.caffeine.cache;resolution:=optional,
                com.google.gson;version="[2.8,3)",
                com.google.gson.stream;version="[2.8,3)",
-               javax.servlet;resolution:=optional;version="[3,5)",
-               javax.servlet.http;resolution:=optional;version="[3,5)",
+               javax.servlet;resolution:=optional;version="[3,6)",
+               javax.servlet.http;resolution:=optional;version="[3,6)",
+               jakarta.servlet;resolution:=optional;version="[3,6)",
+               jakarta.servlet.http;resolution:=optional;version="[3,6)",
                javax.xml.crypto.dsig,
                javax.xml.crypto.dsig.dom,
                javax.xml.crypto.dsig.keyinfo,
diff --git 
a/hapi-fhir-structures-r4-7.0.0/src/main/resources/OSGI-INF/bundle.info 
b/hapi-fhir-structures-r4-7.2.1/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from 
hapi-fhir-structures-r4-7.0.0/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-structures-r4-7.2.1/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-validation-7.0.0/pom.xml 
b/hapi-fhir-validation-7.2.1/pom.xml
similarity index 97%
rename from hapi-fhir-validation-7.0.0/pom.xml
rename to hapi-fhir-validation-7.2.1/pom.xml
index d09b86ba0..aeba0ae7e 100644
--- a/hapi-fhir-validation-7.0.0/pom.xml
+++ b/hapi-fhir-validation-7.2.1/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.hapi-fhir-validation</artifactId>
-    <version>7.0.0_2-SNAPSHOT</version>
+    <version>7.2.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar 
file.</description>
@@ -39,14 +39,13 @@
         
<connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>ca.uhn.hapi.fhir</pkgGroupId>
         <pkgArtifactId>hapi-fhir-validation</pkgArtifactId>
-        <pkgVersion>7.0.0</pkgVersion>
-             
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
+        <pkgVersion>7.2.1</pkgVersion>
+             
<servicemix.osgi.source.version>7.2.1.1</servicemix.osgi.source.version>
         <servicemix.osgi.import.pkg>
                ca.uhn.fhir.context;version="[7,8)",
                ca.uhn.fhir.context.support;version="[7,8)",
diff --git a/hapi-fhir-validation-7.0.0/src/main/resources/OSGI-INF/bundle.info 
b/hapi-fhir-validation-7.2.1/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from hapi-fhir-validation-7.0.0/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-validation-7.2.1/src/main/resources/OSGI-INF/bundle.info
diff --git a/pom.xml b/pom.xml
index c070748fd..065e4bd05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,12 @@
       <module>mustache-compiler-0.9.14</module>
       <module>jruby-9.4.8.0</module>
       <module>solr-solrj-9.6.1</module>
+      <module>hapi-fhir-structures-dstu2-7.2.1</module>
+      <module>hapi-fhir-structures-dstu2.1-7.2.1</module>
+      <module>hapi-fhir-structures-dstu3-7.2.1</module>
+      <module>hapi-fhir-structures-hl7org-dstu2-7.2.1</module>
+      <module>hapi-fhir-structures-r4-7.2.1</module>
+      <module>hapi-fhir-validation-7.2.1</module>
     </modules>
 
 </project>

Reply via email to