diff --git a/scr/pom.xml b/scr/pom.xml
index 9cb2f77..0a19204 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -87,7 +87,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>org.apache.felix.shell</artifactId>
             <version>1.0.0</version>
             <scope>provided</scope>
@@ -149,13 +149,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
+                <version>2.3.4</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-Category>osgi</Bundle-Category>
                         <Bundle-SymbolicName>
-                            ${artifactId}
+                            ${project.artifactId}
                         </Bundle-SymbolicName>
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Bundle-DocURL>
@@ -226,7 +226,7 @@
                             org.osgi.service.metatype;version="[1.1,2)"
                         </DynamicImport-Package>
                         <Embed-Dependency>
-                            kxml2
+                            kxml2;inline=org/kxml2/io/KXmlParser.class|org/xmlpull/v1/XmlPull**
                         </Embed-Dependency>
                     </instructions>
                 </configuration>
@@ -377,13 +377,5 @@
     			<enabled>false</enabled>
     		</snapshots>
     	</repository>
-    	<repository>
-    		<id>aqute</id>
-    		<name>aqute</name>
-    		<url>http://www.aqute.biz/repo</url>
-    		<snapshots>
-    			<enabled>false</enabled>
-    		</snapshots>
-    	</repository>
     </repositories>
 </project>