diff --git a/hapi-fhir-osgi-core/pom.xml b/hapi-fhir-osgi-core/pom.xml index 0d93f4896fc..2593b1a0eb0 100644 --- a/hapi-fhir-osgi-core/pom.xml +++ b/hapi-fhir-osgi-core/pom.xml @@ -57,7 +57,7 @@ *;scope=!provided|test lib true - <_removeheaders>Built-By + <_removeheaders>Built-By, Include-Resource, Private-Package @@ -70,6 +70,24 @@ + + + org.apache.maven.plugins + maven-failsafe-plugin + + true + + + + + integration-test + verify + + integration-test + + + + diff --git a/hapi-fhir-osgi-core/src/test/java/ca/uhn/fhir/osgi/ManifestIT.java b/hapi-fhir-osgi-core/src/test/java/ca/uhn/fhir/osgi/ManifestIT.java new file mode 100644 index 00000000000..4c45a21e8dc --- /dev/null +++ b/hapi-fhir-osgi-core/src/test/java/ca/uhn/fhir/osgi/ManifestIT.java @@ -0,0 +1,26 @@ +package ca.uhn.fhir.osgi; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertThat; + +import java.io.FileReader; + +import org.apache.commons.io.IOUtils; +import org.junit.Test; + +public class ManifestIT { + + /** + * See #234 + */ + @Test + public void testValidateManifest() throws Exception { + + FileReader r = new FileReader("./target/classes/META-INF/MANIFEST.MF"); + String file = IOUtils.toString(r); + + assertThat(file, not(containsString(".jar=/"))); + } + +} diff --git a/hapi-fhir-osgi-core/src/test/resources/.keep b/hapi-fhir-osgi-core/src/test/resources/.keep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7754e200f34..a5d7588cec7 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -120,6 +120,10 @@ if they did not contain a question mark. Thanks to Bill de Beaubien for reporting! + + Remove invalid entries in OSGi Manifest. Thanks + to Alexander Kley for the fix! +