diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
index b92be215c..0402b600a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
@@ -45,7 +45,18 @@ import java.util.zip.ZipInputStream;
 import org.apache.commons.lang.StringUtils;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
-import org.apache.openjpa.lib.meta.*;
+import org.apache.openjpa.lib.meta.ClassArgParser;
+import org.apache.openjpa.lib.meta.ClasspathMetaDataIterator;
+import org.apache.openjpa.lib.meta.FileMetaDataIterator;
+import org.apache.openjpa.lib.meta.JarFileURLMetaDataIterator;
+import org.apache.openjpa.lib.meta.MetaDataFilter;
+import org.apache.openjpa.lib.meta.MetaDataIterator;
+import org.apache.openjpa.lib.meta.MetaDataParser;
+import org.apache.openjpa.lib.meta.MetaDataSerializer;
+import org.apache.openjpa.lib.meta.ResourceMetaDataIterator;
+import org.apache.openjpa.lib.meta.URLMetaDataIterator;
+import org.apache.openjpa.lib.meta.ZipFileMetaDataIterator;
+import org.apache.openjpa.lib.meta.ZipStreamMetaDataIterator;
 import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml
index 4aa90ad40..2ad9fe00b 100644
--- a/openjpa-lib/pom.xml
+++ b/openjpa-lib/pom.xml
@@ -83,6 +83,7 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>4.2.0</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/OSGiBundleMetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/OSGiBundleMetaDataIterator.java
index 559e32791..5f82cff8d 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/OSGiBundleMetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/OSGiBundleMetaDataIterator.java
@@ -61,8 +61,11 @@ public class OSGiBundleMetaDataIterator implements MetaDataIterator, MetaDataFil
             return true;
         }
 
+<<<<<<< HEAD
 //        if (buf == null && last != null)
 //            _stream.closeEntry();
+=======
+>>>>>>> refs/remotes/origin/2.3.0-osgi_fixed
         last = null;
         buf = null;