From c14c772da488a8055030c4d04520d8c0fa49de93 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Wed, 21 Oct 2015 07:57:42 -0400
Subject: [PATCH] Add all required exports to OSGi build

---
 hapi-fhir-cobertura/pom.xml |  1 -
 hapi-fhir-osgi-core/pom.xml | 91 ++++++++++++++++++++++++++++++++++++-
 pom.xml                     |  6 ++-
 3 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/hapi-fhir-cobertura/pom.xml b/hapi-fhir-cobertura/pom.xml
index 6d501dd2320..3b012a97d9f 100644
--- a/hapi-fhir-cobertura/pom.xml
+++ b/hapi-fhir-cobertura/pom.xml
@@ -249,7 +249,6 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>${maven_build_helper_plugin_version}</version>
 				<executions>
 					<execution>
 						<id>add-source</id>
diff --git a/hapi-fhir-osgi-core/pom.xml b/hapi-fhir-osgi-core/pom.xml
index 379682ed962..09fa0b1c576 100644
--- a/hapi-fhir-osgi-core/pom.xml
+++ b/hapi-fhir-osgi-core/pom.xml
@@ -42,6 +42,19 @@
 			<version>1.3-SNAPSHOT</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.thymeleaf</groupId>
+			<artifactId>thymeleaf</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.phloc</groupId>
+			<artifactId>phloc-schematron</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.phloc</groupId>
+			<artifactId>phloc-commons</artifactId>
+		</dependency>
+
 		<!-- Don't force OSGi users to use a newer version of SLF4j than we need -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -53,6 +66,49 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copySources</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<copy todir="target/sources">
+									<fileset dir="../hapi-fhir-base/src/main/java" />
+									<fileset dir="../hapi-fhir-structures-dstu/src/main/java" />
+									<fileset dir="../hapi-fhir-structures-dstu/target/generated-sources/tinder" />
+									<fileset dir="../hapi-fhir-structures-dstu/src/main/java" />
+									<fileset dir="../hapi-fhir-structures-dstu2/src/main/java" />
+									<fileset dir="../hapi-fhir-structures-dstu2/target/generated-sources/tinder" />
+									<fileset dir="../hapi-fhir-structures-hl7org-dstu2/src/main/java" />
+								</copy>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>target/sources</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -64,7 +120,12 @@
 						<!--<Embed-Dependency>*;scope=!provided|test</Embed-Dependency> <Embed-Directory>lib</Embed-Directory> <Embed-Transitive>true</Embed-Transitive> -->
 						<_removeheaders>Built-By, Include-Resource, Private-Package</_removeheaders>
 						<!-- <Private-Package>org.foo.myproject.*</Private-Package> <Bundle-Activator>org.foo.myproject.impl1.Activator</Bundle-Activator> -->
-						<Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=hapi-fhir-*</Embed-Dependency>
+						<!-- <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=hapi-fhir-*</Embed-Dependency> -->
+						<Import-Package>
+							!ca.uhn.*,
+							!org.hl7.*,
+							*
+						</Import-Package>
 					</instructions>
 				</configuration>
 				<executions>
@@ -100,7 +161,35 @@
 				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
 			</resource>
+			<resource>
+				<directory>../hapi-fhir-base/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>../hapi-fhir-structures-dstu/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>../hapi-fhir-structures-dstu/target/generated-resources/tinder</directory>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>../hapi-fhir-structures-dstu2/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>../hapi-fhir-structures-dstu2/target/generated-resources/tinder</directory>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>../hapi-fhir-structures-hl7org-dstu2/src/resources/java</directory>
+				<filtering>true</filtering>
+			</resource>
 		</resources>
 	</build>
 
+
+
+
+
 </project>
diff --git a/pom.xml b/pom.xml
index 30b26196539..c207d763b2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,7 +222,6 @@
 		<hibernate_version>5.0.2.Final</hibernate_version>
 		<hibernate_validator_version>5.2.1.Final</hibernate_validator_version>
 		<jetty_version>9.3.4.v20151007</jetty_version>
-		<maven_build_helper_plugin_version>1.9.1</maven_build_helper_plugin_version>
 		<maven_assembly_plugin_version>2.5.3</maven_assembly_plugin_version>
 		<maven_failsafe_plugin_version>2.18.1</maven_failsafe_plugin_version>
 		<maven_license_plugin_version>1.8</maven_license_plugin_version>
@@ -685,6 +684,11 @@
 					<artifactId>maven-war-plugin</artifactId>
 					<version>2.6</version>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>build-helper-maven-plugin</artifactId>
+					<version>1.9.1</version>
+				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>cobertura-maven-plugin</artifactId>