--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <!--<osgi.scope>compile</osgi.scope>--> <!-- for local packaging -->
+       <!--<osgi.scope>compile</osgi.scope> --><!-- for local packaging -->
         <osgi.scope>provided</osgi.scope>
 
         <compiler.version>1.7</compiler.version>
@@ -60,22 +60,19 @@
             <scope>${osgi.scope}</scope>
         </dependency>
 
-        <!--
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
             <version>1.3.4</version>
             <scope>${osgi.scope}</scope>
         </dependency>
-        -->
-
-        <!--<dependency>
+
+       <dependency>
             <groupId>com.jcraft.jsch</groupId>
             <artifactId>com.springsource.com.jcraft.jsch</artifactId>
             <version>0.1.41</version>
             <scope>${osgi.scope}</scope>
         </dependency>
-        -->
         <!-- END OSGi relevant dependencies -->
 
         <dependency>
@@ -98,12 +95,41 @@
             <scope>${osgi.scope}</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-core</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+
+        <!--
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-extender</artifactId>
+            <version>1.2.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-mock</artifactId>
+            <version>1.2.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-test</artifactId>
+            <version>1.2.1</version>
+            <scope>test</scope>
+        </dependency>
+
        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <version>${springframework.version}</version>
            <scope>${osgi.scope}</scope>
         </dependency>
+        -->
 
         <dependency>
             <groupId>org.springframework</groupId>
@@ -405,6 +431,12 @@
             <groupId>uk.ac.bolton.archimate</groupId>
             <artifactId>editor</artifactId>
             <version>${archimate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${springframework.version}</version>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>
@@ -456,12 +488,21 @@
                 </executions>
                 <configuration>
                     <manifestLocation>META-INF</manifestLocation>
+
+                    <!--
+                     <instructions>
+                        <Import-Package>!org.apache.commons.cli,*</Import-Package>
+                        <Export-Package>net.timbusproject.extractors.modules.linuxhardware.*</Export-Package>
+                        <Exclude-Resource>net/timbusproject/extractors/modules/linuxhardware/local/*</Exclude-Resource>
+                        <Bundle-ClassPath>.,{maven-dependencies}</Bundle-ClassPath>
+                    </instructions>
+                    -->
                     <instructions>
                         <Import-Package>
                             net.timbusproject.extractors.core;version="[0.0,1)",
                             org.osgi.framework;version="[1.6,2)",
-                            javax.naming,
-                            org.springframework.context.*;version="[3.0,4.0)"
+                            <!-- javax.naming,
+                            org.springframework.context.*;version="[3.0,4.0)"-->
                         </Import-Package>
                         <Private-Package>net.timbusproject.extractors.modules.tavernaextractor</Private-Package>
                         <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
@@ -520,9 +561,8 @@
         <repository>
             <id>com.springsource.repository.bundles.release</id>
             <name>EBR Spring Release Repository</name>
-            <url>http:// repository.springsource.com/maven/bundles/release</url>
+            <url>http://repository.springsource.com/maven/bundles/release</url>
         </repository>
-
         <repository>
             <id>com.springsource.repository.bundles.external</id>
             <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
@@ -531,7 +571,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-
         <repository>
             <id>mygrid-repository</id>
             <name>myGrid Repository</name>
@@ -541,7 +580,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-
         <repository>
             <id>snapshots</id>
             <name>Archiva Managed Snapshot Repository</name>
@@ -553,5 +591,9 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>timbus.repository</id>
+            <url>http://timbus.teco.edu/maven</url>
+        </repository>
     </repositories>
 </project>