diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..b514d8b
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,5 @@
+-conditionalpackage: org.apache.felix.configurator.impl.json,\\
+                     org.apache.felix.configurator.impl.model,\\
+                     org.apache.felix.utils.collections,\\
+                     org.apache.felix.utils.resource,\\
+                     org.apache.felix.utils.version
diff --git a/pom.xml b/pom.xml
index 4c0453e..75efa17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,14 +16,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>34</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>35</version>
         <relativePath/>
     </parent>
 
     <artifactId>org.apache.sling.feature.io</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <version>1.2.0-SNAPSHOT</version>
 
     <name>Apache Sling Feature IO Module</name>
     <description>
@@ -44,22 +43,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Conditional-Package>
-                            org.apache.felix.configurator.impl.json,
-                            org.apache.felix.configurator.impl.model,
-                            org.apache.felix.utils.collections,
-                            org.apache.felix.utils.resource,
-                            org.apache.felix.utils.version
-                        </Conditional-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
                 <configuration>
@@ -153,13 +136,17 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.annotation.versioning</artifactId>
-            <version>1.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
-            <version>6.0.0</version>
+            <artifactId>org.osgi.framework</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.resource</artifactId>
+            <version>1.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>