You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2012/01/25 18:06:11 UTC

svn commit: r1235826 [2/3] - in /servicemix/smx4/bundles/trunk: ./ javassist-3.11.0.GA/ javassist-3.12.0.GA/ javassist-3.12.1.GA/ javassist-3.9.0.GA/ javax-inject-1/ javax-mail-1.4.1/ jaxb-impl-2.1.12/ jaxb-impl-2.1.13/ jaxb-impl-2.2.1/ jaxb-impl-2.2.4...

Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +34,8 @@
     <version>6.1.22_5-SNAPSHOT</version>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps jetty, jetty-util, jetty-management, jetty-client, and jetty-sslengine
-        ${pkgVersion} jar files.</description>
+        ${pkgVersion} jar files.
+    </description>
 
     <properties>
         <pkgGroupId>org.mortbay.jetty</pkgGroupId>
@@ -42,7 +44,6 @@
         <artifactVersion>6.1.22</artifactVersion>
         <servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.mortbay*,
             javax.mail,
             javax.management,
             javax.management.loading,
@@ -110,16 +111,58 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
-    </dependencies>
 
-    <repositories>
-        <!-- ServiceMix repo -->
-        <repository>
-            <id>servicemix</id>
-            <name>Apache ServiceMix Repository</name>
-            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
-        </repository>
-    </repositories>
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-management</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-sslengine</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-client</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-naming</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-plus</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
@@ -197,4 +240,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.24/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.24/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.24/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.24/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -17,31 +18,31 @@
         See the License for the specific language governing permissions and
         limitations under the License.
     -->
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
     <packaging>bundle</packaging>
     <version>6.1.24_5-SNAPSHOT</version>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps jetty, jetty-util, jetty-management, jetty-client, and jetty-sslengine
-        ${pkgVersion} jar files.</description>
-    
+        ${pkgVersion} jar files.
+    </description>
+
     <properties>
         <pkgGroupId>org.mortbay.jetty</pkgGroupId>
         <pkgArtifactId>jetty</pkgArtifactId>
         <pkgVersion>6.1.24</pkgVersion>
         <servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.mortbay,
             javax.mail,
             javax.management,
             javax.management.loading,
@@ -65,7 +66,7 @@
             org.xml.sax.helpers
         </servicemix.osgi.import.pkg>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -109,8 +110,59 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-management</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-sslengine</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-client</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-naming</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jetty-plus</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -187,4 +239,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jetty-cometd-6.1.11/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-cometd-6.1.11/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-cometd-6.1.11/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-cometd-6.1.11/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -39,13 +40,11 @@
         <pkgArtifactId>cometd-bayeux</pkgArtifactId>
         <pkgVersion>6.1.11</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.mortbay.cometd*,
-            !dojox.cometd,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            org.mortbay.cometd*;version=${pkgVersion},
-            dojox.cometd;version=${pkgVersion}
+            org.mortbay.cometd*;version=${pkgVersion};-split-package:=merge-first,
+            dojox.cometd;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
     </properties>
 
@@ -56,6 +55,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -91,4 +101,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jetty-cometd-6.1.22/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-cometd-6.1.22/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-cometd-6.1.22/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-cometd-6.1.22/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -41,13 +41,11 @@
         <pkgVersion>6.1.22</pkgVersion>
         <cometdApiVersion>1.0.1</cometdApiVersion>
         <servicemix.osgi.import.pkg>
-            !org.mortbay.cometd*,
-            !org.cometd*,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            org.mortbay.cometd*;version=${pkgVersion},
-            org.cometd;version=${cometdApiVersion}
+            org.mortbay.cometd*;version=${pkgVersion};-split-package:=merge-first,
+            org.cometd;version=${cometdApiVersion};-split-package:=merge-first
         </servicemix.osgi.export>
     </properties>
 
@@ -56,11 +54,29 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
             <artifactId>cometd-api</artifactId>
             <version>${cometdApiVersion}</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-api</artifactId>
+            <version>${cometdApiVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
@@ -104,4 +120,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jetty-cometd-6.1.26/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-cometd-6.1.26/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-cometd-6.1.26/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-cometd-6.1.26/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -44,8 +44,8 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            org.mortbay.cometd*;version=${pkgVersion},
-            org.cometd;version=${cometdApiVersion}
+            org.mortbay.cometd*;version=${pkgVersion};-split-package:=merge-first,
+            org.cometd;version=${cometdApiVersion};-split-package:=merge-first
         </servicemix.osgi.export>
     </properties>
 
@@ -54,11 +54,29 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
             <artifactId>cometd-api</artifactId>
             <version>${cometdApiVersion}</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-api</artifactId>
+            <version>${cometdApiVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/bundles/trunk/jexcelapi-2.4.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jexcelapi-2.4.2/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jexcelapi-2.4.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jexcelapi-2.4.2/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -50,6 +51,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -85,4 +97,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jibx-1.1.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jibx-1.1.3/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jibx-1.1.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jibx-1.1.3/pom.xml Wed Jan 25 17:06:09 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
     
@@ -42,7 +42,6 @@
             org.jibx
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.jibx*,
             org.dom4j*;version="[1.6,2)",
             org.xmlpull*;version="[1.1.3.1,2)",
             *
@@ -82,6 +81,31 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jibx-bind</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jibx-extras</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>jibx-run</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
     
     <build>
@@ -131,4 +155,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jibx-1.2.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jibx-1.2.2/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jibx-1.2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jibx-1.2.2/pom.xml Wed Jan 25 17:06:09 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -43,7 +43,6 @@
             org.jibx
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.jibx*,
             javax.xml*,
             org.apache.bcel*;version="[5.0.0,6)",
             org.dom4j*;version="[1.6,2)",
@@ -76,6 +75,31 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-bind</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-extras</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-run</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -125,4 +149,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jing-20030619/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jing-20030619/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jing-20030619/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jing-20030619/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -42,7 +43,6 @@
             com.thaiopensource
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.thaiopensource*,
             com.icl.saxon;resolution:=optional,
             org.apache.xalan*;resolution:=optional,
             org.apache.xerces*;resolution:=optional,
@@ -59,6 +59,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -94,4 +103,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/joda-time-1.5.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/joda-time-1.5.2/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/joda-time-1.5.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/joda-time-1.5.2/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -42,7 +43,6 @@
             org.joda.time
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.joda.time*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -54,6 +54,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jopt-simple-4.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jopt-simple-4.3/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jopt-simple-4.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jopt-simple-4.3/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You under the Apache License, Version 2.0
+        (the "License"); you may not use this file except in compliance with
+        the License.  You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    -->
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -31,7 +32,6 @@
     <artifactId>org.apache.servicemix.bundles.jopt-simple</artifactId>
     <packaging>bundle</packaging>
     <version>4.3_1-SNAPSHOT</version>
-
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps jopt-simple ${pkgVersion} jar file.</description>
 
@@ -39,11 +39,11 @@
         <pkgGroupId>net.sf.jopt-simple</pkgGroupId>
         <pkgArtifactId>jopt-simple</pkgArtifactId>
         <pkgVersion>4.3</pkgVersion>
-        <servicemix.osgi.export>
-            joptsimple*;version=${pkgVersion};-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            joptsimple
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !joptsimple*
+
         </servicemix.osgi.import.pkg>
     </properties>
 
@@ -54,6 +54,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

Modified: servicemix/smx4/bundles/trunk/josql-1.5/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/josql-1.5/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/josql-1.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/josql-1.5/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -42,8 +43,7 @@
             org.josql
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.josql*,
-            com.gentlyweb*;resolution:=optional, 
+            com.gentlyweb*;resolution:=optional,
             gnu.regexp*;resolution:=optional,
             javax.servlet*;resolution:=optional,
             javax.swing*;resolution:=optional,
@@ -56,20 +56,19 @@
         </servicemix.osgi.import.pkg>
     </properties>
 
-   <repositories>
-      <repository>
-        <id>open.iona.m2</id>
-        <name>IONA Open Source Community Release Repository</name>
-        <url>http://repo.open.iona.com/maven2</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-        <releases>
-          <enabled>true</enabled>
-        </releases>
-      </repository>
+    <repositories>
+        <repository>
+            <id>open.iona.m2</id>
+            <name>IONA Open Source Community Release Repository</name>
+            <url>http://repo.open.iona.com/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
     </repositories>
-     
 
     <dependencies>
         <dependency>
@@ -78,6 +77,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -113,4 +123,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jruby-1.1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jruby-1.1.2/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jruby-1.1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jruby-1.1.2/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <!--
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -71,6 +72,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -106,4 +118,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jruby-1.4.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jruby-1.4.0/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jruby-1.4.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jruby-1.4.0/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -47,24 +48,24 @@
             org.objectweb.asm*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            org.jruby*;version=${pkgVersion};-split-package:=merge-first,
-        </servicemix.osgi.export>
-		<servicemix.osgi.private.pkg>
-			builtin*,
-			com.kenai*,
-			com.martiansoftware.nailgun*,
-			com.sun.jna*,
-			jay.yydebug*,
-			jline*,
-			jni*,
-			jruby*,
-			org.dynalang*,
-			org.jcodings,
-			org.joda.time*,
-			org.joni*,
-			
-		</servicemix.osgi.private.pkg>
+        <servicemix.osgi.export.pkg>
+            org.jruby
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.private.pkg>
+            builtin*,
+            com.kenai*,
+            com.martiansoftware.nailgun*,
+            com.sun.jna*,
+            jay.yydebug*,
+            jline*,
+            jni*,
+            jruby*,
+            org.dynalang*,
+            org.jcodings,
+            org.joda.time*,
+            org.joni*,
+
+        </servicemix.osgi.private.pkg>
     </properties>
 
     <dependencies>
@@ -74,6 +75,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -109,4 +121,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jruby-1.5.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jruby-1.5.2/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jruby-1.5.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jruby-1.5.2/pom.xml Wed Jan 25 17:06:09 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -43,7 +43,6 @@
             org.jruby
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.jruby*,
             javax.management,
             javax.script,
             javax.swing,
@@ -81,6 +80,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -116,4 +126,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jruby-1.5.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jruby-1.5.6/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jruby-1.5.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jruby-1.5.6/pom.xml Wed Jan 25 17:06:09 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -43,7 +43,6 @@
             org.jruby
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.jruby*,
             javax.management,
             javax.script,
             javax.swing,
@@ -81,6 +80,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -116,4 +126,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jsch-0.1.31/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsch-0.1.31/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsch-0.1.31/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsch-0.1.31/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -21,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-	    <groupId>org.apache.servicemix.bundles</groupId>
-	    <artifactId>bundles-pom</artifactId>
-	    <version>6</version>
-       <relativePath>../bundles-pom/pom.xml</relativePath>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>bundles-pom</artifactId>
+        <version>8-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -39,12 +40,11 @@
         <pkgArtifactId>jsch</pkgArtifactId>
         <pkgVersion>0.1.31</pkgVersion>
         <servicemix.osgi.export.pkg>
-           com.jcraft.jsch
+            com.jcraft.jsch
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-           !com.jcraft.jsch*,
-           com.jcraft.jzlib;resolution:=optional,
-           *
+            com.jcraft.jzlib;resolution:=optional,
+            *
         </servicemix.osgi.import.pkg>
     </properties>
 
@@ -55,6 +55,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -90,4 +99,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jsch-0.1.42/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsch-0.1.42/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsch-0.1.42/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsch-0.1.42/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
     
@@ -43,7 +43,6 @@
             com.jcraft.jsch
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.jcraft.jsch*,
             com.jcraft.jzlib;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
@@ -56,6 +55,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
     
     <build>
@@ -91,4 +99,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jsch-0.1.43/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsch-0.1.43/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsch-0.1.43/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsch-0.1.43/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
     
@@ -43,25 +43,10 @@
             com.jcraft.jsch
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.jcraft.jsch*,
             com.jcraft.jzlib;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>
-    
-    <repositories>
-      <repository>
-        <id>fusesource.m2all</id>
-        <name>Fusesource Release Repository</name>
-        <url>http://repo.fusesource.com/maven2-all</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-        <releases>
-          <enabled>true</enabled>
-        </releases>
-      </repository>
-    </repositories>
 
     <dependencies>
         <dependency>
@@ -70,6 +55,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
     
     <build>
@@ -105,4 +99,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jsch-0.1.44/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsch-0.1.44/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsch-0.1.44/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsch-0.1.44/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>        
     </parent>
 
@@ -43,20 +43,20 @@
             com.jcraft.jsch
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.jcraft.jsch*,
             com.jcraft.jzlib;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>
 
+    <!--
     <repositories>
-        <!-- jsch 0.1.44 is not in central repo -->
         <repository>
             <id>servicemix-m2-repo</id>
             <name>Servicemix Maven2 Repository</name>
             <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
         </repository>
     </repositories>
+    -->
 
     <dependencies>
         <dependency>
@@ -65,6 +65,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -100,4 +109,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jsch-0.1.45/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsch-0.1.45/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsch-0.1.45/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsch-0.1.45/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -55,6 +55,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

Modified: servicemix/smx4/bundles/trunk/jsendnsca-core-1.3.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsendnsca-core-1.3.1/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsendnsca-core-1.3.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsendnsca-core-1.3.1/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
     
@@ -43,7 +43,6 @@
             com.googlecode.jsendnsca
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.googlecode.jsendnsca*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -55,8 +54,19 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
-    
+
     <repositories>
         <repository>
             <id>fusesource.m2-all</id>
@@ -99,4 +109,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jsmpp-2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsmpp-2.0/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsmpp-2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsmpp-2.0/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -42,7 +44,6 @@
             org.jsmpp
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.jsmpp*,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
@@ -56,29 +57,32 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
+
     <repositories>
-         <!-- ServiceMix repo -->
-       <repository>
-           <id>servicemix</id>
-           <name>Apache ServiceMix Repository</name>
-           <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
-           <releases>
-               <enabled>true</enabled>
-           </releases>
-           <snapshots>
-               <enabled>false</enabled>
-           </snapshots>
-       </repository>
+        <repository>
+            <id>servicemix</id>
+            <name>Apache ServiceMix Repository</name>
+            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>
-    <pluginRepositories>
-      <!-- ServiceMix repo -->
-      <pluginRepository>
-          <id>servicemix</id>
-          <name>Apache ServiceMix Repository</name>
-          <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
-      </pluginRepository>
-    </pluginRepositories>    
 
     <build>
         <plugins>
@@ -113,4 +117,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jsmpp-2.1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsmpp-2.1.0/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsmpp-2.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsmpp-2.1.0/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -42,8 +44,7 @@
             org.jsmpp
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.jsmpp*,
-	    org.testng*;resolution:=optional,
+            org.testng*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
@@ -57,29 +58,30 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
+
     <repositories>
-         <!-- ServiceMix repo -->
-       <repository>
-           <id>servicemix</id>
-           <name>Apache ServiceMix Repository</name>
-           <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
-           <releases>
-               <enabled>true</enabled>
-           </releases>
-           <snapshots>
-               <enabled>false</enabled>
-           </snapshots>
-       </repository>
+        <repository>
+            <id>servicemix</id>
+            <name>Apache ServiceMix Repository</name>
+            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>
-    <pluginRepositories>
-      <!-- ServiceMix repo -->
-      <pluginRepository>
-          <id>servicemix</id>
-          <name>Apache ServiceMix Repository</name>
-          <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
-      </pluginRepository>
-    </pluginRepositories>    
 
     <build>
         <plugins>
@@ -114,4 +116,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/json-20090211/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/json-20090211/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/json-20090211/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/json-20090211/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -26,13 +24,13 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.json</artifactId>
-    <version>20090211_1-SNAPSHOT</version>
+    <version>20090211_2-SNAPSHOT</version>
 
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
@@ -42,11 +40,10 @@
         <pkgGroupId>org.json</pkgGroupId>
         <pkgArtifactId>json</pkgArtifactId>
         <pkgVersion>20090211</pkgVersion>
-        <servicemix.osgi.export>
-            org.json*;version=${pkgVersion}
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.json
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.json*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -58,6 +55,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -93,4 +101,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/jsoup-1.5.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsoup-1.5.2/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsoup-1.5.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsoup-1.5.2/pom.xml Wed Jan 25 17:06:09 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -43,7 +43,7 @@
             org.jsoup
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.jsoup*
+
         </servicemix.osgi.import.pkg>
     </properties>
 
@@ -54,6 +54,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/jsr305-1.3.9/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsr305-1.3.9/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsr305-1.3.9/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsr305-1.3.9/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -40,14 +41,15 @@
         <pkgVersion>1.1.0</pkgVersion>
         <jsr305.version>1.3.9</jsr305.version>
         <servicemix.osgi.export.pkg>
-             javax.annotation;version="1.1.0",
-             javax.annotation.concurren;version="1.1.0",
-             javax.annotation.meta;version="1.1.0"
+             javax.annotation;version="1.1.0";-split-package:=merge-first,
+             javax.annotation.concurren;version="1.1.0";-split-package:=merge-first,
+             javax.annotation.meta;version="1.1.0";-split-package:=merge-first
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-             !javax.annotation*
+
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
+
         </servicemix.osgi.private.pkg>
     </properties>
 
@@ -56,7 +58,19 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${jsr305.version}</version>
+            <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${jsr305.version}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -92,4 +106,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jstl-1.1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jstl-1.1.2/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jstl-1.1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jstl-1.1.2/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
     
@@ -44,15 +44,11 @@
             org.apache.taglibs.standard*;version=${pkgVersion};-split-package=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import>
-            !javax.servlet.jsp.jstl*,
-            !org.apache.taglibs.standard*,
             org.apache.xalan*;resolution:=optional,
             org.apache.xml*;resolution:=optional,
             org.apache.xpath*;resolution:=optional,
             *
         </servicemix.osgi.import>
-        <servicemix.osgi.private>
-        </servicemix.osgi.private>
     </properties>
     
     <dependencies>
@@ -68,6 +64,22 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
     
     <build>
@@ -110,4 +122,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -42,7 +43,7 @@
             de.odysseus.el
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !de.odysseus.el*,*
+            *
         </servicemix.osgi.import.pkg>
     </properties>
 
@@ -53,6 +54,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -88,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/juel-2.1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/juel-2.1.2/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/juel-2.1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/juel-2.1.2/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -42,7 +43,6 @@
             de.odysseus.el
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !de.odysseus.el*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -54,6 +54,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/junit-3.8.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/junit-3.8.2/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/junit-3.8.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/junit-3.8.2/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -38,11 +39,10 @@
         <pkgGroupId>junit</pkgGroupId>
         <pkgArtifactId>junit</pkgArtifactId>
         <pkgVersion>3.8.2</pkgVersion>
-        <servicemix.osgi.export>
-            junit*;version=${pkgVersion}
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            junit
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !junit*,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
@@ -57,6 +57,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -92,4 +101,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/junit-4.10/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/junit-4.10/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/junit-4.10/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/junit-4.10/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -39,21 +40,13 @@
         <pkgArtifactId>junit</pkgArtifactId>
         <pkgVersion>4.10</pkgVersion>
         <servicemix.osgi.export>
-            org.hamcrest*;version="1.1",
+            org.hamcrest*;version="1.1";-split-package:=merge-first,
             org.junit*;version=${pkgVersion};-split-package:=merge-first,
             junit*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !org.hamcrest,
-            !org.junit*,
-            !junit*
             *
         </servicemix.osgi.import.pkg>
-        <!--
-        <servicemix.osgi.private.pkg>
-            org.hamcrest*
-        </servicemix.osgi.private.pkg>
-        -->
     </properties>
 
     <dependencies>
@@ -63,6 +56,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

Modified: servicemix/smx4/bundles/trunk/junit-4.7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/junit-4.7/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/junit-4.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/junit-4.7/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -21,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-	    <groupId>org.apache.servicemix.bundles</groupId>
-	    <artifactId>bundles-pom</artifactId>
-	    <version>6</version>
-       <relativePath>../bundles-pom/pom.xml</relativePath>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>bundles-pom</artifactId>
+        <version>8-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -39,21 +40,13 @@
         <pkgArtifactId>junit</pkgArtifactId>
         <pkgVersion>4.7</pkgVersion>
         <servicemix.osgi.export>
-            org.hamcrest*;version="1.1",
+            org.hamcrest*;version="1.1";-split-package:=merge-first,
             org.junit*;version=${pkgVersion};-split-package:=merge-first,
             junit*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !org.hamcrest,
-            !org.junit*,
-            !junit*
             *
         </servicemix.osgi.import.pkg>
-        <!--
-        <servicemix.osgi.private.pkg>
-            org.hamcrest*
-        </servicemix.osgi.private.pkg>
-        -->
     </properties>
 
     <dependencies>
@@ -63,6 +56,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -98,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/junit-4.9/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/junit-4.9/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/junit-4.9/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/junit-4.9/pom.xml Wed Jan 25 17:06:09 2012
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -21,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-	    <groupId>org.apache.servicemix.bundles</groupId>
-	    <artifactId>bundles-pom</artifactId>
-	    <version>6</version>
-       <relativePath>../bundles-pom/pom.xml</relativePath>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>bundles-pom</artifactId>
+        <version>8-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -43,16 +44,8 @@
             junit*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !org.hamcrest,
-            !org.junit*,
-            !junit*
             *
         </servicemix.osgi.import.pkg>
-        <!--
-        <servicemix.osgi.private.pkg>
-            org.hamcrest*
-        </servicemix.osgi.private.pkg>
-        -->
     </properties>
 
     <dependencies>
@@ -68,6 +61,22 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>junit</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>junit-dep</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -110,4 +119,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/jzlib-1.0.7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jzlib-1.0.7/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jzlib-1.0.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jzlib-1.0.7/pom.xml Wed Jan 25 17:06:09 2012
@@ -24,8 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>8-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -40,10 +40,10 @@
         <pkgArtifactId>jzlib</pkgArtifactId>
         <pkgVersion>1.0.7</pkgVersion>
         <servicemix.osgi.export.pkg>
-           com.jcraft.jzlib*;version="${pkgVersion}" 
+           com.jcraft.jzlib
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-           !com.jcraft.jzlib*
+
         </servicemix.osgi.import.pkg>
     </properties>
 
@@ -54,6 +54,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/kxml2-2.3.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/kxml2-2.3.0/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/kxml2-2.3.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/kxml2-2.3.0/pom.xml Wed Jan 25 17:06:09 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -40,10 +40,9 @@
         <pkgArtifactId>kxml2</pkgArtifactId>
         <pkgVersion>2.3.0</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.kxml2*
+            org.kxml2
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.kxml2*,
             org.xmlpull.v1;version:="[1,2)"
         </servicemix.osgi.import.pkg>
     </properties>
@@ -55,6 +54,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -90,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/libthrift-0.7.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/libthrift-0.7.0/pom.xml?rev=1235826&r1=1235825&r2=1235826&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/libthrift-0.7.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/libthrift-0.7.0/pom.xml Wed Jan 25 17:06:09 2012
@@ -39,14 +39,13 @@
         <pkgGroupId>org.apache.thrift</pkgGroupId>
         <pkgArtifactId>libthrift</pkgArtifactId>
         <pkgVersion>0.7.0</pkgVersion>
-        <servicemix.osgi.export>
-            org.apache.thrift*;version="${pkgVersion}";-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.apache.thrift
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.thrift*,
             org.apache.http*;version="[4,5)",
             org.apache.commons.lang*;version="[2,3)",
-            org.slf4j*;version="[1.4,2)",
+            org.slf4j*;version="[1.4,2)";resolution:=optional,
             javax.net*,
             javax.security*,
             javax.servlet*;resolution:=optional,
@@ -61,6 +60,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -94,4 +104,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>