OSGi manifest maintenance (#2217)

* manifest cleanup and delete Fragment-Host

* make hapi-fhir-server-empi into an OSGi bundle

hapi-fhir-base/pom.xml

@@ -154,6 +154,9 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <DynamicImport-Package>*</DynamicImport-Package>
 						<Import-Package>
 							<!--required when using servers-->
 							ca.uhn.fhir.rest.api.server;resolution:=optional,

hapi-fhir-client/pom.xml

@@ -67,9 +67,13 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
 					</instructions>
 				</configuration>
 			</plugin>

hapi-fhir-server-mdm/pom.xml

@@ -12,7 +12,7 @@
 	</parent>
 
 	<artifactId>hapi-fhir-server-mdm</artifactId>
-	<packaging>jar</packaging>
+	<packaging>bundle</packaging>
 
 	<name>HAPI FHIR - Master Data Management</name>
 
@@ -134,6 +134,17 @@
 					</execution>
 				</executions>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                    </instructions>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 </project>

hapi-fhir-structures-dstu2.1/pom.xml

@@ -310,9 +310,13 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
 						<Import-Package>
 							javax.servlet*;resolution:=optional,
 							*

hapi-fhir-structures-dstu2/pom.xml

@@ -397,9 +397,13 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
 						<Import-Package>
 							javax.servlet*;resolution:=optional,
 							*

hapi-fhir-structures-dstu3/pom.xml

@@ -34,9 +34,13 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
 					</instructions>
 				</configuration>
 			</plugin>

hapi-fhir-structures-hl7org-dstu2/pom.xml

@@ -319,9 +319,13 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
 						<Import-Package>
 							javax.servlet*;resolution:=optional,
 							*

hapi-fhir-structures-r4/pom.xml

@@ -376,9 +376,13 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
 					</instructions>
 				</configuration>
 			</plugin>

hapi-fhir-structures-r5/pom.xml

@@ -344,9 +344,13 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
 					</instructions>
 				</configuration>
 			</plugin>

hapi-fhir-validation-resources-dstu2.1/pom.xml

@@ -27,9 +27,20 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
+                        <!-- maven-bundle-plugin does not generate
+                             exports for resource packages -->
+                        <Export-Package>
+                            org.hl7.fhir.dstu2016may.model.profile;version="${project.version}",
+                            org.hl7.fhir.dstu2016may.model.schema;version="${project.version}",
+                            org.hl7.fhir.dstu2016may.model.valueset;version="${project.version}"
+                        </Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>

hapi-fhir-validation-resources-dstu2/pom.xml

@@ -27,9 +27,20 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
+                        <!-- maven-bundle-plugin does not generate
+                             exports for resource packages -->
+                        <Export-Package>
+                            org.hl7.fhir.instance.model.profile;version="${project.version}",
+                            org.hl7.fhir.instance.model.schema;version="${project.version}",
+                            org.hl7.fhir.instance.model.valueset;version="${project.version}"
+                        </Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>

hapi-fhir-validation-resources-dstu3/pom.xml

@@ -41,9 +41,21 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
+                        <!-- maven-bundle-plugin does not generate
+                             exports for resource packages -->
+                        <Export-Package>
+                            org.hl7.fhir.dstu3.model.extension;version="${project.version}",
+                            org.hl7.fhir.dstu3.model.profile;version="${project.version}",
+                            org.hl7.fhir.dstu3.model.schema;version="${project.version}",
+                            org.hl7.fhir.dstu3.model.valueset;version="${project.version}"
+                        </Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>

hapi-fhir-validation-resources-r4/pom.xml

@@ -41,9 +41,21 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
+                        <!-- maven-bundle-plugin does not generate
+                             exports for resource packages -->
+                        <Export-Package>
+                            org.hl7.fhir.r4.model.extension;version="${project.version}",
+                            org.hl7.fhir.r4.model.profile;version="${project.version}",
+                            org.hl7.fhir.r4.model.schema;version="${project.version}",
+                            org.hl7.fhir.r4.model.valueset;version="${project.version}"
+                        </Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>

hapi-fhir-validation-resources-r5/pom.xml

@@ -41,9 +41,20 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
+                        <!-- maven-bundle-plugin does not generate
+                             exports for resource packages -->
+                        <Export-Package>
+                            org.hl7.fhir.r5.model.extension;version="${project.version}",
+                            org.hl7.fhir.r5.model.profile;version="${project.version}",
+                            org.hl7.fhir.r5.model.valueset;version="${project.version}"
+                        </Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>

hapi-fhir-validation/pom.xml

@@ -355,9 +355,34 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+                        <_nouses>true</_nouses>
+                        <_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
+                        <!-- No need to disable normal OSGi class loading
 						<Fragment-Host>
 							ca.uhn.hapi.fhir.hapi-fhir-base
 						</Fragment-Host>
+						-->
+						<!--  add imports for validation resource packages -->
+						<Import-Package>
+                        	org.hl7.fhir.instance.model.profile;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.instance.model.schema;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.instance.model.valueset;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.dstu2016may.model.profile;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.dstu2016may.model.schema;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.dstu2016may.model.valueset;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.dstu3.model.extension;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.dstu3.model.profile;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.dstu3.model.schema;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.dstu3.model.valueset;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.r4.model.extension;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.r4.model.profile;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.r4.model.schema;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.r4.model.valueset;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.r5.model.extension;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.r5.model.profile;version="${project.version}";resolution:=optional,
+                        	org.hl7.fhir.r5.model.valueset;version="${project.version}";resolution:=optional,
+                        	*
+						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>