svn commit: r1693089 - in /tika/trunk/tika-bundle: pom.xml src/test/java/org/apache/tika/bundle/BundleIT.java

[grossws]

Author: grossws
Date: Tue Jul 28 13:00:16 2015
New Revision: 1693089

URL: http://svn.apache.org/r1693089
Log:
Remove junit from OSGi bundle deps

Test dependencies removed from OSGi bundle `Import-Package` manifest header.

Extra integration test by Bob Pailin <b...@apache.org> added to avoid 
regressions
with junit packages included to inappropriate manifest entries.

Fixes TIKA-1524

Modified:
    tika/trunk/tika-bundle/pom.xml
    tika/trunk/tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java

Modified: tika/trunk/tika-bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-bundle/pom.xml?rev=1693089&r1=1693088&r2=1693089&view=diff
==============================================================================
--- tika/trunk/tika-bundle/pom.xml (original)
+++ tika/trunk/tika-bundle/pom.xml Tue Jul 28 13:00:16 2015
@@ -154,6 +154,8 @@
             </Export-Package>
             <Import-Package>
               !org.junit,
+              !org.junit.*,
+              !junit.*,
               !org.apache.ctakes.*,
               !org.apache.uima.*,
               *,
@@ -182,7 +184,6 @@
               javax.xml.stream;version="[1.0,2)";resolution:=optional,
               javax.xml.stream.events;version="[1.0,2)";resolution:=optional,
               javax.xml.stream.util;version="[1.0,2)";resolution:=optional,
-              junit.textui;resolution:=optional,
               net.sf.ehcache;resolution:=optional,
               nu.xom;resolution:=optional,
               opendap.dap.http;resolution:=optional,

Modified: 
tika/trunk/tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java?rev=1693089&r1=1693088&r2=1693089&view=diff
==============================================================================
--- tika/trunk/tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java 
(original)
+++ tika/trunk/tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java 
Tue Jul 28 13:00:16 2015
@@ -18,6 +18,7 @@ package org.apache.tika.bundle;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
@@ -34,6 +35,9 @@ import java.io.Writer;
 import java.net.URISyntaxException;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
 
 import org.apache.tika.Tika;
 import org.apache.tika.detect.DefaultDetector;
@@ -100,6 +104,25 @@ public class BundleIT {
     }
 
 
+    @Test
+    public void testManifestNoJUnit() throws Exception {
+        File TARGET = new File("target");
+        File base = new File(TARGET, "test-bundles");
+        File tikaBundle = new File(base, "tika-bundle.jar");
+
+        JarInputStream jarIs = new JarInputStream(new 
FileInputStream(tikaBundle));
+        Manifest mf = jarIs.getManifest();
+
+        Attributes main = mf.getMainAttributes();
+
+        String importPackage = main.getValue("Import-Package");
+
+        boolean containsJunit = importPackage.contains("junit");
+
+        assertFalse("The bundle should not import junit", containsJunit);
+    }
+
+
     @Test
     public void testBundleDetection() throws Exception {
         Metadata metadataTXT = new Metadata();