You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2022/05/31 13:43:10 UTC
[servicemix-bundles] branch master updated: [SM-5147] Create OSGi bundles for FHIR 6.0.0
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 19bbbe9fb [SM-5147] Create OSGi bundles for FHIR 6.0.0
19bbbe9fb is described below
commit 19bbbe9fb14d1264f018c67ef37271c0fae4611d
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue May 31 15:42:38 2022 +0200
[SM-5147] Create OSGi bundles for FHIR 6.0.0
---
.../pom.xml | 116 +++-----
.../src/main/resources/OSGI-INF/bundle.info | 0
hapi-fhir-structures-dstu2.1-5.7.2/pom.xml | 232 ----------------
.../pom.xml | 143 +++++-----
.../src/main/resources/OSGI-INF/bundle.info | 0
hapi-fhir-structures-dstu3-5.7.2/pom.xml | 263 ------------------
.../pom.xml | 147 +++++-----
.../src/main/resources/OSGI-INF/bundle.info | 0
.../pom.xml | 156 ++++-------
.../src/main/resources/OSGI-INF/bundle.info | 0
hapi-fhir-structures-r4-5.7.2/pom.xml | 299 ---------------------
.../pom.xml | 164 +++++------
.../src/main/resources/OSGI-INF/bundle.info | 0
.../pom.xml | 174 ++++--------
.../src/main/resources/OSGI-INF/bundle.info | 0
pom.xml | 6 +
16 files changed, 369 insertions(+), 1331 deletions(-)
diff --git a/hapi-fhir-structures-dstu2-5.7.2/pom.xml b/hapi-fhir-structures-dstu2-6.0.0/pom.xml
similarity index 59%
copy from hapi-fhir-structures-dstu2-5.7.2/pom.xml
copy to hapi-fhir-structures-dstu2-6.0.0/pom.xml
index 1b5a9d57f..3839ba2b1 100644
--- a/hapi-fhir-structures-dstu2-5.7.2/pom.xml
+++ b/hapi-fhir-structures-dstu2-6.0.0/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>14</version>
+ <version>15-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2</artifactId>
- <version>5.7.2_2-SNAPSHOT</version>
+ <version>6.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,91 +39,49 @@
<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>5.7.2</pkgVersion>
+ <pkgVersion>6.0.0</pkgVersion>
+ <servicemix.osgi.source.version>6.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
- javax.servlet;resolution:=optional;version="[3.1,4)",
- javax.servlet.http;resolution:=optional;version="[3.1,4)",
- ca.uhn.fhir.context;version="[5,6)",
- ca.uhn.fhir.context.api;version="[5,6)",
- ca.uhn.fhir.context.support;version="[5,6)",
- ca.uhn.fhir.fluentpath;version="[5,6)",
- ca.uhn.fhir.model.api;version="[5,6)",
- ca.uhn.fhir.model.api.annotation;version="[5,6)",
- ca.uhn.fhir.model.base.composite;version="[5,6)",
- ca.uhn.fhir.model.base.resource;version="[5,6)",
- ca.uhn.fhir.model.primitive;version="[5,6)",
- ca.uhn.fhir.model.valueset;version="[5,6)",
- ca.uhn.fhir.parser;version="[5,6)",
- ca.uhn.fhir.rest.annotation;version="[5,6)",
- ca.uhn.fhir.rest.api;version="[5,6)",
- ca.uhn.fhir.rest.api.server;version="[5,6)",
- ca.uhn.fhir.rest.gclient;version="[5,6)",
- ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[5,6)",
- ca.uhn.fhir.rest.server.method;resolution:=optional,
- ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[5,6)",
- org.apache.commons.lang3;version="[3.8,4)",
- org.apache.commons.lang3.builder;version="[3.8,4)",
- org.hl7.fhir.instance.model.api;version="[5,6)"
+ 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.rest.server;resolution:=optional,
+ ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ 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)"
</servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>
- ca.uhn.fhir.model.dstu2;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.fluentpath,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.api.server,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.provider.dstu2,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.model.dstu2.valueset;uses:=ca.uhn.fhir.model.api;version=5.7.2,
- ca.uhn.fhir.model.dstu2.composite;
- uses:="ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.model.dstu2.valueset,
- ca.uhn.fhir.model.primitive,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.model.dstu2.resource;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.model.base.resource,
- ca.uhn.fhir.model.dstu2.composite,
- ca.uhn.fhir.model.dstu2.valueset,
- ca.uhn.fhir.model.primitive,
- ca.uhn.fhir.rest.gclient,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.rest.server.provider.dstu2;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.api,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.dstu2.resource,
- ca.uhn.fhir.model.primitive,
- ca.uhn.fhir.model.valueset,
- ca.uhn.fhir.rest.annotation,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.servlet,
- javax.servlet.http,
- org.hl7.fhir.instance.model.api";
- version=5.7.2
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ ca.uhn.fhir.model.dstu2;version="${pkgVersion}";-split-package:=merge-first,
+ ca.uhn.fhir.model.dstu2.valueset;version="${pkgVersion}";-split-package:=merge-first,
+ ca.uhn.fhir.model.dstu2.composite;version="${pkgVersion}";-split-package:=merge-first,
+ ca.uhn.fhir.model.dstu2.resource;version="${pkgVersion}";-split-package:=merge-first,
+ ca.uhn.fhir.rest.server.provider.dstu2;version="${pkgVersion}";-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.fragment.host>
- ca.uhn.hapi.fhir.hapi-fhir-base
+ ca.uhn.hapi.fhir.hapi-fhir-base
</servicemix.osgi.fragment.host>
</properties>
diff --git a/hapi-fhir-structures-dstu2-5.7.2/src/main/resources/OSGI-INF/bundle.info b/hapi-fhir-structures-dstu2-6.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from hapi-fhir-structures-dstu2-5.7.2/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-structures-dstu2-6.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-dstu2.1-5.7.2/pom.xml b/hapi-fhir-structures-dstu2.1-5.7.2/pom.xml
deleted file mode 100644
index 53db895a6..000000000
--- a/hapi-fhir-structures-dstu2.1-5.7.2/pom.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>14</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2.1</artifactId>
- <version>5.7.2_2-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
- <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
- <scm>
- <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>5.7.2</pkgVersion>
- <servicemix.osgi.import.pkg>
- javax.servlet;resolution:=optional,
- javax.servlet.http;resolution:=optional,
- ca.uhn.fhir.context;version="[5,6)",
- ca.uhn.fhir.context.api;version="[5,6)",
- ca.uhn.fhir.context.support;version="[5,6)",
- ca.uhn.fhir.fluentpath;version="[5,6)",
- ca.uhn.fhir.model.api;version="[5,6)",
- ca.uhn.fhir.model.api.annotation;version="[5,6)",
- ca.uhn.fhir.model.primitive;version="[5,6)",
- ca.uhn.fhir.model.valueset;version="[5,6)",
- ca.uhn.fhir.parser;version="[5,6)",
- ca.uhn.fhir.rest.annotation;version="[5,6)",
- ca.uhn.fhir.rest.api;version="[5,6)",
- ca.uhn.fhir.rest.api.server;version="[5,6)",
- ca.uhn.fhir.rest.gclient;version="[5,6)",
- ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[5,6)",
- ca.uhn.fhir.rest.server.method;resolution:=optional,
- ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[5,6)",
- ca.uhn.fhir.validation;version="[5,6)",
- com.google.gson;version="[2.8,3)",
- com.google.gson.stream;version="[2.8,3)",
- javax.xml.parsers,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- org.apache.commons.codec.binary;version="[1.11,2)",
- org.apache.commons.io;version="[1.4,2)",
- 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="[5,6)",
- org.hl7.fhir.instance.model.api;version="[5,6)",
- org.hl7.fhir.utilities;version="[5,6)",
- org.hl7.fhir.utilities.ucum;version="[5,6)",
- org.hl7.fhir.utilities.validation;version="[5,6)",
- org.hl7.fhir.utilities.xhtml;version="[5,6)",
- org.hl7.fhir.utilities.xml;version="[5,6)",
- org.slf4j;version="[1.7,2)",
- org.w3c.dom,
- org.w3c.dom.events,
- org.xml.sax,
- org.xml.sax.helpers
- </servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>
- org.hl7.fhir.dstu2016may.terminologies;uses:="org.hl7.fhir.dstu2016may.model,org.hl7.fhir.dstu2016may.utils";version=5.7.2,
- org.hl7.fhir.dstu2016may.formats;uses:="org.hl7.fhir.dstu2016may.model,org.hl7.fhir.exceptions";version=5.7.2,
- org.hl7.fhir.dstu2016may.hapi.ctx;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.fluentpath,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.api.server,
- ca.uhn.fhir.rest.server,
- org.hl7.fhir.dstu2016may.hapi.rest.server,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- org.hl7.fhir.dstu2016may.hapi.rest.server;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.api,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.valueset,
- ca.uhn.fhir.rest.annotation,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.servlet,
- javax.servlet.http,
- org.hl7.fhir.dstu2016may.model,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- org.hl7.fhir.dstu2016may.hapi.validation;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.validation,
- org.hl7.fhir.dstu2016may.formats,
- org.hl7.fhir.dstu2016may.model,
- org.hl7.fhir.dstu2016may.terminologies,
- org.hl7.fhir.dstu2016may.utils,
- org.hl7.fhir.dstu2016may.validation,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.utilities.validation";
- version=5.7.2,
- org.hl7.fhir.dstu2016may.utils;
- uses:="com.google.gson,
- org.hl7.fhir.dstu2016may.formats,
- org.hl7.fhir.dstu2016may.model,
- org.hl7.fhir.dstu2016may.terminologies,
- org.hl7.fhir.dstu2016may.validation,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.utilities.validation,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.helpers";
- version=5.7.2,
- org.hl7.fhir.dstu2016may.metamodel;
- uses:="com.google.gson,
- org.hl7.fhir.dstu2016may.formats,
- org.hl7.fhir.dstu2016may.model,
- org.hl7.fhir.dstu2016may.utils,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.utilities.validation,
- org.hl7.fhir.utilities.xhtml,
- org.w3c.dom";
- version=5.7.2,
- org.hl7.fhir.dstu2016may.model;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.parser,
- ca.uhn.fhir.rest.gclient,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.utilities.xhtml";
- version=5.7.2,
- org.hl7.fhir.dstu2016may.validation;
- uses:="com.google.gson,
- org.hl7.fhir.dstu2016may.metamodel,
- org.hl7.fhir.dstu2016may.model,
- org.hl7.fhir.dstu2016may.utils,
- org.hl7.fhir.utilities.validation,
- org.w3c.dom";
- version=5.7.2
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.fragment.host>
- ca.uhn.hapi.fhir.hapi-fhir-base
- </servicemix.osgi.fragment.host>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <optional>true</optional>
- </dependency>
-
- <!-- sources -->
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <classifier>sources</classifier>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${pkgGroupId}:${pkgArtifactId}</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
- </filters>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/hapi-fhir-structures-dstu2-5.7.2/pom.xml b/hapi-fhir-structures-dstu2.1-6.0.0/pom.xml
similarity index 58%
copy from hapi-fhir-structures-dstu2-5.7.2/pom.xml
copy to hapi-fhir-structures-dstu2.1-6.0.0/pom.xml
index 1b5a9d57f..d95b3fb4f 100644
--- a/hapi-fhir-structures-dstu2-5.7.2/pom.xml
+++ b/hapi-fhir-structures-dstu2.1-6.0.0/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>14</version>
+ <version>15-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2</artifactId>
- <version>5.7.2_2-SNAPSHOT</version>
+ <artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2.1</artifactId>
+ <version>6.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,91 +39,72 @@
<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>5.7.2</pkgVersion>
+ <pkgArtifactId>hapi-fhir-structures-dstu2.1</pkgArtifactId>
+ <pkgVersion>6.0.0</pkgVersion>
+ <servicemix.osgi.source.version>6.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
- javax.servlet;resolution:=optional;version="[3.1,4)",
- javax.servlet.http;resolution:=optional;version="[3.1,4)",
- ca.uhn.fhir.context;version="[5,6)",
- ca.uhn.fhir.context.api;version="[5,6)",
- ca.uhn.fhir.context.support;version="[5,6)",
- ca.uhn.fhir.fluentpath;version="[5,6)",
- ca.uhn.fhir.model.api;version="[5,6)",
- ca.uhn.fhir.model.api.annotation;version="[5,6)",
- ca.uhn.fhir.model.base.composite;version="[5,6)",
- ca.uhn.fhir.model.base.resource;version="[5,6)",
- ca.uhn.fhir.model.primitive;version="[5,6)",
- ca.uhn.fhir.model.valueset;version="[5,6)",
- ca.uhn.fhir.parser;version="[5,6)",
- ca.uhn.fhir.rest.annotation;version="[5,6)",
- ca.uhn.fhir.rest.api;version="[5,6)",
- ca.uhn.fhir.rest.api.server;version="[5,6)",
- ca.uhn.fhir.rest.gclient;version="[5,6)",
- ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[5,6)",
- ca.uhn.fhir.rest.server.method;resolution:=optional,
- ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[5,6)",
- org.apache.commons.lang3;version="[3.8,4)",
- org.apache.commons.lang3.builder;version="[3.8,4)",
- org.hl7.fhir.instance.model.api;version="[5,6)"
+ 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.rest.server;resolution:=optional,
+ ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ 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)",
+ com.google.gson;version="[2.8,3)",
+ com.google.gson.stream;version="[2.8,3)",
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.sax,
+ org.apache.commons.codec.binary;version="[1.11,2)",
+ 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.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.slf4j;version="[1.7,2)",
+ org.w3c.dom,
+ org.w3c.dom.events,
+ org.xml.sax,
+ org.xml.sax.helpers
</servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>
- ca.uhn.fhir.model.dstu2;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.fluentpath,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.api.server,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.provider.dstu2,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.model.dstu2.valueset;uses:=ca.uhn.fhir.model.api;version=5.7.2,
- ca.uhn.fhir.model.dstu2.composite;
- uses:="ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.model.dstu2.valueset,
- ca.uhn.fhir.model.primitive,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.model.dstu2.resource;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.model.base.resource,
- ca.uhn.fhir.model.dstu2.composite,
- ca.uhn.fhir.model.dstu2.valueset,
- ca.uhn.fhir.model.primitive,
- ca.uhn.fhir.rest.gclient,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.rest.server.provider.dstu2;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.api,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.dstu2.resource,
- ca.uhn.fhir.model.primitive,
- ca.uhn.fhir.model.valueset,
- ca.uhn.fhir.rest.annotation,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.servlet,
- javax.servlet.http,
- org.hl7.fhir.instance.model.api";
- version=5.7.2
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.hl7.fhir.dstu2016may.terminologies;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu2016may.formats;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu2016may.hapi.ctx;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu2016may.hapi.rest.server;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu2016may.hapi.validation;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu2016may.utils;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu2016may.metamodel;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu2016may.model;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu2016may.validation;version="${pkgVersion}";-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.fragment.host>
- ca.uhn.hapi.fhir.hapi-fhir-base
+ ca.uhn.hapi.fhir.hapi-fhir-base
</servicemix.osgi.fragment.host>
</properties>
diff --git a/hapi-fhir-structures-dstu2.1-5.7.2/src/main/resources/OSGI-INF/bundle.info b/hapi-fhir-structures-dstu2.1-6.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from hapi-fhir-structures-dstu2.1-5.7.2/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-structures-dstu2.1-6.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-dstu3-5.7.2/pom.xml b/hapi-fhir-structures-dstu3-5.7.2/pom.xml
deleted file mode 100644
index 002aadb2f..000000000
--- a/hapi-fhir-structures-dstu3-5.7.2/pom.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>14</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu3</artifactId>
- <version>5.7.2_2-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
- <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
- <scm>
- <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>5.7.2</pkgVersion>
- <servicemix.osgi.import.pkg>
- ca.uhn.fhir.context;version="[5,6)",
- ca.uhn.fhir.context.api;version="[5,6)",
- ca.uhn.fhir.context.support;version="[5,6)",
- ca.uhn.fhir.fluentpath;version="[5,6)",
- ca.uhn.fhir.model.api;version="[5,6)",
- ca.uhn.fhir.model.api.annotation;version="[5,6)",
- ca.uhn.fhir.model.primitive;version="[5,6)",
- ca.uhn.fhir.model.valueset;version="[5,6)",
- ca.uhn.fhir.parser;version="[5,6)",
- ca.uhn.fhir.rest.annotation;version="[5,6)",
- ca.uhn.fhir.rest.api;version="[5,6)",
- ca.uhn.fhir.rest.api.server;version="[5,6)",
- ca.uhn.fhir.rest.gclient;version="[5,6)",
- ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[5,6)",
- ca.uhn.fhir.rest.server.method;resolution:=optional,
- ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[5,6)",
- 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.0,4)",
- javax.servlet.http;resolution:=optional;version="[3.0,4)",
- javax.xml.parsers,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- org.apache.commons.codec.binary,
- org.apache.commons.io;version="[1.4,2)",
- 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="[5,6)",
- org.hl7.fhir.instance.model.api;version="[5,6)",
- org.hl7.fhir.utilities;version="[5,6)",
- org.hl7.fhir.utilities.ucum;version="[5,6)",
- org.hl7.fhir.utilities.validation;version="[5,6)",
- org.hl7.fhir.utilities.xhtml;version="[5,6)",
- org.hl7.fhir.utilities.xml;version="[5,6)",
- org.slf4j;version="[1.7,2)",
- org.w3c.dom,
- org.w3c.dom.events,
- org.xml.sax,
- org.xml.sax.helpers,
- org.xmlpull.v1;resolution:=optional
- </servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>
- org.hl7.fhir.dstu3.terminologies;
- uses:="org.hl7.fhir.dstu3.context,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.dstu3.utils,
- org.hl7.fhir.exceptions";
- version=5.7.2,
- org.hl7.fhir.dstu3.context;
- uses:="org.hl7.fhir.dstu3.formats,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.dstu3.terminologies,
- org.hl7.fhir.dstu3.utils,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.utilities.validation";
- version=5.7.2,
- org.hl7.fhir.dstu3.formats;
- uses:="com.google.gson,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.utilities.xhtml,
- org.hl7.fhir.utilities.xml,
- org.xmlpull.v1";
- version=5.7.2,
- org.hl7.fhir.dstu3.hapi.fluentpath;uses:="ca.uhn.fhir.context,ca.uhn.fhir.fluentpath,org.hl7.fhir.instance.model.api";version=5.7.2,
- org.hl7.fhir.dstu3.hapi.ctx;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.fluentpath,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.api.server,
- ca.uhn.fhir.rest.server,
- org.hl7.fhir.dstu3.context,
- org.hl7.fhir.dstu3.formats,
- org.hl7.fhir.dstu3.hapi.rest.server,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.dstu3.terminologies,
- org.hl7.fhir.dstu3.utils,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.utilities.validation";
- version=5.7.2,
- org.hl7.fhir.dstu3.hapi.rest.server;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.api,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.valueset,
- ca.uhn.fhir.rest.annotation,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.servlet,
- javax.servlet.http,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- org.hl7.fhir.dstu3.utils;
- uses:="com.google.gson,
- org.hl7.fhir.dstu3.conformance,
- org.hl7.fhir.dstu3.context,
- org.hl7.fhir.dstu3.elementmodel,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.utilities,
- org.hl7.fhir.utilities.validation,
- org.hl7.fhir.utilities.xhtml,
- org.w3c.dom";
- version=5.7.2,
- org.hl7.fhir.dstu3.utils.formats;
- uses:="com.google.gson,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.utilities,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.helpers";
- version=5.7.2,
- org.hl7.fhir.dstu3.model;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.parser,
- ca.uhn.fhir.rest.gclient,
- org.hl7.fhir.dstu3.context,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.utilities.xhtml";
- version=5.7.2,
- org.hl7.fhir.dstu3.model.codesystems;uses:="org.hl7.fhir.dstu3.model,org.hl7.fhir.exceptions";version=5.7.2,
- org.hl7.fhir.dstu3.elementmodel;
- uses:="com.google.gson,
- org.hl7.fhir.dstu3.context,
- org.hl7.fhir.dstu3.formats,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.dstu3.utils.formats,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.utilities.validation,
- org.hl7.fhir.utilities.xhtml,
- org.hl7.fhir.utilities.xml,
- org.w3c.dom";
- version=5.7.2,
- org.hl7.fhir.dstu3.conformance;
- uses:="org.hl7.fhir.dstu3.context,
- org.hl7.fhir.dstu3.elementmodel,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.dstu3.utils,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.utilities.validation,
- org.hl7.fhir.utilities.xhtml";
- version=5.7.2
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.fragment.host>
- ca.uhn.hapi.fhir.hapi-fhir-base
- </servicemix.osgi.fragment.host>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <optional>true</optional>
- </dependency>
-
- <!-- sources -->
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <classifier>sources</classifier>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${pkgGroupId}:${pkgArtifactId}</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
- </filters>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/hapi-fhir-structures-dstu2-5.7.2/pom.xml b/hapi-fhir-structures-dstu3-6.0.0/pom.xml
similarity index 56%
copy from hapi-fhir-structures-dstu2-5.7.2/pom.xml
copy to hapi-fhir-structures-dstu3-6.0.0/pom.xml
index 1b5a9d57f..15ab844af 100644
--- a/hapi-fhir-structures-dstu2-5.7.2/pom.xml
+++ b/hapi-fhir-structures-dstu3-6.0.0/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>14</version>
+ <version>15-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2</artifactId>
- <version>5.7.2_2-SNAPSHOT</version>
+ <artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu3</artifactId>
+ <version>6.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,91 +39,76 @@
<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>5.7.2</pkgVersion>
+ <pkgArtifactId>hapi-fhir-structures-dstu3</pkgArtifactId>
+ <pkgVersion>6.0.0</pkgVersion>
+ <servicemix.osgi.source.version>6.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
- javax.servlet;resolution:=optional;version="[3.1,4)",
- javax.servlet.http;resolution:=optional;version="[3.1,4)",
- ca.uhn.fhir.context;version="[5,6)",
- ca.uhn.fhir.context.api;version="[5,6)",
- ca.uhn.fhir.context.support;version="[5,6)",
- ca.uhn.fhir.fluentpath;version="[5,6)",
- ca.uhn.fhir.model.api;version="[5,6)",
- ca.uhn.fhir.model.api.annotation;version="[5,6)",
- ca.uhn.fhir.model.base.composite;version="[5,6)",
- ca.uhn.fhir.model.base.resource;version="[5,6)",
- ca.uhn.fhir.model.primitive;version="[5,6)",
- ca.uhn.fhir.model.valueset;version="[5,6)",
- ca.uhn.fhir.parser;version="[5,6)",
- ca.uhn.fhir.rest.annotation;version="[5,6)",
- ca.uhn.fhir.rest.api;version="[5,6)",
- ca.uhn.fhir.rest.api.server;version="[5,6)",
- ca.uhn.fhir.rest.gclient;version="[5,6)",
- ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[5,6)",
- ca.uhn.fhir.rest.server.method;resolution:=optional,
- ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[5,6)",
- org.apache.commons.lang3;version="[3.8,4)",
- org.apache.commons.lang3.builder;version="[3.8,4)",
- org.hl7.fhir.instance.model.api;version="[5,6)"
+ 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.rest.server;resolution:=optional,
+ ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ ca.uhn.fhir.rest.server.method;resolution:=optional,
+ ca.uhn.fhir.rest.server.servlet;resolution:=optional,
+ ca.uhn.fhir.util;version="[6,7)",
+ 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.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.sax,
+ org.apache.commons.codec.binary,
+ 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.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.slf4j;version="[1.7,2)",
+ org.w3c.dom,
+ org.w3c.dom.events,
+ org.xml.sax,
+ org.xml.sax.helpers,
+ org.xmlpull.v1;resolution:=optional
</servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>
- ca.uhn.fhir.model.dstu2;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.fluentpath,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.api.server,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.provider.dstu2,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.model.dstu2.valueset;uses:=ca.uhn.fhir.model.api;version=5.7.2,
- ca.uhn.fhir.model.dstu2.composite;
- uses:="ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.model.dstu2.valueset,
- ca.uhn.fhir.model.primitive,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.model.dstu2.resource;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.model.base.resource,
- ca.uhn.fhir.model.dstu2.composite,
- ca.uhn.fhir.model.dstu2.valueset,
- ca.uhn.fhir.model.primitive,
- ca.uhn.fhir.rest.gclient,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.rest.server.provider.dstu2;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.api,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.dstu2.resource,
- ca.uhn.fhir.model.primitive,
- ca.uhn.fhir.model.valueset,
- ca.uhn.fhir.rest.annotation,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.servlet,
- javax.servlet.http,
- org.hl7.fhir.instance.model.api";
- version=5.7.2
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.hl7.fhir.dstu3.terminologies;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.context;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.formats;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.hapi.fluentpath;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.hapi.ctx;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.hapi.rest.server;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.utils;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.utils.formats;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.model;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.model.codesystems;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.elementmodel;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.conformance;version="${pkgVersion}";-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.fragment.host>
- ca.uhn.hapi.fhir.hapi-fhir-base
+ ca.uhn.hapi.fhir.hapi-fhir-base
</servicemix.osgi.fragment.host>
</properties>
diff --git a/hapi-fhir-structures-dstu3-5.7.2/src/main/resources/OSGI-INF/bundle.info b/hapi-fhir-structures-dstu3-6.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from hapi-fhir-structures-dstu3-5.7.2/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-structures-dstu3-6.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-hl7org-dstu2-5.7.2/pom.xml b/hapi-fhir-structures-hl7org-dstu2-6.0.0/pom.xml
similarity index 53%
rename from hapi-fhir-structures-hl7org-dstu2-5.7.2/pom.xml
rename to hapi-fhir-structures-hl7org-dstu2-6.0.0/pom.xml
index 32893034d..7fb35fd06 100644
--- a/hapi-fhir-structures-hl7org-dstu2-5.7.2/pom.xml
+++ b/hapi-fhir-structures-hl7org-dstu2-6.0.0/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>14</version>
+ <version>15-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-hl7org-dstu2</artifactId>
- <version>5.7.2_2-SNAPSHOT</version>
+ <version>6.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,111 +39,69 @@
<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>5.7.2</pkgVersion>
+ <pkgVersion>6.0.0</pkgVersion>
+ <servicemix.osgi.source.version>6.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="[5,6)",
- ca.uhn.fhir.context.api;version="[5,6)",
- ca.uhn.fhir.context.support;version="[5,6)",
- ca.uhn.fhir.fluentpath;version="[5,6)",
- ca.uhn.fhir.model.api;version="[5,6)",
- ca.uhn.fhir.model.api.annotation;version="[5,6)",
- ca.uhn.fhir.model.base.composite;version="[5,6)",
- ca.uhn.fhir.model.valueset;version="[5,6)",
- ca.uhn.fhir.parser;version="[5,6)",
- ca.uhn.fhir.rest.annotation;version="[5,6)",
- ca.uhn.fhir.rest.api;version="[5,6)",
- ca.uhn.fhir.rest.api.server;version="[5,6)",
- ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[5,6)",
- ca.uhn.fhir.rest.server.method;resolution:=optional,
- ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[5,6)",
- com.google.gson;version="[2.8,3)",
- javax.sound.sampled,
- javax.xml.parsers,
- javax.xml.transform,
- javax.xml.transform.stream,
- net.sf.saxon,
- org.apache.commons.codec.binary;version="[1.11,2)",
- org.apache.commons.io;version="[1.4,2)",
- 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="[5,6)",
- org.hl7.fhir.instance.model.api;version="[5,6)",
- org.hl7.fhir.utilities;version="[5,6)",
- org.hl7.fhir.utilities.ucum;version="[5,6)",
- org.hl7.fhir.utilities.validation;version="[5,6)",
- org.hl7.fhir.utilities.xhtml;version="[5,6)",
- org.hl7.fhir.utilities.xml;version="[5,6)",
- org.w3c.dom,
- org.w3c.dom.ls
+ 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.rest.server;resolution:=optional,
+ ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ ca.uhn.fhir.rest.server.method;resolution:=optional,
+ ca.uhn.fhir.rest.server.servlet;resolution:=optional,
+ ca.uhn.fhir.util;version="[6,7)",
+ com.google.gson;version="[2.8,3)",
+ javax.sound.sampled,
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.stream,
+ net.sf.saxon,
+ org.apache.commons.codec.binary;version="[1.11,2)",
+ 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.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.w3c.dom,
+ org.w3c.dom.ls
</servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>
- org.hl7.fhir.instance.terminologies;uses:="org.hl7.fhir.exceptions,org.hl7.fhir.instance.model,org.hl7.fhir.instance.utils";version=5.7.2,
- org.hl7.fhir.instance.formats;uses:=org.hl7.fhir.instance.model;version=5.7.2,
- org.hl7.fhir.instance.utils;
- uses:="com.google.gson,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.client,
- org.hl7.fhir.instance.formats,
- org.hl7.fhir.instance.model,
- org.hl7.fhir.instance.terminologies,
- org.hl7.fhir.utilities.validation,
- org.w3c.dom";
- version=5.7.2,
- org.hl7.fhir.instance.utilities;uses:=javax.xml.transform;version=5.7.2,
- org.hl7.fhir.instance.utilities.xml;uses:="org.hl7.fhir.instance.utilities,org.w3c.dom";version=5.7.2,
- org.hl7.fhir.instance.model;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.model.api.annotation,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.instance.utils,
- org.hl7.fhir.utilities.xhtml";
- version=5.7.2,
- org.hl7.fhir.instance.model.valuesets;uses:=org.hl7.fhir.instance.model;version=5.7.2,
- org.hl7.fhir.instance;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.fluentpath,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.api.server,
- ca.uhn.fhir.rest.server,
- org.hl7.fhir.instance.conf,
- org.hl7.fhir.instance.model,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- org.hl7.fhir.instance.conf;
- uses:="ca.uhn.fhir.rest.annotation,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.servlet,
- javax.servlet.http,
- org.hl7.fhir.instance.model,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- org.hl7.fhir.instance.client;uses:=org.hl7.fhir.instance.model;version=5.7.2,
- ca.uhn.fhir.rest.server.provider.dstu2hl7org;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.api,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.valueset,
- ca.uhn.fhir.rest.api,
- org.hl7.fhir.instance.model.api";
- version=5.7.2
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.hl7.fhir.instance.terminologies;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.formats;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.utils;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.utilities;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.utilities.xml;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.model;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.model.valuesets;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.conf;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.client;version="${pkgVersion}";-split-package:=merge-first,
+ ca.uhn.fhir.rest.server.provider.dstu2hl7org;version="${pkgVersion}";-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.fragment.host>
- ca.uhn.hapi.fhir.hapi-fhir-base
+ ca.uhn.hapi.fhir.hapi-fhir-base
</servicemix.osgi.fragment.host>
</properties>
diff --git a/hapi-fhir-structures-hl7org-dstu2-5.7.2/src/main/resources/OSGI-INF/bundle.info b/hapi-fhir-structures-hl7org-dstu2-6.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from hapi-fhir-structures-hl7org-dstu2-5.7.2/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-structures-hl7org-dstu2-6.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-structures-r4-5.7.2/pom.xml b/hapi-fhir-structures-r4-5.7.2/pom.xml
deleted file mode 100644
index 84b55e99c..000000000
--- a/hapi-fhir-structures-r4-5.7.2/pom.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>14</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-r4</artifactId>
- <version>5.7.2_2-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
- <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
- <scm>
- <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>5.7.2</pkgVersion>
- <servicemix.osgi.import.pkg>
- ca.uhn.fhir.context;version="[5,6)",
- ca.uhn.fhir.context.api;version="[5,6)",
- ca.uhn.fhir.context.support;version="[5,6)",
- ca.uhn.fhir.fluentpath;version="[5,6)",
- ca.uhn.fhir.model.api;version="[5,6)",
- ca.uhn.fhir.model.api.annotation;version="[5,6)",
- ca.uhn.fhir.model.primitive;version="[5,6)",
- ca.uhn.fhir.model.valueset;version="[5,6)",
- ca.uhn.fhir.parser;version="[5,6)",
- ca.uhn.fhir.rest.annotation;version="[5,6)",
- ca.uhn.fhir.rest.api;version="[5,6)",
- ca.uhn.fhir.rest.api.server;version="[5,6)",
- ca.uhn.fhir.rest.gclient;version="[5,6)",
- ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[5,6)",
- ca.uhn.fhir.rest.server.method;resolution:=optional,
- ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[5,6)",
- 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.1,4)",
- javax.servlet.http;resolution:=optional;version="[3.1,4)",
- javax.xml.crypto.dsig,
- javax.xml.crypto.dsig.dom,
- javax.xml.crypto.dsig.keyinfo,
- javax.xml.crypto.dsig.spec,
- javax.xml.parsers,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- org.apache.commons.codec;version="[1.11,2)",
- org.apache.commons.codec.binary;version="[1.11,2)",
- org.apache.commons.io;version="[1.4,2)",
- org.apache.commons.io.output;version="[1.4,2)",
- 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.apache.commons.lang3.tuple;version="[3.8,4)",
- org.apache.http;resolution:=optional,
- org.apache.http.client;resolution:=optional,
- org.apache.http.client.methods;resolution:=optional,
- org.apache.http.client.utils;resolution:=optional,
- org.apache.http.entity;resolution:=optional,
- org.apache.http.impl.client;resolution:=optional,
- org.apache.http.params;resolution:=optional,
- org.fhir.ucum;version="[5,6)",
- org.hl7.fhir.exceptions;version="[5,6)",
- org.hl7.fhir.instance.model.api;version="[5,6)",
- org.hl7.fhir.utilities;version="[5,6)",
- org.hl7.fhir.utilities.graphql;version="[5,6)",
- org.hl7.fhir.utilities.validation;version="[5,6)",
- org.hl7.fhir.utilities.xhtml;version="[5,6)",
- org.hl7.fhir.utilities.xml;version="[5,6)",
- org.slf4j;version="[1.7,2)",
- org.stringtemplate.v4;resolution:=optional,
- org.w3c.dom,
- org.w3c.dom.events,
- org.xml.sax,
- org.xml.sax.helpers,
- org.xmlpull.v1;resolution:=optional
- </servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>
- org.hl7.fhir.r4.terminologies;
- uses:="javax.xml.parsers,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.r4.context,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.utils,
- org.hl7.fhir.utilities,
- org.xml.sax,
- org.xmlpull.v1";
- version=5.7.2,
- org.hl7.fhir.r4.context;
- uses:="com.google.gson,
- org.fhir.ucum,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.r4.conformance,
- org.hl7.fhir.r4.formats,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.terminologies,
- org.hl7.fhir.r4.utils,
- org.hl7.fhir.r4.utils.client,
- org.hl7.fhir.utilities,
- org.hl7.fhir.utilities.validation";
- version=5.7.2,
- org.hl7.fhir.r4.formats;
- uses:="com.google.gson,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.r4.elementmodel,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.utils.formats,
- org.hl7.fhir.utilities.xhtml,
- org.hl7.fhir.utilities.xml,
- org.xmlpull.v1";
- version=5.7.2,
- org.hl7.fhir.r4.hapi.fluentpath;uses:="ca.uhn.fhir.context,ca.uhn.fhir.fluentpath,org.hl7.fhir.instance.model.api";version=5.7.2,
- org.hl7.fhir.r4.hapi.ctx;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.fluentpath,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.api.server,
- ca.uhn.fhir.rest.server,
- org.fhir.ucum,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.r4.context,
- org.hl7.fhir.r4.formats,
- org.hl7.fhir.r4.hapi.rest.server,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.terminologies,
- org.hl7.fhir.r4.utils,
- org.hl7.fhir.utilities,
- org.hl7.fhir.utilities.validation";
- version=5.7.2,
- org.hl7.fhir.r4.hapi.rest.server;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.api,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.valueset,
- ca.uhn.fhir.rest.annotation,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.servlet,
- javax.servlet.http,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.r4.hapi.ctx,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.utils";
- version=5.7.2,
- org.hl7.fhir.r4.utils;
- uses:="com.google.gson,
- javax.xml.parsers,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.r4.conformance,
- org.hl7.fhir.r4.context,
- org.hl7.fhir.r4.elementmodel,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.terminologies,
- org.hl7.fhir.utilities,
- org.hl7.fhir.utilities.graphql,
- org.hl7.fhir.utilities.validation,
- org.hl7.fhir.utilities.xhtml,
- org.w3c.dom,
- org.xml.sax";
- version=5.7.2,
- org.hl7.fhir.r4.utils.formats;
- uses:="com.google.gson,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.utilities,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.helpers";
- version=5.7.2,
- org.hl7.fhir.r4.utils.client;uses:="org.apache.http,org.apache.http.client.methods,org.hl7.fhir.r4.formats,org.hl7.fhir.r4.model";version=5.7.2,
- org.hl7.fhir.r4.model;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.parser,
- ca.uhn.fhir.rest.gclient,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.r4.context,
- org.hl7.fhir.utilities.xhtml";
- version=5.7.2,
- org.hl7.fhir.r4.model.codesystems;uses:="org.hl7.fhir.exceptions,org.hl7.fhir.r4.model";version=5.7.2,
- org.hl7.fhir.r4.elementmodel;
- uses:="com.google.gson,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.r4.context,
- org.hl7.fhir.r4.formats,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.utils.formats,
- org.hl7.fhir.utilities.validation,
- org.hl7.fhir.utilities.xhtml,
- org.hl7.fhir.utilities.xml,
- org.w3c.dom";
- version=5.7.2,
- org.hl7.fhir.r4.conformance;
- uses:="org.hl7.fhir.exceptions,
- org.hl7.fhir.r4.context,
- org.hl7.fhir.r4.elementmodel,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.utils,
- org.hl7.fhir.utilities.validation,
- org.hl7.fhir.utilities.xhtml";
- version=5.7.2
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.fragment.host>
- ca.uhn.hapi.fhir.hapi-fhir-base
- </servicemix.osgi.fragment.host>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <optional>true</optional>
- </dependency>
-
- <!-- sources -->
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <classifier>sources</classifier>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${pkgGroupId}:${pkgArtifactId}</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
- </filters>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/hapi-fhir-structures-dstu2-5.7.2/pom.xml b/hapi-fhir-structures-r4-6.0.0/pom.xml
similarity index 51%
rename from hapi-fhir-structures-dstu2-5.7.2/pom.xml
rename to hapi-fhir-structures-r4-6.0.0/pom.xml
index 1b5a9d57f..39554cb9d 100644
--- a/hapi-fhir-structures-dstu2-5.7.2/pom.xml
+++ b/hapi-fhir-structures-r4-6.0.0/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>14</version>
+ <version>15-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-dstu2</artifactId>
- <version>5.7.2_2-SNAPSHOT</version>
+ <artifactId>org.apache.servicemix.bundles.hapi-fhir-structures-r4</artifactId>
+ <version>6.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,91 +39,93 @@
<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>5.7.2</pkgVersion>
+ <pkgArtifactId>hapi-fhir-structures-r4</pkgArtifactId>
+ <pkgVersion>6.0.0</pkgVersion>
+ <servicemix.osgi.source.version>6.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
- javax.servlet;resolution:=optional;version="[3.1,4)",
- javax.servlet.http;resolution:=optional;version="[3.1,4)",
- ca.uhn.fhir.context;version="[5,6)",
- ca.uhn.fhir.context.api;version="[5,6)",
- ca.uhn.fhir.context.support;version="[5,6)",
- ca.uhn.fhir.fluentpath;version="[5,6)",
- ca.uhn.fhir.model.api;version="[5,6)",
- ca.uhn.fhir.model.api.annotation;version="[5,6)",
- ca.uhn.fhir.model.base.composite;version="[5,6)",
- ca.uhn.fhir.model.base.resource;version="[5,6)",
- ca.uhn.fhir.model.primitive;version="[5,6)",
- ca.uhn.fhir.model.valueset;version="[5,6)",
- ca.uhn.fhir.parser;version="[5,6)",
- ca.uhn.fhir.rest.annotation;version="[5,6)",
- ca.uhn.fhir.rest.api;version="[5,6)",
- ca.uhn.fhir.rest.api.server;version="[5,6)",
- ca.uhn.fhir.rest.gclient;version="[5,6)",
- ca.uhn.fhir.rest.server;resolution:=optional,
- ca.uhn.fhir.rest.server.exceptions;version="[5,6)",
- ca.uhn.fhir.rest.server.method;resolution:=optional,
- ca.uhn.fhir.rest.server.servlet;resolution:=optional,
- ca.uhn.fhir.util;version="[5,6)",
- org.apache.commons.lang3;version="[3.8,4)",
- org.apache.commons.lang3.builder;version="[3.8,4)",
- org.hl7.fhir.instance.model.api;version="[5,6)"
+ 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.rest.server;resolution:=optional,
+ ca.uhn.fhir.rest.server.exceptions;version="[6,7)",
+ ca.uhn.fhir.rest.server.method;resolution:=optional,
+ ca.uhn.fhir.rest.server.servlet;resolution:=optional,
+ ca.uhn.fhir.util;version="[6,7)",
+ 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.xml.crypto.dsig,
+ javax.xml.crypto.dsig.dom,
+ javax.xml.crypto.dsig.keyinfo,
+ javax.xml.crypto.dsig.spec,
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.sax,
+ org.apache.commons.codec;version="[1.11,2)",
+ org.apache.commons.codec.binary;version="[1.11,2)",
+ org.apache.commons.io;version="[2,3)",
+ org.apache.commons.io.output;version="[2,3)",
+ 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.apache.commons.lang3.tuple;version="[3.8,4)",
+ org.apache.http;resolution:=optional,
+ org.apache.http.client;resolution:=optional,
+ org.apache.http.client.methods;resolution:=optional,
+ org.apache.http.client.utils;resolution:=optional,
+ 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.slf4j;version="[1.7,2)",
+ org.stringtemplate.v4;resolution:=optional,
+ org.w3c.dom,
+ org.w3c.dom.events,
+ org.xml.sax,
+ org.xml.sax.helpers,
+ org.xmlpull.v1;resolution:=optional
</servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>
- ca.uhn.fhir.model.dstu2;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.fluentpath,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.api.server,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.provider.dstu2,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.model.dstu2.valueset;uses:=ca.uhn.fhir.model.api;version=5.7.2,
- ca.uhn.fhir.model.dstu2.composite;
- uses:="ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.model.dstu2.valueset,
- ca.uhn.fhir.model.primitive,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.model.dstu2.resource;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.api.annotation,
- ca.uhn.fhir.model.base.composite,
- ca.uhn.fhir.model.base.resource,
- ca.uhn.fhir.model.dstu2.composite,
- ca.uhn.fhir.model.dstu2.valueset,
- ca.uhn.fhir.model.primitive,
- ca.uhn.fhir.rest.gclient,
- org.hl7.fhir.instance.model.api";
- version=5.7.2,
- ca.uhn.fhir.rest.server.provider.dstu2;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.api,
- ca.uhn.fhir.model.api,
- ca.uhn.fhir.model.dstu2.resource,
- ca.uhn.fhir.model.primitive,
- ca.uhn.fhir.model.valueset,
- ca.uhn.fhir.rest.annotation,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.rest.server,
- ca.uhn.fhir.rest.server.servlet,
- javax.servlet.http,
- org.hl7.fhir.instance.model.api";
- version=5.7.2
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.hl7.fhir.r4.terminologies;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.context;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.formats;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.hapi.fluentpath;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.hapi.ctx;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.hapi.rest.server;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.utils;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.utils.formats;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.utils.client;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.model;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.model.codesystems;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.elementmodel;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.conformance;version="${pkgVersion}";-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.fragment.host>
- ca.uhn.hapi.fhir.hapi-fhir-base
+ ca.uhn.hapi.fhir.hapi-fhir-base
</servicemix.osgi.fragment.host>
</properties>
diff --git a/hapi-fhir-structures-r4-5.7.2/src/main/resources/OSGI-INF/bundle.info b/hapi-fhir-structures-r4-6.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from hapi-fhir-structures-r4-5.7.2/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-structures-r4-6.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/hapi-fhir-validation-5.7.2/pom.xml b/hapi-fhir-validation-6.0.0/pom.xml
similarity index 50%
rename from hapi-fhir-validation-5.7.2/pom.xml
rename to hapi-fhir-validation-6.0.0/pom.xml
index 4234d9e6d..4e19b1c25 100644
--- a/hapi-fhir-validation-5.7.2/pom.xml
+++ b/hapi-fhir-validation-6.0.0/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>14</version>
+ <version>15-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hapi-fhir-validation</artifactId>
- <version>5.7.2_2-SNAPSHOT</version>
+ <version>6.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,128 +39,70 @@
<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>5.7.2</pkgVersion>
+ <pkgVersion>6.0.0</pkgVersion>
+ <servicemix.osgi.source.version>6.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.import.pkg>
- ca.uhn.fhir.context;version="[5,6)",
- ca.uhn.fhir.context.support;version="[5,6)",
- ca.uhn.fhir.model.api;version="[5,6)",
- ca.uhn.fhir.parser;version="[5,6)",
- ca.uhn.fhir.rest.api;version="[5,6)",
- ca.uhn.fhir.rest.server.exceptions;version="[5,6)",
- ca.uhn.fhir.util;version="[5,6)",
- ca.uhn.fhir.validation;version="[5,6)",
- com.github.benmanes.caffeine.cache,
- com.google.gson;version="[2.8,3)",
- javax.swing,
- javax.xml.parsers,
- org.apache.commons.io;version="[1.4,2)",
- org.apache.commons.lang3;version="[3.8,4)",
- org.apache.commons.lang3.builder;version="[3.8,4)",
- org.fhir.ucum;version="[5,6)",
- org.hl7.fhir.convertors;version="[5,6)",
- org.hl7.fhir.dstu3.context;resolution:=optional;version="[5,6)",
- org.hl7.fhir.dstu3.hapi.ctx;resolution:=optional;version="[5,6)",
- org.hl7.fhir.dstu3.model;resolution:=optional;version="[5,6)",
- org.hl7.fhir.dstu3.terminologies;resolution:=optional;version="[5,6)",
- org.hl7.fhir.dstu3.utils;resolution:=optional;version="[5,6)",
- org.hl7.fhir.exceptions;version="[5,6)",
- org.hl7.fhir.instance.formats;resolution:=optional;version="[5,6)",
- org.hl7.fhir.instance.model;resolution:=optional;version="[5,6)",
- org.hl7.fhir.instance.model.api;version="[5,6)",
- org.hl7.fhir.instance.terminologies;resolution:=optional;version="[5,6)",
- org.hl7.fhir.instance.utils;resolution:=optional;version="[5,6)",
- org.hl7.fhir.r4.conformance;resolution:=optional;version="[5,6)",
- org.hl7.fhir.r4.context;resolution:=optional;version="[5,6)",
- org.hl7.fhir.r4.elementmodel;resolution:=optional;version="[5,6)",
- org.hl7.fhir.r4.formats;resolution:=optional;version="[5,6)",
- org.hl7.fhir.r4.hapi.ctx;resolution:=optional;version="[5,6)",
- org.hl7.fhir.r4.model;resolution:=optional;version="[5,6)",
- org.hl7.fhir.r4.terminologies;resolution:=optional;version="[5,6)",
- org.hl7.fhir.r4.utils;resolution:=optional;version="[5,6)",
- org.hl7.fhir.utilities;version="[5,6)",
- org.hl7.fhir.utilities.validation;version="[5,6)",
- org.hl7.fhir.utilities.xhtml;version="[5,6)",
- org.hl7.fhir.utilities.xml;version="[5,6)",
- org.slf4j;version="[1.7,2)",
- org.w3c.dom,
- org.w3c.dom.events,
- org.xml.sax,
- org.xml.sax.helpers
+ 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)",
+ com.github.benmanes.caffeine.cache,
+ com.google.gson;version="[2.8,3)",
+ javax.swing,
+ javax.xml.parsers,
+ 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.slf4j;version="[1.7,2)",
+ org.w3c.dom,
+ org.w3c.dom.events,
+ org.xml.sax,
+ org.xml.sax.helpers
</servicemix.osgi.import.pkg>
- <servicemix.osgi.export.pkg>
- org.hl7.fhir.dstu3.hapi.validation;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.validation,
- org.hl7.fhir.dstu3.hapi.ctx,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.r4.utils,
- org.hl7.fhir.utilities.validation";
- version=5.7.2,
- org.hl7.fhir.dstu3.validation;
- uses:="javax.swing,
- org.hl7.fhir.dstu3.context,
- org.hl7.fhir.dstu3.model,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.utilities.validation,
- org.xml.sax";
- version=5.7.2,
- org.hl7.fhir.instance.hapi.validation;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.validation,
- org.hl7.fhir.instance.formats,
- org.hl7.fhir.instance.model,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.instance.terminologies,
- org.hl7.fhir.instance.utils,
- org.hl7.fhir.r4.utils,
- org.hl7.fhir.utilities.validation";
- version=5.7.2,
- org.hl7.fhir.instance.validation;
- uses:="com.google.gson,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model,
- org.hl7.fhir.instance.utils,
- org.hl7.fhir.utilities.validation,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.helpers";
- version=5.7.2,
- org.hl7.fhir.r4.hapi.validation;
- uses:="ca.uhn.fhir.context,
- ca.uhn.fhir.context.support,
- ca.uhn.fhir.rest.api,
- ca.uhn.fhir.validation,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.instance.model.api,
- org.hl7.fhir.r4.hapi.ctx,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.utils,
- org.hl7.fhir.utilities.validation";
- version=5.7.2,
- org.hl7.fhir.r4.validation;
- uses:="com.google.gson,
- javax.swing,
- org.hl7.fhir.exceptions,
- org.hl7.fhir.r4.context,
- org.hl7.fhir.r4.elementmodel,
- org.hl7.fhir.r4.model,
- org.hl7.fhir.r4.utils,
- org.hl7.fhir.utilities.validation,
- org.w3c.dom";
- version=5.7.2
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.hl7.fhir.dstu3.hapi.validation;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.dstu3.validation;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.hapi.validation;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.instance.validation;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.hapi.validation;version="${pkgVersion}";-split-package:=merge-first,
+ org.hl7.fhir.r4.validation;version="${pkgVersion}";-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.fragment.host>
- ca.uhn.hapi.fhir.hapi-fhir-base
+ ca.uhn.hapi.fhir.hapi-fhir-base
</servicemix.osgi.fragment.host>
</properties>
diff --git a/hapi-fhir-validation-5.7.2/src/main/resources/OSGI-INF/bundle.info b/hapi-fhir-validation-6.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from hapi-fhir-validation-5.7.2/src/main/resources/OSGI-INF/bundle.info
rename to hapi-fhir-validation-6.0.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/pom.xml b/pom.xml
index d96be5304..5a7db50eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,12 @@
<module>spring-security-test-5.7.1</module>
<module>spring-security-web-5.7.1</module>
<module>asterisk-java-3.29.0</module>
+ <module>hapi-fhir-structures-dstu2.1-6.0.0</module>
+ <module>hapi-fhir-structures-dstu2-6.0.0</module>
+ <module>hapi-fhir-structures-dstu3-6.0.0</module>
+ <module>hapi-fhir-structures-hl7org-dstu2-6.0.0</module>
+ <module>hapi-fhir-structures-r4-6.0.0</module>
+ <module>hapi-fhir-validation-6.0.0</module>
</modules>
</project>