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/27 17:32:24 UTC

svn commit: r1236741 [2/4] - in /servicemix/smx4/bundles/trunk: ./ mina-1.1.7/ mongodb-2.3/ mvel-1.3.12/ mvel-1.3.16/ mvel-2.0.18/ mvel-2.0.8/ mybatis-3.0.2/ mybatis-3.0.4/ neethi-2.0.4/ netty-3.2.3.Final/ netty-3.2.4.Final/ netty-3.2.5.Final/ netty-3....

Modified: servicemix/smx4/bundles/trunk/protobuf-2.4.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/protobuf-2.4.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/protobuf-2.4.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/protobuf-2.4.1/pom.xml Fri Jan 27 16:32:20 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">
 
     <!--
 
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-      <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>bundles-pom</artifactId>
-      <version>8-SNAPSHOT</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>
@@ -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/qdox-1.5/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/qdox-1.5/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/qdox-1.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/qdox-1.5/pom.xml Fri Jan 27 16:32:20 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 @@
             com.thoughtworks.qdox
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.thoughtworks.qdox*,
             junit*;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/qpid-0.12/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/qpid-0.12/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/qpid-0.12/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/qpid-0.12/pom.xml Fri Jan 27 16:32:20 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.apache.qpid
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.qpid,
             edu.emory.mathcs.backport.java.util.concurrent;resolution:=optional,
             javax.jms*;version="[1.1,2)",
             javax.naming*,
@@ -56,6 +55,7 @@
         </servicemix.osgi.import.pkg>
     </properties>
 
+    <!--
     <repositories>
         <repository>
             <id>smx.m2</id>
@@ -63,6 +63,7 @@
             <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
         </repository>
     </repositories>
+    -->
 
     <dependencies>
         <dependency>
@@ -77,6 +78,22 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-common</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-client</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -120,4 +137,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/qpid-0.5.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/qpid-0.5.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/qpid-0.5.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/qpid-0.5.0/pom.xml Fri Jan 27 16:32:20 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,9 +39,10 @@
         <pkgGroupId>org.apache.qpid</pkgGroupId>
         <pkgArtifactId>qpid</pkgArtifactId>
         <pkgVersion>0.5.0</pkgVersion>
-        <servicemix.osgi.export.pkg>org.apache.qpid</servicemix.osgi.export.pkg>
+        <servicemix.osgi.export.pkg>
+            org.apache.qpid
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.qpid*,
             edu.emory.mathcs.backport.java.util.concurrent*;resolution:=optional,
             javax.jms*;version="[1.1,2)",
             org.apache.commons.collections*;version="[3.2,4)",
@@ -63,6 +65,24 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>qpid-client</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>qpid-common</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <repositories>
@@ -70,7 +90,7 @@
             <id>open.iona.m2-all</id>
             <name>IONA All Dependency Repository</name>
             <url>http://repo.open.iona.com/maven2-all</url>
-        </repository>     
+        </repository>
     </repositories>
 
     <build>
@@ -114,4 +134,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/qpid-0.6.0/pom.xml Fri Jan 27 16:32:20 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.apache.qpid
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.qpid*,
             edu.emory.mathcs.backport.java.util.concurrent*;resolution:=optional,
             javax.jms*;version="[1.1,2)",
             javax.naming*,
@@ -79,6 +78,24 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-client</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-common</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -122,4 +139,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/qpid-0.8.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/qpid-0.8.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/qpid-0.8.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/qpid-0.8.0/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -86,6 +86,31 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-common</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-client</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-broker</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -136,4 +161,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-1.6.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-1.6.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-1.6.1/pom.xml Fri Jan 27 16:32:20 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,7 +40,6 @@
         <pkgArtifactId>quartz</pkgArtifactId>
         <pkgVersion>1.6.1</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.quartz*,
             javax.ejb*;resolution:=optional;version="[3,4)",
             javax.jms*;resolution:=optional;version="[1.1,2)",
             javax.mail*;resolution:=optional;version="[1.4,2)",
@@ -67,6 +67,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>
@@ -102,4 +113,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-1.6.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-1.6.6/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-1.6.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-1.6.6/pom.xml Fri Jan 27 16:32:20 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>
@@ -33,7 +34,7 @@
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-    
+
     <repositories>
         <repository>
             <id>fusesource.maven2-all</id>
@@ -52,7 +53,6 @@
         <pkgArtifactId>quartz</pkgArtifactId>
         <pkgVersion>1.6.6</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.quartz*,
             javax.ejb*;resolution:=optional;version="[3,4)",
             javax.jms*;resolution:=optional;version="[1.1,2)",
             javax.mail*;resolution:=optional;version="[1.4,2)",
@@ -79,6 +79,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>
@@ -114,4 +125,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-1.8.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-1.8.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-1.8.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-1.8.1/pom.xml Fri Jan 27 16:32:20 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,7 +40,6 @@
         <pkgArtifactId>quartz</pkgArtifactId>
         <pkgVersion>1.8.1</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.quartz*,
             javax.ejb*;resolution:=optional;version="[3,4)",
             javax.jms*;resolution:=optional;version="[1.1,2)",
             javax.mail*;resolution:=optional;version="[1.4,2)",
@@ -67,6 +66,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>
@@ -102,4 +110,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-1.8.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-1.8.2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-1.8.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-1.8.2/pom.xml Fri Jan 27 16:32:20 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,7 +40,6 @@
         <pkgArtifactId>quartz</pkgArtifactId>
         <pkgVersion>1.8.2</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.quartz*,
             javax.ejb*;resolution:=optional;version="[3,4)",
             javax.jms*;resolution:=optional;version="[1.1,2)",
             javax.mail*;resolution:=optional;version="[1.4,2)",
@@ -67,6 +66,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>
@@ -102,4 +110,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-1.8.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-1.8.3/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-1.8.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-1.8.3/pom.xml Fri Jan 27 16:32:20 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,7 +40,6 @@
         <pkgArtifactId>quartz</pkgArtifactId>
         <pkgVersion>1.8.3</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.quartz*,
             javax.ejb*;resolution:=optional;version="[3,4)",
             javax.jms*;resolution:=optional;version="[1.1,2)",
             javax.mail*;resolution:=optional;version="[1.4,2)",
@@ -67,6 +66,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>
@@ -102,4 +110,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-1.8.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-1.8.4/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-1.8.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-1.8.4/pom.xml Fri Jan 27 16:32:20 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.quartz
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.quartz*,
             javax.ejb*;resolution:=optional;version="[3,4)",
             javax.jms*;resolution:=optional;version="[1.1,2)",
             javax.mail*;resolution:=optional;version="[1.4,2)",
@@ -68,6 +67,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>
@@ -103,4 +111,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-1.8.5/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-1.8.5/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-1.8.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-1.8.5/pom.xml Fri Jan 27 16:32:20 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.quartz
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.quartz*,
             javax.ejb*;resolution:=optional;version="[3,4)",
             javax.jms*;resolution:=optional;version="[1.1,2)",
             javax.mail*;resolution:=optional;version="[1.4,2)",
@@ -68,6 +67,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>
@@ -103,4 +111,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-2.0.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-2.0.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-2.0.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-2.0.1/pom.xml Fri Jan 27 16:32:20 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.quartz
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.quartz*,
             javax.ejb*;resolution:=optional;version="[3,4)",
             javax.jms*;resolution:=optional;version="[1.1,2)",
             javax.mail*;resolution:=optional;version="[1.4,2)",
@@ -69,6 +68,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>
@@ -104,4 +112,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-2.1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-2.1.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-2.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-2.1.0/pom.xml Fri Jan 27 16:32:20 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.quartz
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.quartz*,
             javax.ejb*;resolution:=optional;version="[3,4)",
             javax.jms*;resolution:=optional;version="[1.1,2)",
             javax.mail*;resolution:=optional;version="[1.4,2)",
@@ -69,6 +68,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>
@@ -104,4 +112,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quartz-2.1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-2.1.2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-2.1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-2.1.2/pom.xml Fri Jan 27 16:32:20 2012
@@ -68,6 +68,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/quickfix-1.5.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quickfix-1.5.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quickfix-1.5.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quickfix-1.5.0/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -44,8 +44,6 @@
             quickfix*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !org.quickfixj*,
-            !quickfix*,
             com.sleepycat*;resolution:=optional,
             javax.management*,
             javax.naming*,
@@ -76,6 +74,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>
@@ -111,4 +120,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/quickfix-1.5.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quickfix-1.5.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quickfix-1.5.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quickfix-1.5.1/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -44,8 +44,6 @@
             quickfix*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !org.quickfixj*,
-            !quickfix*,
             com.sleepycat*;resolution:=optional,
             javax.management*,
             javax.naming*,
@@ -69,6 +67,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>
 
     <repositories>
@@ -112,4 +121,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/regexp-1.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/regexp-1.3/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/regexp-1.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/regexp-1.3/pom.xml Fri Jan 27 16:32:20 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.apache.regexp
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.regexp*,
             *
         </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>

Modified: servicemix/smx4/bundles/trunk/restlet-1.1.10/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/restlet-1.1.10/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/restlet-1.1.10/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/restlet-1.1.10/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -44,8 +44,6 @@
             com.noelios.restlet*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !org.restlet*,
-            !com.noelios.restlet*,
             javax.crypto*,
             javax.net*,
             javax.security*,
@@ -77,6 +75,22 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>org.restlet</groupId>
+            <artifactId>org.restlet</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.noelios.restlet</groupId>
+            <artifactId>com.noelios.restlet</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -120,4 +134,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/rhino-1.7-R1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/rhino-1.7-R1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/rhino-1.7-R1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/rhino-1.7-R1/pom.xml Fri Jan 27 16:32:20 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,7 +40,6 @@
         <pkgArtifactId>js</pkgArtifactId>
         <pkgVersion>1.7R1</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.mozilla*,
             javax.swing*;resolution:=optional,
             javax.xml*;resolution:=optional,
             org.apache.xmlbeans*;resolution:=optional,
@@ -60,6 +60,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>
@@ -95,4 +104,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/rhino-1.7-R2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/rhino-1.7-R2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/rhino-1.7-R2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/rhino-1.7-R2/pom.xml Fri Jan 27 16:32:20 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,7 +40,6 @@
         <pkgArtifactId>js</pkgArtifactId>
         <pkgVersion>1.7R2</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.mozilla*,
             javax.swing*;resolution:=optional,
             javax.xml*;resolution:=optional,
             org.apache.xmlbeans*;resolution:=optional,
@@ -60,6 +60,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>
@@ -95,4 +104,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/rjc-0.6.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/rjc-0.6.3/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/rjc-0.6.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/rjc-0.6.3/pom.xml Fri Jan 27 16:32:20 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">
     <!--
 
         Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,10 +21,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>
@@ -31,21 +32,18 @@
     <version>0.6.3_2-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
-    </description>
+    <description>This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.</description>
 
     <properties>
         <pkgGroupId>org.idevlab</pkgGroupId>
         <pkgArtifactId>rjc</pkgArtifactId>
         <pkgVersion>0.6.3</pkgVersion>
         <servicemix.osgi.export.pkg>
-             org.idevlab.rjc*
+            org.idevlab.rjc
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.idevlab.rjc*;version=${project.version},
             org.apache.commons.pool;version="[1.4,1.5]",
-            org.slf4j;version="[1.4,1.6]",
+            org.slf4j;version="[1.4,1.6]";resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -57,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>
@@ -92,4 +99,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/rome-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/rome-1.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/rome-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/rome-1.0/pom.xml Fri Jan 27 16:32:20 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>
     
@@ -39,11 +39,10 @@
         <pkgGroupId>rome</pkgGroupId>
         <pkgArtifactId>rome</pkgArtifactId>
         <pkgVersion>1.0</pkgVersion>
-        <servicemix.osgi.export>
-            com.sun.syndication*;version=${pkgVersion};-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            com.sun.syndication
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.sun.syndication*,
             org.jdom;resolution:=optional,
             org.jdom.input;resolution:=optional,
             org.jdom.output;resolution:=optional,
@@ -66,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>
@@ -99,4 +107,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/saaj-impl-1.3.18/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saaj-impl-1.3.18/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saaj-impl-1.3.18/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saaj-impl-1.3.18/pom.xml Fri Jan 27 16:32:20 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">
 
     <!--
 
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-	    <groupId>org.apache.servicemix.bundles</groupId>
-	    <artifactId>bundles-pom</artifactId>
-	    <version>8-SNAPSHOT</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>
@@ -40,7 +40,9 @@
         <pkgArtifactId>saaj-impl</pkgArtifactId>
         <pkgVersion>1.3.18</pkgVersion>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
-        <servicemix.osgi.export.pkg>com.sun.xml.messaging.saaj</servicemix.osgi.export.pkg>
+        <servicemix.osgi.export.pkg>
+            com.sun.xml.messaging.saaj
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !com.sun.xml.messaging.saaj*,
             !com.sun.org.apache.xerces.internal*,
@@ -71,9 +73,9 @@
             com.sun.org.apache.xml.internal.serialize,
             com.sun.xml.internal.stream*,
             com.sun.org.apache.xml.internal.resolver*,
-            com.sun.org.apache.xerces.internal.xinclude, 
+            com.sun.org.apache.xerces.internal.xinclude,
             com.sun.org.apache.xerces.internal.xpointer
-    </servicemix.osgi.private.pkg>
+        </servicemix.osgi.private.pkg>
     </properties>
 
     <dependencies>
@@ -103,10 +105,25 @@
             </exclusions>
         </dependency>
         <dependency>
-		    <groupId>org.apache.servicemix.specs</groupId>
+            <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
             <version>1.9.0</version>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

Modified: servicemix/smx4/bundles/trunk/saaj-impl-1.3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saaj-impl-1.3.2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saaj-impl-1.3.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saaj-impl-1.3.2/pom.xml Fri Jan 27 16:32:20 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>
@@ -38,9 +39,10 @@
         <pkgGroupId>com.sun.xml.messaging.saaj</pkgGroupId>
         <pkgArtifactId>saaj-impl</pkgArtifactId>
         <pkgVersion>1.3.2</pkgVersion>
-        <servicemix.osgi.export.pkg>com.sun.xml.messaging.saaj</servicemix.osgi.export.pkg>
+        <servicemix.osgi.export.pkg>
+            com.sun.xml.messaging.saaj
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.sun.xml.messaging.saaj*,
             com.sun.image.codec.jpeg*;resolution:=optional,
             com.sun.xml.fastinfoset*;resolution:=optional,
             javax.xml.soap,
@@ -68,10 +70,25 @@
             </exclusions>
         </dependency>
         <dependency>
-		    <groupId>org.apache.servicemix.specs</groupId>
+            <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
             <version>1.0.0</version>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -107,4 +124,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/saaj-impl-1.3.9/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saaj-impl-1.3.9/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saaj-impl-1.3.9/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saaj-impl-1.3.9/pom.xml Fri Jan 27 16:32:20 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,7 +40,9 @@
         <pkgArtifactId>saaj-impl</pkgArtifactId>
         <pkgVersion>1.3.9</pkgVersion>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
-        <servicemix.osgi.export.pkg>com.sun.xml.messaging.saaj</servicemix.osgi.export.pkg>
+        <servicemix.osgi.export.pkg>
+            com.sun.xml.messaging.saaj
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !com.sun.xml.messaging.saaj*,
             !com.sun.org.apache.xerces.internal*,
@@ -70,9 +73,9 @@
             com.sun.org.apache.xml.internal.serialize,
             com.sun.xml.internal.stream*,
             com.sun.org.apache.xml.internal.resolver*,
-            com.sun.org.apache.xerces.internal.xinclude, 
+            com.sun.org.apache.xerces.internal.xinclude,
             com.sun.org.apache.xerces.internal.xpointer
-    </servicemix.osgi.private.pkg>
+        </servicemix.osgi.private.pkg>
     </properties>
 
     <dependencies>
@@ -102,10 +105,25 @@
             </exclusions>
         </dependency>
         <dependency>
-		    <groupId>org.apache.servicemix.specs</groupId>
+            <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
             <version>1.0.0</version>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -142,4 +160,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/saxon-9.1.0.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saxon-9.1.0.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saxon-9.1.0.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saxon-9.1.0.1/pom.xml Fri Jan 27 16:32:20 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>
@@ -38,9 +39,10 @@
         <pkgGroupId>net.sf.saxon</pkgGroupId>
         <pkgArtifactId>saxon</pkgArtifactId>
         <pkgVersion>9.1.0.1</pkgVersion>
-        <servicemix.osgi.export.pkg>net.sf.saxon</servicemix.osgi.export.pkg>
+        <servicemix.osgi.export.pkg>
+            net.sf.saxon
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.sf.saxon*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -64,10 +66,34 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon-dom</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon-sql</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <repositories>
-        <!-- ServiceMix repo -->
         <repository>
             <id>servicemix</id>
             <name>Apache ServiceMix Repository</name>
@@ -123,4 +149,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/saxon-9.1.0.8/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saxon-9.1.0.8/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saxon-9.1.0.8/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saxon-9.1.0.8/pom.xml Fri Jan 27 16:32:20 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>
@@ -33,7 +34,8 @@
     <version>9.1.0.8_3-SNAPSHOT</version>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps saxon, saxon-dom, saxon-sql, saxon-xpath, and saxon-xqj
-        ${pkgVersion} jar files.</description>
+        ${pkgVersion} jar files.
+    </description>
 
     <properties>
         <pkgGroupId>net.sf.saxon</pkgGroupId>
@@ -44,7 +46,6 @@
             javax.xml.xquery
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !net.sf.saxon*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -80,10 +81,48 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon-dom</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon-sql</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon-xpath</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon-xqj</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <repositories>
-        <!-- ServiceMix repo -->
         <repository>
             <id>servicemix</id>
             <name>Apache ServiceMix Repository</name>
@@ -153,4 +192,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/saxon-9.3.0.11/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saxon-9.3.0.11/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saxon-9.3.0.11/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saxon-9.3.0.11/pom.xml Fri Jan 27 16:32:20 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">
 
     <!--
 
@@ -33,8 +33,7 @@
     <packaging>bundle</packaging>
     <version>9.3.0.11_1-SNAPSHOT</version>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps saxon he
-        ${pkgVersion} jar files.</description>
+    <description>This OSGi bundle wraps saxon he ${pkgVersion} jar files.</description>
 
     <properties>
         <pkgGroupId>net.sf.saxon</pkgGroupId>
@@ -45,7 +44,6 @@
             javax.xml.xquery
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !net.sf.saxon*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -57,6 +55,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon9he</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <repositories>

Modified: servicemix/smx4/bundles/trunk/saxon-9.4.0.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/saxon-9.4.0.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/saxon-9.4.0.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/saxon-9.4.0.1/pom.xml Fri Jan 27 16:32:20 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,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>saxon9he</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <repositories>

Modified: servicemix/smx4/bundles/trunk/scala-compiler-2.8.0.RC7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-compiler-2.8.0.RC7/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-compiler-2.8.0.RC7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-compiler-2.8.0.RC7/pom.xml Fri Jan 27 16:32:20 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>
@@ -45,8 +46,8 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala.tools*;version=${pkgVersion};-noimport:=true,
-            ch.epfl*;version=${pkgVersion};-noimport:=true
+            scala.tools*;version=${pkgVersion};-split-paclage:=merge-first;-noimport:=true,
+            ch.epfl*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
     </properties>
@@ -58,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,9 +104,4 @@
         </plugins>
     </build>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/smx4/bundles/tags/org.apache.servicemix.bundles.scala-compiler-2.8.0.RC7_1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/smx4/bundles/tags/org.apache.servicemix.bundles.scala-compiler-2.8.0.RC7_1</developerConnection>
-    <url>http://svn.apache.org/viewvc/servicemix/smx4/bundles/tags/org.apache.servicemix.bundles.scala-compiler-2.8.0.RC7_1</url>
-  </scm>
 </project>

Modified: servicemix/smx4/bundles/trunk/scala-compiler-2.8.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-compiler-2.8.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-compiler-2.8.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-compiler-2.8.0/pom.xml Fri Jan 27 16:32:20 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>
@@ -45,8 +46,8 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala.tools*;version=${pkgVersion};-noimport:=true,
-            ch.epfl*;version=${pkgVersion};-noimport:=true
+            scala.tools*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true,
+            ch.epfl*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
     </properties>
@@ -58,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>
@@ -93,4 +103,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/scala-compiler-2.8.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-compiler-2.8.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-compiler-2.8.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-compiler-2.8.1/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -46,8 +46,8 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala.tools*;version=${pkgVersion};-noimport:=true,
-            ch.epfl*;version=${pkgVersion};-noimport:=true
+            scala.tools*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true,
+            ch.epfl*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
     </properties>
@@ -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/scala-compiler-2.9.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-compiler-2.9.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-compiler-2.9.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-compiler-2.9.0/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -46,8 +46,8 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala.tools*;version=${pkgVersion};-noimport:=true,
-            ch.epfl*;version=${pkgVersion};-noimport:=true
+            scala.tools*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true,
+            ch.epfl*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
     </properties>
@@ -59,6 +59,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- source -->
+        <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/scala-compiler-2.9.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-compiler-2.9.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-compiler-2.9.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-compiler-2.9.1/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -47,8 +47,8 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala.tools*;version=${pkgVersion};-noimport:=true,
-            ch.epfl*;version=${pkgVersion};-noimport:=true
+            scala.tools*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true,
+            ch.epfl*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
     </properties>
@@ -60,6 +60,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>
@@ -95,4 +104,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/scala-library-2.8.0.RC7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-library-2.8.0.RC7/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-library-2.8.0.RC7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-library-2.8.0.RC7/pom.xml Fri Jan 27 16:32:20 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,7 +44,7 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala*;version=${pkgVersion};-noimport:=true
+            scala*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
     </properties>
@@ -55,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>
@@ -91,9 +101,4 @@
         </plugins>
     </build>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/smx4/bundles/tags/org.apache.servicemix.bundles.scala-library-2.8.0.RC7_1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/smx4/bundles/tags/org.apache.servicemix.bundles.scala-library-2.8.0.RC7_1</developerConnection>
-    <url>http://svn.apache.org/viewvc/servicemix/smx4/bundles/tags/org.apache.servicemix.bundles.scala-library-2.8.0.RC7_1</url>
-  </scm>
 </project>

Modified: servicemix/smx4/bundles/trunk/scala-library-2.8.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-library-2.8.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-library-2.8.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-library-2.8.0/pom.xml Fri Jan 27 16:32:20 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,7 +44,7 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala*;version=${pkgVersion};-noimport:=true
+            scala*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
     </properties>
@@ -55,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>
@@ -90,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/scala-library-2.8.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-library-2.8.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-library-2.8.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-library-2.8.1/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -44,7 +44,7 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala*;version=${pkgVersion};-noimport:=true                                    
+            scala*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
     </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>

Modified: servicemix/smx4/bundles/trunk/scala-library-2.9.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-library-2.9.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-library-2.9.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-library-2.9.0/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -44,7 +44,7 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala*;version=${pkgVersion};-noimport:=true                                    
+            scala*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
     </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/scala-library-2.9.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scala-library-2.9.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scala-library-2.9.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scala-library-2.9.1/pom.xml Fri Jan 27 16:32:20 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>
 
@@ -44,7 +44,7 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            scala*;version=${pkgVersion};-noimport:=true                                    
+            scala*;version=${pkgVersion};-split-package:=merge-first;-noimport:=true
         </servicemix.osgi.export>
     </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/scalaj-collection-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scalaj-collection-1.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/scalaj-collection-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/scalaj-collection-1.0/pom.xml Fri Jan 27 16:32:20 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,7 @@
             scalaj.collection
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !scalaj.collection,*
+            *
         </servicemix.osgi.import.pkg>
     </properties>
 
@@ -63,9 +63,21 @@
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>scalaj-collection_2.8.0</artifactId>
+            <artifactId>${pkgArtifactId}</artifactId>
             <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>
@@ -82,12 +94,12 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>${pkgGroupId}:scalaj-collection_2.8.0</include>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>${pkgGroupId}:scalaj-collection_2.8.0</artifact>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
                                     <excludes>
                                         <exclude>**</exclude>
                                     </excludes>
@@ -101,4 +113,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file