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 cb2e2ba11 SM-5675: Create OSGi bundles for hapi-fhir 7.0.0
cb2e2ba11 is described below
commit cb2e2ba11eda9999e16a46afbc89811af5915c33
Author: JB Onofré <[email protected]>
AuthorDate: Wed Feb 21 11:31:07 2024 +0100
SM-5675: Create OSGi bundles for hapi-fhir 7.0.0
---
.../pom.xml | 41 ++++++------
.../src/main/resources/OSGI-INF/bundle.info | 0
.../pom.xml | 53 ++++++++--------
.../src/main/resources/OSGI-INF/bundle.info | 0
.../pom.xml | 51 ++++++++-------
.../src/main/resources/OSGI-INF/bundle.info | 0
.../pom.xml | 49 +++++++--------
.../src/main/resources/OSGI-INF/bundle.info | 0
.../pom.xml | 53 ++++++++--------
.../src/main/resources/OSGI-INF/bundle.info | 0
.../pom.xml | 73 +++++++++++-----------
.../src/main/resources/OSGI-INF/bundle.info | 0
pom.xml | 6 ++
13 files changed, 163 insertions(+), 163 deletions(-)
diff --git a/hapi-fhir-structures-dstu2-6.8.5/pom.xml
b/hapi-fhir-structures-dstu2-7.0.0/pom.xml
similarity index 84%
rename from hapi-fhir-structures-dstu2-6.8.5/pom.xml
rename to hapi-fhir-structures-dstu2-7.0.0/pom.xml
index 206a3d9ae..894621a07 100644
--- a/hapi-fhir-structures-dstu2-6.8.5/pom.xml
+++ b/hapi-fhir-structures-dstu2-7.0.0/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2</artifactId>
- <version>6.8.5_2-SNAPSHOT</version>
+ <version>7.0.0_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar
file.</description>
@@ -39,40 +39,39 @@
<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>6.8.5</pkgVersion>
-
<servicemix.osgi.source.version>6.8.5.1</servicemix.osgi.source.version>
+ <pkgVersion>7.0.0</pkgVersion>
+
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
javax.servlet;resolution:=optional;version="[3,5)",
javax.servlet.http;resolution:=optional;version="[3,5)",
- ca.uhn.fhir.context;version="[6,7)",
- ca.uhn.fhir.context.api;version="[6,7)",
- ca.uhn.fhir.context.support;version="[6,7)",
- ca.uhn.fhir.fluentpath;version="[6,7)",
- ca.uhn.fhir.model.api;version="[6,7)",
- ca.uhn.fhir.model.api.annotation;version="[6,7)",
- ca.uhn.fhir.model.base.composite;version="[6,7)",
- ca.uhn.fhir.model.base.resource;version="[6,7)",
- ca.uhn.fhir.model.primitive;version="[6,7)",
- ca.uhn.fhir.model.valueset;version="[6,7)",
- ca.uhn.fhir.parser;version="[6,7)",
- ca.uhn.fhir.rest.annotation;version="[6,7)",
- ca.uhn.fhir.rest.api;version="[6,7)",
- ca.uhn.fhir.rest.api.server;version="[6,7)",
- ca.uhn.fhir.rest.gclient;version="[6,7)",
+ ca.uhn.fhir.context;version="[7,8)",
+ ca.uhn.fhir.context.api;version="[7,8)",
+ ca.uhn.fhir.context.support;version="[7,8)",
+ ca.uhn.fhir.fluentpath;version="[7,8)",
+ ca.uhn.fhir.model.api;version="[7,8)",
+ ca.uhn.fhir.model.api.annotation;version="[7,8)",
+ ca.uhn.fhir.model.base.composite;version="[7,8)",
+ ca.uhn.fhir.model.base.resource;version="[7,8)",
+ ca.uhn.fhir.model.primitive;version="[7,8)",
+ ca.uhn.fhir.model.valueset;version="[7,8)",
+ ca.uhn.fhir.parser;version="[7,8)",
+ ca.uhn.fhir.rest.annotation;version="[7,8)",
+ ca.uhn.fhir.rest.api;version="[7,8)",
+ ca.uhn.fhir.rest.api.server;version="[7,8)",
+ ca.uhn.fhir.rest.gclient;version="[7,8)",
ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ ca.uhn.fhir.rest.server.exceptions;version="[7,8)",
ca.uhn.fhir.rest.server.method;resolution:=optional,
ca.uhn.fhir.rest.server.servlet;resolution:=optional,
ca.uhn.fhir.util;version="[6,7)",
org.apache.commons.lang3;version="[3.8,4)",
org.apache.commons.lang3.builder;version="[3.8,4)",
- org.hl7.fhir.instance.model.api;version="[6,7)"
+ org.hl7.fhir.instance.model.api;version="[7,8)"
</servicemix.osgi.import.pkg>
<servicemix.osgi.export>
ca.uhn.fhir.model.dstu2;version="${pkgVersion}";-split-package:=merge-first,
diff --git
a/hapi-fhir-structures-dstu2-6.8.5/src/main/resources/OSGI-INF/bundle.info
b/hapi-fhir-structures-dstu2-7.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from
hapi-fhir-structures-dstu2-6.8.5/src/main/resources/OSGI-INF/bundle.info
rename to
hapi-fhir-structures-dstu2-7.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-dstu2.1-6.8.5/pom.xml
b/hapi-fhir-structures-dstu2.1-7.0.0/pom.xml
similarity index 83%
rename from hapi-fhir-structures-dstu2.1-6.8.5/pom.xml
rename to hapi-fhir-structures-dstu2.1-7.0.0/pom.xml
index cc08d7ae8..98d886035 100644
--- a/hapi-fhir-structures-dstu2.1-6.8.5/pom.xml
+++ b/hapi-fhir-structures-dstu2.1-7.0.0/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2.1</artifactId>
- <version>6.8.5_2-SNAPSHOT</version>
+ <version>7.0.0_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar
file.</description>
@@ -39,36 +39,35 @@
<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>6.8.5</pkgVersion>
-
<servicemix.osgi.source.version>6.8.5.1</servicemix.osgi.source.version>
+ <pkgVersion>7.0.0</pkgVersion>
+
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
javax.servlet;resolution:=optional,
javax.servlet.http;resolution:=optional,
- ca.uhn.fhir.context;version="[6,7)",
- ca.uhn.fhir.context.api;version="[6,7)",
- ca.uhn.fhir.context.support;version="[6,7)",
- ca.uhn.fhir.fluentpath;version="[6,7)",
- ca.uhn.fhir.model.api;version="[6,7)",
- ca.uhn.fhir.model.api.annotation;version="[6,7)",
- ca.uhn.fhir.model.primitive;version="[6,7)",
- ca.uhn.fhir.model.valueset;version="[6,7)",
- ca.uhn.fhir.parser;version="[6,7)",
- ca.uhn.fhir.rest.annotation;version="[6,7)",
- ca.uhn.fhir.rest.api;version="[6,7)",
- ca.uhn.fhir.rest.api.server;version="[6,7)",
- ca.uhn.fhir.rest.gclient;version="[6,7)",
+ ca.uhn.fhir.context;version="[7,8)",
+ ca.uhn.fhir.context.api;version="[7,8)",
+ ca.uhn.fhir.context.support;version="[7,8)",
+ ca.uhn.fhir.fluentpath;version="[7,8)",
+ ca.uhn.fhir.model.api;version="[7,8)",
+ ca.uhn.fhir.model.api.annotation;version="[7,8)",
+ ca.uhn.fhir.model.primitive;version="[7,8)",
+ ca.uhn.fhir.model.valueset;version="[7,8)",
+ ca.uhn.fhir.parser;version="[7,8)",
+ ca.uhn.fhir.rest.annotation;version="[7,8)",
+ ca.uhn.fhir.rest.api;version="[7,8)",
+ ca.uhn.fhir.rest.api.server;version="[7,8)",
+ ca.uhn.fhir.rest.gclient;version="[7,8)",
ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ ca.uhn.fhir.rest.server.exceptions;version="[7,8)",
ca.uhn.fhir.rest.server.method;resolution:=optional,
ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[6,7)",
- ca.uhn.fhir.validation;version="[6,7)",
+ ca.uhn.fhir.util;version="[7,8)",
+ ca.uhn.fhir.validation;version="[7,8)",
com.google.gson;version="[2.8,3)",
com.google.gson.stream;version="[2.8,3)",
javax.xml.parsers,
@@ -80,13 +79,13 @@
org.apache.commons.lang3;version="[3.8,4)",
org.apache.commons.lang3.builder;version="[3.8,4)",
org.apache.commons.lang3.time;version="[3.8,4)",
- org.hl7.fhir.exceptions;version="[6,7)",
- org.hl7.fhir.instance.model.api;version="[6,7)",
- org.hl7.fhir.utilities;version="[6,7)",
- org.hl7.fhir.utilities.ucum;version="[6,7)",
- org.hl7.fhir.utilities.validation;version="[6,7)",
- org.hl7.fhir.utilities.xhtml;version="[6,7)",
- org.hl7.fhir.utilities.xml;version="[6,7)",
+ org.hl7.fhir.exceptions;version="[7,8)",
+ org.hl7.fhir.instance.model.api;version="[7,8)",
+ org.hl7.fhir.utilities;version="[7,8)",
+ org.hl7.fhir.utilities.ucum;version="[7,8)",
+ org.hl7.fhir.utilities.validation;version="[7,8)",
+ org.hl7.fhir.utilities.xhtml;version="[7,8)",
+ org.hl7.fhir.utilities.xml;version="[7,8)",
org.slf4j;version="[1.7,2)",
org.w3c.dom,
org.w3c.dom.events,
diff --git
a/hapi-fhir-structures-dstu2.1-6.8.5/src/main/resources/OSGI-INF/bundle.info
b/hapi-fhir-structures-dstu2.1-7.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from
hapi-fhir-structures-dstu2.1-6.8.5/src/main/resources/OSGI-INF/bundle.info
rename to
hapi-fhir-structures-dstu2.1-7.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-dstu3-6.8.5/pom.xml
b/hapi-fhir-structures-dstu3-7.0.0/pom.xml
similarity index 84%
rename from hapi-fhir-structures-dstu3-6.8.5/pom.xml
rename to hapi-fhir-structures-dstu3-7.0.0/pom.xml
index f3fa74ac0..93a02776d 100644
--- a/hapi-fhir-structures-dstu3-6.8.5/pom.xml
+++ b/hapi-fhir-structures-dstu3-7.0.0/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu3</artifactId>
- <version>6.8.5_2-SNAPSHOT</version>
+ <version>7.0.0_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar
file.</description>
@@ -39,33 +39,32 @@
<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>6.8.5</pkgVersion>
-
<servicemix.osgi.source.version>6.8.5.1</servicemix.osgi.source.version>
+ <pkgVersion>7.0.0</pkgVersion>
+
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
- ca.uhn.fhir.context;version="[6,7)",
- ca.uhn.fhir.context.api;version="[6,7)",
- ca.uhn.fhir.context.support;version="[6,7)",
- ca.uhn.fhir.fluentpath;version="[6,7)",
- ca.uhn.fhir.model.api;version="[6,7)",
- ca.uhn.fhir.model.api.annotation;version="[6,7)",
- ca.uhn.fhir.model.primitive;version="[6,7)",
- ca.uhn.fhir.model.valueset;version="[6,7)",
- ca.uhn.fhir.parser;version="[6,7)",
- ca.uhn.fhir.rest.annotation;version="[6,7)",
- ca.uhn.fhir.rest.api;version="[6,7)",
- ca.uhn.fhir.rest.api.server;version="[6,7)",
- ca.uhn.fhir.rest.gclient;version="[6,7)",
+ ca.uhn.fhir.context;version="[7,8)",
+ ca.uhn.fhir.context.api;version="[7,8)",
+ ca.uhn.fhir.context.support;version="[7,8)",
+ ca.uhn.fhir.fluentpath;version="[7,8)",
+ ca.uhn.fhir.model.api;version="[7,8)",
+ ca.uhn.fhir.model.api.annotation;version="[7,8)",
+ ca.uhn.fhir.model.primitive;version="[7,8)",
+ ca.uhn.fhir.model.valueset;version="[7,8)",
+ ca.uhn.fhir.parser;version="[7,8)",
+ ca.uhn.fhir.rest.annotation;version="[7,8)",
+ ca.uhn.fhir.rest.api;version="[7,8)",
+ ca.uhn.fhir.rest.api.server;version="[7,8)",
+ ca.uhn.fhir.rest.gclient;version="[7,8)",
ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ ca.uhn.fhir.rest.server.exceptions;version="[7,8)",
ca.uhn.fhir.rest.server.method;resolution:=optional,
ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[6,7)",
+ ca.uhn.fhir.util;version="[7,8)",
com.github.benmanes.caffeine.cache;resolution:=optional,
com.google.gson;version="[2.8,3)",
com.google.gson.stream;version="[2.8,3)",
@@ -80,13 +79,13 @@
org.apache.commons.lang3;version="[3.8,4)",
org.apache.commons.lang3.builder;version="[3.8,4)",
org.apache.commons.lang3.time;version="[3.8,4)",
- org.hl7.fhir.exceptions;version="[6,7)",
- org.hl7.fhir.instance.model.api;version="[6,7)",
- org.hl7.fhir.utilities;version="[6,7)",
- org.hl7.fhir.utilities.ucum;version="[6,7)",
- org.hl7.fhir.utilities.validation;version="[6,7)",
- org.hl7.fhir.utilities.xhtml;version="[6,7)",
- org.hl7.fhir.utilities.xml;version="[6,7)",
+ org.hl7.fhir.exceptions;version="[7,8)",
+ org.hl7.fhir.instance.model.api;version="[7,8)",
+ org.hl7.fhir.utilities;version="[7,8)",
+ org.hl7.fhir.utilities.ucum;version="[7,8)",
+ org.hl7.fhir.utilities.validation;version="[7,8)",
+ org.hl7.fhir.utilities.xhtml;version="[7,8)",
+ org.hl7.fhir.utilities.xml;version="[7,8)",
org.slf4j;version="[1.7,2)",
org.w3c.dom,
org.w3c.dom.events,
diff --git
a/hapi-fhir-structures-dstu3-6.8.5/src/main/resources/OSGI-INF/bundle.info
b/hapi-fhir-structures-dstu3-7.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from
hapi-fhir-structures-dstu3-6.8.5/src/main/resources/OSGI-INF/bundle.info
rename to
hapi-fhir-structures-dstu3-7.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-hl7org-dstu2-6.8.5/pom.xml
b/hapi-fhir-structures-hl7org-dstu2-7.0.0/pom.xml
similarity index 84%
rename from hapi-fhir-structures-hl7org-dstu2-6.8.5/pom.xml
rename to hapi-fhir-structures-hl7org-dstu2-7.0.0/pom.xml
index dfb58e2fa..b075f2006 100644
--- a/hapi-fhir-structures-hl7org-dstu2-6.8.5/pom.xml
+++ b/hapi-fhir-structures-hl7org-dstu2-7.0.0/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-hl7org-dstu2</artifactId>
- <version>6.8.5_2-SNAPSHOT</version>
+ <version>7.0.0_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar
file.</description>
@@ -39,34 +39,33 @@
<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>6.8.5</pkgVersion>
-
<servicemix.osgi.source.version>6.8.5.1</servicemix.osgi.source.version>
+ <pkgVersion>7.0.0</pkgVersion>
+
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
javax.servlet;resolution:=optional,
javax.servlet.http;resolution:=optional,
- ca.uhn.fhir.context;version="[6,7)",
- ca.uhn.fhir.context.api;version="[6,7)",
- ca.uhn.fhir.context.support;version="[6,7)",
- ca.uhn.fhir.fluentpath;version="[6,7)",
- ca.uhn.fhir.model.api;version="[6,7)",
- ca.uhn.fhir.model.api.annotation;version="[6,7)",
- ca.uhn.fhir.model.base.composite;version="[6,7)",
- ca.uhn.fhir.model.valueset;version="[6,7)",
- ca.uhn.fhir.parser;version="[6,7)",
- ca.uhn.fhir.rest.annotation;version="[6,7)",
- ca.uhn.fhir.rest.api;version="[6,7)",
- ca.uhn.fhir.rest.api.server;version="[6,7)",
+ ca.uhn.fhir.context;version="[7,8)",
+ ca.uhn.fhir.context.api;version="[7,8)",
+ ca.uhn.fhir.context.support;version="[7,8)",
+ ca.uhn.fhir.fluentpath;version="[7,8)",
+ ca.uhn.fhir.model.api;version="[7,8)",
+ ca.uhn.fhir.model.api.annotation;version="[7,8)",
+ ca.uhn.fhir.model.base.composite;version="[7,8)",
+ ca.uhn.fhir.model.valueset;version="[7,8)",
+ ca.uhn.fhir.parser;version="[7,8)",
+ ca.uhn.fhir.rest.annotation;version="[7,8)",
+ ca.uhn.fhir.rest.api;version="[7,8)",
+ ca.uhn.fhir.rest.api.server;version="[7,8)",
ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ ca.uhn.fhir.rest.server.exceptions;version="[7,8)",
ca.uhn.fhir.rest.server.method;resolution:=optional,
ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[6,7)",
+ ca.uhn.fhir.util;version="[7,8)",
com.google.gson;version="[2.8,3)",
javax.sound.sampled,
javax.xml.parsers,
@@ -78,13 +77,13 @@
org.apache.commons.lang3;version="[3.8,4)",
org.apache.commons.lang3.builder;version="[3.8,4)",
org.apache.commons.lang3.time;version="[3.8,4)",
- org.hl7.fhir.exceptions;version="[6,7)",
- org.hl7.fhir.instance.model.api;version="[6,7)",
- org.hl7.fhir.utilities;version="[6,7)",
- org.hl7.fhir.utilities.ucum;version="[6,7)",
- org.hl7.fhir.utilities.validation;version="[6,7)",
- org.hl7.fhir.utilities.xhtml;version="[6,7)",
- org.hl7.fhir.utilities.xml;version="[6,7)",
+ org.hl7.fhir.exceptions;version="[7,8)",
+ org.hl7.fhir.instance.model.api;version="[7,8)",
+ org.hl7.fhir.utilities;version="[7,8)",
+ org.hl7.fhir.utilities.ucum;version="[7,8)",
+ org.hl7.fhir.utilities.validation;version="[7,8)",
+ org.hl7.fhir.utilities.xhtml;version="[7,8)",
+ org.hl7.fhir.utilities.xml;version="[7,8)",
org.w3c.dom,
org.w3c.dom.ls
</servicemix.osgi.import.pkg>
diff --git
a/hapi-fhir-structures-hl7org-dstu2-6.8.5/src/main/resources/OSGI-INF/bundle.info
b/hapi-fhir-structures-hl7org-dstu2-7.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from
hapi-fhir-structures-hl7org-dstu2-6.8.5/src/main/resources/OSGI-INF/bundle.info
rename to
hapi-fhir-structures-hl7org-dstu2-7.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-r4-6.8.5/pom.xml
b/hapi-fhir-structures-r4-7.0.0/pom.xml
similarity index 85%
rename from hapi-fhir-structures-r4-6.8.5/pom.xml
rename to hapi-fhir-structures-r4-7.0.0/pom.xml
index 05ea42592..5cc22bda8 100644
--- a/hapi-fhir-structures-r4-6.8.5/pom.xml
+++ b/hapi-fhir-structures-r4-7.0.0/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-r4</artifactId>
- <version>6.8.5_2-SNAPSHOT</version>
+ <version>7.0.0_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar
file.</description>
@@ -39,33 +39,32 @@
<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>6.8.5</pkgVersion>
-
<servicemix.osgi.source.version>6.8.5.1</servicemix.osgi.source.version>
+ <pkgVersion>7.0.0</pkgVersion>
+
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
- ca.uhn.fhir.context;version="[6,7)",
- ca.uhn.fhir.context.api;version="[6,7)",
- ca.uhn.fhir.context.support;version="[6,7)",
- ca.uhn.fhir.fluentpath;version="[6,7)",
- ca.uhn.fhir.model.api;version="[6,7)",
- ca.uhn.fhir.model.api.annotation;version="[6,7)",
- ca.uhn.fhir.model.primitive;version="[6,7)",
- ca.uhn.fhir.model.valueset;version="[6,7)",
- ca.uhn.fhir.parser;version="[6,7)",
- ca.uhn.fhir.rest.annotation;version="[6,7)",
- ca.uhn.fhir.rest.api;version="[6,7)",
- ca.uhn.fhir.rest.api.server;version="[6,7)",
- ca.uhn.fhir.rest.gclient;version="[6,7)",
+ ca.uhn.fhir.context;version="[7,8)",
+ ca.uhn.fhir.context.api;version="[7,8)",
+ ca.uhn.fhir.context.support;version="[7,8)",
+ ca.uhn.fhir.fluentpath;version="[7,8)",
+ ca.uhn.fhir.model.api;version="[7,8)",
+ ca.uhn.fhir.model.api.annotation;version="[7,8)",
+ ca.uhn.fhir.model.primitive;version="[7,8)",
+ ca.uhn.fhir.model.valueset;version="[7,8)",
+ ca.uhn.fhir.parser;version="[7,8)",
+ ca.uhn.fhir.rest.annotation;version="[7,8)",
+ ca.uhn.fhir.rest.api;version="[7,8)",
+ ca.uhn.fhir.rest.api.server;version="[7,8)",
+ ca.uhn.fhir.rest.gclient;version="[7,8)",
ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ ca.uhn.fhir.rest.server.exceptions;version="[7,8)",
ca.uhn.fhir.rest.server.method;resolution:=optional,
ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[6,7)",
+ ca.uhn.fhir.util;version="[7,8)",
com.github.benmanes.caffeine.cache;resolution:=optional,
com.google.gson;version="[2.8,3)",
com.google.gson.stream;version="[2.8,3)",
@@ -94,14 +93,14 @@
org.apache.http.entity;resolution:=optional,
org.apache.http.impl.client;resolution:=optional,
org.apache.http.params;resolution:=optional,
- org.fhir.ucum;version="[6,7)",
- org.hl7.fhir.exceptions;version="[6,7)",
- org.hl7.fhir.instance.model.api;version="[6,7)",
- org.hl7.fhir.utilities;version="[6,7)",
- org.hl7.fhir.utilities.graphql;version="[6,7)",
- org.hl7.fhir.utilities.validation;version="[6,7)",
- org.hl7.fhir.utilities.xhtml;version="[6,7)",
- org.hl7.fhir.utilities.xml;version="[6,7)",
+ org.fhir.ucum;version="[7,8)",
+ org.hl7.fhir.exceptions;version="[7,8)",
+ org.hl7.fhir.instance.model.api;version="[7,8)",
+ org.hl7.fhir.utilities;version="[7,8)",
+ org.hl7.fhir.utilities.graphql;version="[7,8)",
+ org.hl7.fhir.utilities.validation;version="[7,8)",
+ org.hl7.fhir.utilities.xhtml;version="[7,8)",
+ org.hl7.fhir.utilities.xml;version="[7,8)",
org.slf4j;version="[1.7,2)",
org.stringtemplate.v4;resolution:=optional,
org.w3c.dom,
diff --git
a/hapi-fhir-structures-r4-6.8.5/src/main/resources/OSGI-INF/bundle.info
b/hapi-fhir-structures-r4-7.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from
hapi-fhir-structures-r4-6.8.5/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-structures-r4-7.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-validation-6.8.5/pom.xml
b/hapi-fhir-validation-7.0.0/pom.xml
similarity index 74%
rename from hapi-fhir-validation-6.8.5/pom.xml
rename to hapi-fhir-validation-7.0.0/pom.xml
index c830b636a..ec37ffb5a 100644
--- a/hapi-fhir-validation-6.8.5/pom.xml
+++ b/hapi-fhir-validation-7.0.0/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hapi-fhir-validation</artifactId>
- <version>6.8.5_2-SNAPSHOT</version>
+ <version>7.0.0_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar
file.</description>
@@ -39,23 +39,22 @@
<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>6.8.5</pkgVersion>
-
<servicemix.osgi.source.version>6.8.5.1</servicemix.osgi.source.version>
+ <pkgVersion>7.0.0</pkgVersion>
+
<servicemix.osgi.source.version>7.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
- ca.uhn.fhir.context;version="[6,7)",
- ca.uhn.fhir.context.support;version="[6,7)",
- ca.uhn.fhir.model.api;version="[6,7)",
- ca.uhn.fhir.parser;version="[6,7)",
- ca.uhn.fhir.rest.api;version="[6,7)",
- ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
- ca.uhn.fhir.util;version="[6,7)",
- ca.uhn.fhir.validation;version="[6,7)",
+ ca.uhn.fhir.context;version="[7,8)",
+ ca.uhn.fhir.context.support;version="[7,8)",
+ ca.uhn.fhir.model.api;version="[7,8)",
+ ca.uhn.fhir.parser;version="[7,8)",
+ ca.uhn.fhir.rest.api;version="[7,8)",
+ ca.uhn.fhir.rest.server.exceptions;version="[7,8)",
+ ca.uhn.fhir.util;version="[7,8)",
+ ca.uhn.fhir.validation;version="[7,8)",
com.github.benmanes.caffeine.cache,
com.google.gson;version="[2.8,3)",
javax.swing,
@@ -63,31 +62,31 @@
org.apache.commons.io;version="[2,3)",
org.apache.commons.lang3;version="[3.8,4)",
org.apache.commons.lang3.builder;version="[3.8,4)",
- org.fhir.ucum;version="[6,7)",
- org.hl7.fhir.convertors;version="[6,7)",
- org.hl7.fhir.dstu3.context;resolution:=optional;version="[6,7)",
-
org.hl7.fhir.dstu3.hapi.ctx;resolution:=optional;version="[6,7)",
- org.hl7.fhir.dstu3.model;resolution:=optional;version="[6,7)",
-
org.hl7.fhir.dstu3.terminologies;resolution:=optional;version="[6,7)",
- org.hl7.fhir.dstu3.utils;resolution:=optional;version="[6,7)",
- org.hl7.fhir.exceptions;version="[6,7)",
-
org.hl7.fhir.instance.formats;resolution:=optional;version="[6,7)",
-
org.hl7.fhir.instance.model;resolution:=optional;version="[6,7)",
- org.hl7.fhir.instance.model.api;version="[6,7)",
-
org.hl7.fhir.instance.terminologies;resolution:=optional;version="[6,7)",
-
org.hl7.fhir.instance.utils;resolution:=optional;version="[6,7)",
-
org.hl7.fhir.r4.conformance;resolution:=optional;version="[6,7)",
- org.hl7.fhir.r4.context;resolution:=optional;version="[6,7)",
-
org.hl7.fhir.r4.elementmodel;resolution:=optional;version="[6,7)",
- org.hl7.fhir.r4.formats;resolution:=optional;version="[6,7)",
- org.hl7.fhir.r4.hapi.ctx;resolution:=optional;version="[6,7)",
- org.hl7.fhir.r4.model;resolution:=optional;version="[6,7)",
-
org.hl7.fhir.r4.terminologies;resolution:=optional;version="[6,7)",
- org.hl7.fhir.r4.utils;resolution:=optional;version="[6,7)",
- org.hl7.fhir.utilities;version="[6,7)",
- org.hl7.fhir.utilities.validation;version="[6,7)",
- org.hl7.fhir.utilities.xhtml;version="[6,7)",
- org.hl7.fhir.utilities.xml;version="[6,7)",
+ org.fhir.ucum;version="[7,8)",
+ org.hl7.fhir.convertors;version="[7,8)",
+ org.hl7.fhir.dstu3.context;resolution:=optional;version="[7,8)",
+
org.hl7.fhir.dstu3.hapi.ctx;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.dstu3.model;resolution:=optional;version="[7,8)",
+
org.hl7.fhir.dstu3.terminologies;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.dstu3.utils;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.exceptions;version="[7,8)",
+
org.hl7.fhir.instance.formats;resolution:=optional;version="[7,8)",
+
org.hl7.fhir.instance.model;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.instance.model.api;version="[7,8)",
+
org.hl7.fhir.instance.terminologies;resolution:=optional;version="[7,8)",
+
org.hl7.fhir.instance.utils;resolution:=optional;version="[7,8)",
+
org.hl7.fhir.r4.conformance;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.r4.context;resolution:=optional;version="[7,8)",
+
org.hl7.fhir.r4.elementmodel;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.r4.formats;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.r4.hapi.ctx;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.r4.model;resolution:=optional;version="[7,8)",
+
org.hl7.fhir.r4.terminologies;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.r4.utils;resolution:=optional;version="[7,8)",
+ org.hl7.fhir.utilities;version="[7,8)",
+ org.hl7.fhir.utilities.validation;version="[7,8)",
+ org.hl7.fhir.utilities.xhtml;version="[7,8)",
+ org.hl7.fhir.utilities.xml;version="[7,8)",
org.slf4j;version="[1.7,2)",
org.w3c.dom,
org.w3c.dom.events,
diff --git a/hapi-fhir-validation-6.8.5/src/main/resources/OSGI-INF/bundle.info
b/hapi-fhir-validation-7.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from hapi-fhir-validation-6.8.5/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-validation-7.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/pom.xml b/pom.xml
index 69f5189c3..886aa82c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,12 @@
<module>lucene-queryparser-9.9.2</module>
<module>lucene-sandbox-9.9.2</module>
<module>snmp4j-3.7.8</module>
+ <module>hapi-fhir-structures-dstu2-7.0.0</module>
+ <module>hapi-fhir-structures-dstu2.1-7.0.0</module>
+ <module>hapi-fhir-structures-dstu3-7.0.0</module>
+ <module>hapi-fhir-structures-hl7org-dstu2-7.0.0</module>
+ <module>hapi-fhir-structures-r4-7.0.0</module>
+ <module>hapi-fhir-validation-7.0.0</module>
</modules>
</project>
