--- a/pom.xml
+++ b/pom.xml
@@ -14,9 +14,10 @@
         <osgi.scope>provided</osgi.scope>
 
         <compiler.version>1.7</compiler.version>
-        <!--<springframework.version>2.5.6.SEC03</springframework.version>-->
         <springframework.version>3.2.3.RELEASE</springframework.version>
         <osgi.version>4.3.1</osgi.version>
+        <jettison.version>1.3.4</jettison.version>
+        <jcraft.version>0.1.41</jcraft.version>
         <maven-bundle-plugin.version>2.4.0</maven-bundle-plugin.version>
         <t2.core.version>1.4</t2.core.version>
         <t2.ui.api.version>1.4</t2.ui.api.version>
@@ -65,16 +66,17 @@
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>1.3.4</version>
+            <version>${jettison.version}</version>
             <scope>${osgi.scope}</scope>
         </dependency>
 
        <dependency>
             <groupId>com.jcraft.jsch</groupId>
             <artifactId>com.springsource.com.jcraft.jsch</artifactId>
-            <version>0.1.41</version>
-            <scope>${osgi.scope}</scope>
-        </dependency>
+            <version>${jcraft.version}</version>
+            <!--<scope>${osgi.scope}</scope>-->
+           <!-- is it provided -->
+       </dependency>
         <!-- END OSGi relevant dependencies -->
 
         <dependency>
@@ -415,17 +417,7 @@
 
     <build>
 
-        <!-- copy property file -->
-        <resources>
-            <resource>
-                <directory>.</directory>
-                <includes>
-                    <include>TavernaExtractor.properties</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
+       <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -480,23 +472,17 @@
                         </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)"-->
+                                    com.jcraft.jsch,
+                                    org.codehaus.jettison
                                 </Import-Package>
-                                <Private-Package>net.timbusproject.extractors.modules.tavernaextractor</Private-Package>
+                                <Export-Package>
+                                    net.timbusproject.extractors.modules.tavernaextractor.TavernaExtractorOSGi
+                                </Export-Package>
+                                <Private-Package>net.timbusproject.extractors.modules.tavernaextractor.*</Private-Package>
                                 <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
                                 <Embed-Directory>OSGI-INF/lib</Embed-Directory>
                                 <Embed-Transitive>true</Embed-Transitive>
@@ -523,6 +509,14 @@
                 <packaging.name>TavernaExtractor</packaging.name>
             </properties>
             <build>
+                <resources>
+                    <resource>
+                        <directory>.</directory>
+                        <includes>
+                            <include>TavernaExtractor.properties</include>
+                        </includes>
+                    </resource>
+                </resources>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>