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/24 13:40:16 UTC

svn commit: r1235224 [1/2] - in /servicemix/smx4/bundles/trunk: ./ commons-io-1.4/ commons-jexl-1.1/ commons-jxpath-1.2/ commons-lang-2.4/ commons-net-1.4.1/ commons-pool-1.4/ commons-pool-1.5.4/ commons-validator-1.3.1/ commons-vfs-1.0/ dbunit-2.2/ de...

Author: jbonofre
Date: Tue Jan 24 12:40:14 2012
New Revision: 1235224

URL: http://svn.apache.org/viewvc?rev=1235224&view=rev
Log:
[SMX4-919] Resuming inclusion of sources artifact in bundles

Modified:
    servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml
    servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml
    servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
    servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml
    servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml
    servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml
    servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml
    servicemix/smx4/bundles/trunk/commons-validator-1.3.1/pom.xml
    servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml
    servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml
    servicemix/smx4/bundles/trunk/derbynet-10.7.1.1/pom.xml
    servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml
    servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml
    servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml
    servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml
    servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml
    servicemix/smx4/bundles/trunk/dozer-5.3.2/pom.xml
    servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml
    servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml
    servicemix/smx4/bundles/trunk/ehcache-1.6.2/pom.xml
    servicemix/smx4/bundles/trunk/ehcache-2.0.1/pom.xml
    servicemix/smx4/bundles/trunk/ehcache-2.1.1/pom.xml
    servicemix/smx4/bundles/trunk/ehcache-2.2.0/pom.xml
    servicemix/smx4/bundles/trunk/ehcache-2.3.0/pom.xml
    servicemix/smx4/bundles/trunk/ehcache-2.4.3/pom.xml
    servicemix/smx4/bundles/trunk/ehcache-2.5.0/pom.xml
    servicemix/smx4/bundles/trunk/fastinfoset-1.2.12/pom.xml
    servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml
    servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml
    servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml
    servicemix/smx4/bundles/trunk/fop-1.0/pom.xml
    servicemix/smx4/bundles/trunk/freemarker-2.3.15/pom.xml
    servicemix/smx4/bundles/trunk/freemarker-2.3.16/pom.xml
    servicemix/smx4/bundles/trunk/freemarker-2.3.17/pom.xml
    servicemix/smx4/bundles/trunk/freemarker-2.3.18/pom.xml
    servicemix/smx4/bundles/trunk/gae-1.4.3/pom.xml
    servicemix/smx4/bundles/trunk/gae-1.6.1.1/pom.xml
    servicemix/smx4/bundles/trunk/gdata-1.41.1/pom.xml
    servicemix/smx4/bundles/trunk/groovy-1.5.6/pom.xml
    servicemix/smx4/bundles/trunk/groovy-1.6.3/pom.xml
    servicemix/smx4/bundles/trunk/guava-09/pom.xml
    servicemix/smx4/bundles/trunk/guava-10.0.1/pom.xml
    servicemix/smx4/bundles/trunk/guava-10/pom.xml
    servicemix/smx4/bundles/trunk/guava-11.0.1/pom.xml
    servicemix/smx4/bundles/trunk/guava-11/pom.xml
    servicemix/smx4/bundles/trunk/guice-2.0/pom.xml
    servicemix/smx4/bundles/trunk/gwt-dev-2.4.0/pom.xml
    servicemix/smx4/bundles/trunk/gwt-user-2.4.0/pom.xml
    servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-io-1.4/pom.xml Tue Jan 24 12:40:14 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>
@@ -42,7 +43,6 @@
             org.apache.commons.io
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.io*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -52,6 +52,16 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <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>
 
@@ -88,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml Tue Jan 24 12:40:14 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>
@@ -42,8 +43,7 @@
             org.apache.commons.jexl
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.jexl*,
-            org.apache.commons.logging*;version="[1.0,2)",
+            org.apache.commons.logging*;version="[1.0,2)";resolution:=optional,
             junit*;version="[3.8.1,4)";resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
@@ -56,6 +56,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -91,4 +102,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml Tue Jan 24 12:40:14 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>
@@ -42,7 +43,6 @@
             org.apache.commons.jxpath
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.jxpath*,
             javax.servlet*;resolution:=optional;version="[2.2,3)",
             org.apache.commons.beanutils*;version="[1.4,2)",
             org.jdom*;resolution:=optional;version="[1.0,2)",
@@ -56,7 +56,19 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
+            <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -92,4 +104,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml Tue Jan 24 12:40:14 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.apache.commons.lang
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.lang*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -52,6 +52,16 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <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>
 
@@ -88,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml Tue Jan 24 12:40:14 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>
@@ -42,7 +43,6 @@
             org.apache.commons.net
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.net*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -52,6 +52,16 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <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>
 
@@ -88,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml Tue Jan 24 12:40:14 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">
 
     <!--
 
@@ -18,23 +18,23 @@
         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.commons-pool</artifactId>
     <version>1.4_4-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-    
+
     <properties>
         <pkgGroupId>commons-pool</pkgGroupId>
         <pkgArtifactId>commons-pool</pkgArtifactId>
@@ -43,11 +43,10 @@
             org.apache.commons.pool
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.pool*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -55,8 +54,17 @@
             <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>
         <plugins>
             <plugin>
@@ -90,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml Tue Jan 24 12:40:14 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">
 
     <!--
 
@@ -18,23 +18,23 @@
         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.commons-pool</artifactId>
     <version>1.5.4_4-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-    
+
     <properties>
         <pkgGroupId>commons-pool</pkgGroupId>
         <pkgArtifactId>commons-pool</pkgArtifactId>
@@ -43,11 +43,10 @@
             org.apache.commons.pool
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.pool*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -55,8 +54,17 @@
             <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>
         <plugins>
             <plugin>
@@ -90,4 +98,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/commons-validator-1.3.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-validator-1.3.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-validator-1.3.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-validator-1.3.1/pom.xml Tue Jan 24 12:40:14 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.commons.validator
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.validator*,
             org.apache.commons.beanutils;version="[1.8,2)",
             org.apache.commons.collections;version="[3.2,4)",
             org.apache.commons.digester*;version="[1.8,2)",
@@ -60,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>
@@ -95,4 +103,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml Tue Jan 24 12:40:14 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,12 +43,11 @@
             org.apache.commons.vfs
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.vfs*,
             com.jcraft.jsch*;resolution:=optional;version="[0.1.23,2)",
             org.apache.avalon.framework.logger*;resolution:=optional,
             org.apache.commons.collections*;resolution:=optional;version="[3.1,4)",
             org.apache.commons.httpclient*;resolution:=optional;version="[2.0.2,3)",
-            org.apache.commons.logging*;version="[1.0,2)",
+            org.apache.commons.logging*;version="[1.0,2)";resolution:=optional,
             org.apache.commons.net.ftp*;resolution:=optional;version="[1.4.1,2)",
             org.apache.log4j*;resolution:=optional,
             org.apache.tools.ant*;resolution:=optional;version="[1.6.2,2)",
@@ -63,6 +63,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -98,4 +109,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml Tue Jan 24 12:40:14 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.dbunit
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.dbunit*,
             javax.naming,
             javax.sql,
             javax.xml.parsers,
@@ -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>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/derbynet-10.7.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derbynet-10.7.1.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derbynet-10.7.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derbynet-10.7.1.1/pom.xml Tue Jan 24 12:40:14 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.derby
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.derby,
             javax.crypto,
             javax.crypto.interfaces,
             javax.crypto.spec,
@@ -76,6 +75,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -111,4 +121,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derbynet-10.8.1.2/pom.xml Tue Jan 24 12:40:14 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.derby
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.derby*,
             javax.crypto,
             javax.crypto.interfaces,
             javax.crypto.spec,
@@ -76,6 +75,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -111,4 +121,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derbynet-10.8.2.2/pom.xml Tue Jan 24 12:40:14 2012
@@ -75,6 +75,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>

Modified: servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml Tue Jan 24 12:40:14 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.dom4j
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.dom4j*,
             com.sun.msv.datatype*;resolution:=optional,
             javax.swing*;resolution:=optional,
             javax.xml.bind*;resolution:=optional;version="[2.0,3)",
@@ -63,6 +63,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 +107,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml Tue Jan 24 12:40:14 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">
 
     <!--
 
@@ -19,90 +19,100 @@
         limitations under the License.
     -->
 
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
+    <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>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.dozer</artifactId>
+    <packaging>bundle</packaging>
+    <version>5.2.0_4-SNAPSHOT</version>
+    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
+    <properties>
+        <pkgGroupId>net.sf.dozer</pkgGroupId>
+        <pkgArtifactId>dozer</pkgArtifactId>
+        <pkgVersion>5.2.0</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            org.dozer
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            javax.management,
+            javax.xml.datatype,
+            javax.xml.parsers,
+            org.apache.commons.beanutils;version="[1.7,2)",
+            org.apache.commons.beanutils.converters;version="[1.7,2)",
+            org.apache.commons.collections;version="3.2",
+            org.apache.commons.collections.map;version="3.2",
+            org.apache.commons.collections.set;version="3.2",
+            org.apache.commons.lang;version="2.4",
+            org.apache.commons.lang.builder;version="2.4",
+            org.apache.commons.logging;resolution:=optional,
+            org.springframework.beans.factory,
+            org.springframework.core.io,
+            org.w3c.dom,
+            org.xml.sax,
+            org.xml.sax.helpers,
+            *
+        </servicemix.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <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>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-  <groupId>org.apache.servicemix.bundles</groupId>
-  <artifactId>org.apache.servicemix.bundles.dozer</artifactId>
-  <packaging>bundle</packaging>
-  <version>5.2.0_4-SNAPSHOT</version>
-  <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-  <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-    
-  <properties>
-    <pkgGroupId>net.sf.dozer</pkgGroupId>
-    <pkgArtifactId>dozer</pkgArtifactId>
-    <pkgVersion>5.2.0</pkgVersion>
-    <servicemix.osgi.export.pkg>
-        org.dozer
-    </servicemix.osgi.export.pkg>
-    <servicemix.osgi.import.pkg>
-        !org.dozer*,       
-        javax.management,
-        javax.xml.datatype,
-        javax.xml.parsers,
-        org.apache.commons.beanutils;version="[1.7,2)",
-        org.apache.commons.beanutils.converters;version="[1.7,2)",
-        org.apache.commons.collections;version="3.2",
-        org.apache.commons.collections.map;version="3.2",
-        org.apache.commons.collections.set;version="3.2",
-        org.apache.commons.lang;version="2.4",
-        org.apache.commons.lang.builder;version="2.4",
-        org.apache.commons.logging,
-        org.springframework.beans.factory,
-        org.springframework.core.io,
-        org.w3c.dom,
-        org.xml.sax,
-        org.xml.sax.helpers,
-        *        
-    </servicemix.osgi.import.pkg>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${pkgGroupId}</groupId>
-      <artifactId>${pkgArtifactId}</artifactId>
-      <version>${pkgVersion}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>${pkgGroupId}:${pkgArtifactId}</include>
-                </includes>
-              </artifactSet>
-              <filters>
-                <filter>
-                  <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                  <excludes>
-                    <exclude>**</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-              <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-              <createDependencyReducedPom>true</createDependencyReducedPom>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Modified: servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dozer-5.3.0/pom.xml Tue Jan 24 12:40:14 2012
@@ -24,8 +24,8 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
-        <relativePath>../bundles-pom/pom.xml</relativePath>        
+        <version>8-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -43,7 +43,6 @@
             org.dozer
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.dozer*,
             javax.management,
             javax.xml.datatype,
             javax.xml.parsers,
@@ -54,7 +53,7 @@
             org.apache.commons.collections.set;version="3.2",
             org.apache.commons.lang;version="2.4",
             org.apache.commons.lang.builder;version="2.4",
-            org.apache.commons.logging,
+            org.apache.commons.logging;resolution:=optional,
             org.springframework.beans.factory,
             org.springframework.core.io,
             org.w3c.dom,
@@ -70,6 +69,16 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <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>
 
@@ -106,4 +115,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/dozer-5.3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dozer-5.3.2/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dozer-5.3.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dozer-5.3.2/pom.xml Tue Jan 24 12:40:14 2012
@@ -25,7 +25,7 @@
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
         <version>8-SNAPSHOT</version>
-        <relativePath>../bundles-pom/pom.xml</relativePath>        
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
@@ -53,7 +53,7 @@
             org.apache.commons.collections.set;version="[3.2,4)",
             org.apache.commons.lang;version="2.5",
             org.apache.commons.lang.builder;version="2.5",
-            org.apache.commons.logging,
+            org.apache.commons.logging;resolution:=optional,
             org.springframework.beans.factory,
             org.springframework.core.io,
             org.w3c.dom,
@@ -69,6 +69,16 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <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>
 
@@ -105,4 +115,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml Tue Jan 24 12:40:14 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,6 @@
         <pkgArtifactId>drools</pkgArtifactId>
         <pkgVersion>4.0.7</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.drools*,
             COM.jrockit*;resolution:=optional,
             com.thoughtworks.xstream*;resolution:=optional,
             javax.jcr*;resolution:=optional,
@@ -64,10 +64,17 @@
     </properties>
 
     <repositories>
-      <repository>
-        <id>jboss</id>
-        <url>http://repository.jboss.com/maven2</url>
-      </repository>
+        <repository>
+            <id>jboss</id>
+            <name>JBoss Maven Repository</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -113,6 +120,57 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-analytics</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-ant</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-compiler</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-decisiontables</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-jsr94</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-repository</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -129,12 +187,54 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>${pkgGroupId}:drools-analytics</include>
+                                    <include>${pkgGroupId}:drools-ant</include>
+                                    <include>${pkgGroupId}:drools-compiler</include>
+                                    <include>${pkgGroupId}:drools-core</include>
+                                    <include>${pkgGroupId}:drools-decisiontables</include>
+                                    <include>${pkgGroupId}:drools-jsr94</include>
+                                    <include>${pkgGroupId}:drools-repository</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <artifact>${pkgGroupId}:drools-analytics</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-ant</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-compiler</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-core</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-decisiontables</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-jsr94</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-repository</artifact>
                                     <excludes>
                                         <exclude>**</exclude>
                                     </excludes>
@@ -148,4 +248,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/drools-5.1.1/pom.xml Tue Jan 24 12:40:14 2012
@@ -18,23 +18,23 @@
         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>
-        <relativePath>../bundles-pom/pom.xml</relativePath>        
+        <version>8-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.drools</artifactId>
     <version>5.1.1_3-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-    
+
     <properties>
         <pkgGroupId>org.drools</pkgGroupId>
         <pkgArtifactId>drools</pkgArtifactId>
@@ -51,7 +51,7 @@
             javax.rules*;resolution:=optional,
             org.apache.jackrabbit*;resolution:=optional,
             org.codehaus.janino*;resolution:=optional,
-            org.slf4j*;version="[1.5,2.0)",
+            org.slf4j*;version="[1.5,2.0)";resolution:=optional,
             org.tmatesoft*;resolution:=optional,
             org.antlr.stringtemplate*;resolution:=optional,
             *
@@ -71,14 +71,21 @@
             *;inline=META-INF/drools*
         </servicemix.osgi.embed.dependency>
     </properties>
-    
+
     <repositories>
         <repository>
             <id>jboss</id>
-            <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+            <name>JBoss Maven Repository</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
     </repositories>
-    
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -116,8 +123,52 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-api</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-compiler</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-decisiontables</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-jsr94</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>drools-repository</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -132,12 +183,54 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
+                                    <include>${pkgGroupId}:drools-analytics</include>
+                                    <include>${pkgGroupId}:drools-ant</include>
+                                    <include>${pkgGroupId}:drools-compiler</include>
+                                    <include>${pkgGroupId}:drools-core</include>
+                                    <include>${pkgGroupId}:drools-decisiontables</include>
+                                    <include>${pkgGroupId}:drools-jsr94</include>
+                                    <include>${pkgGroupId}:drools-repository</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+                                    <artifact>${pkgGroupId}:drools-analytics</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-ant</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-compiler</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-core</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-decisiontables</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-jsr94</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:drools-repository</artifact>
                                     <excludes>
                                         <exclude>**</exclude>
                                     </excludes>
@@ -151,4 +244,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/ehcache-1.6.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ehcache-1.6.2/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ehcache-1.6.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ehcache-1.6.2/pom.xml Tue Jan 24 12:40:14 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>ehcache</pkgArtifactId>
         <pkgVersion>1.6.2</pkgVersion>
         <servicemix.osgi.export.pkg>
-            net.sf.ehcache    
+            net.sf.ehcache
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.sf.ehcache*,
             javax.management,
             javax.xml.parsers,
             org.xml.sax*,
@@ -59,6 +58,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 +102,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/ehcache-2.0.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ehcache-2.0.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ehcache-2.0.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ehcache-2.0.1/pom.xml Tue Jan 24 12:40:14 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 @@
             net.sf.ehcache
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.sf.ehcache*,
             javax.management*,
             javax.naming,
             javax.xml.parsers,
@@ -64,6 +63,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -97,4 +105,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/ehcache-2.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ehcache-2.1.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ehcache-2.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ehcache-2.1.1/pom.xml Tue Jan 24 12:40:14 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 @@
             net.sf.ehcache
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.sf.ehcache*,
             javax.management*,
             javax.naming,
             javax.xml.parsers,
@@ -65,6 +64,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -100,4 +108,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/ehcache-2.2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ehcache-2.2.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ehcache-2.2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ehcache-2.2.0/pom.xml Tue Jan 24 12:40:14 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 @@
             net.sf.ehcache
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.sf.ehcache*,
             javax.management*,
             javax.naming,
             javax.xml.parsers,
@@ -65,6 +64,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -98,4 +106,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/ehcache-2.3.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ehcache-2.3.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ehcache-2.3.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ehcache-2.3.0/pom.xml Tue Jan 24 12:40:14 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,6 @@
             net.sf.ehcache
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.sf.ehcache*,
             javax.management*,
             javax.naming*,
             javax.xml.parsers,
@@ -85,6 +84,36 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-jmsreplication</artifactId>
+            <version>${pkgJmsRepVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache-terracota</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -92,7 +121,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -101,12 +129,13 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <DynamicImport-Packages>*</DynamicImport-Packages>
                                     </manifestEntries>
                                 </transformer>
-                            </transformers> 
+                            </transformers>
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}-core</include>
@@ -121,11 +150,12 @@
                                 </filter>
                             </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/ehcache-2.4.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ehcache-2.4.3/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ehcache-2.4.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ehcache-2.4.3/pom.xml Tue Jan 24 12:40:14 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,6 @@
             net.sf.ehcache
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.sf.ehcache*,
             javax.management*,
             javax.naming*,
             javax.xml.parsers,
@@ -85,6 +84,36 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-jmsreplication</artifactId>
+            <version>${pkgJmsRepVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache-terracota</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -92,7 +121,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -101,12 +129,12 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <DynamicImport-Packages>*</DynamicImport-Packages>
                                     </manifestEntries>
                                 </transformer>
-                            </transformers> 
+                            </transformers>
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}-core</include>
@@ -121,11 +149,12 @@
                                 </filter>
                             </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/ehcache-2.5.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ehcache-2.5.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ehcache-2.5.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ehcache-2.5.0/pom.xml Tue Jan 24 12:40:14 2012
@@ -84,6 +84,36 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}-jmsreplication</artifactId>
+            <version>${pkgJmsRepVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache-terracota</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -91,7 +121,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -100,12 +129,12 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <DynamicImport-Packages>*</DynamicImport-Packages>
                                     </manifestEntries>
                                 </transformer>
-                            </transformers> 
+                            </transformers>
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}-core</include>
@@ -120,7 +149,7 @@
                                 </filter>
                             </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                         </configuration>
                     </execution>
                 </executions>

Modified: servicemix/smx4/bundles/trunk/fastinfoset-1.2.12/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/fastinfoset-1.2.12/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/fastinfoset-1.2.12/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/fastinfoset-1.2.12/pom.xml Tue Jan 24 12:40:14 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>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>
@@ -39,13 +40,11 @@
         <pkgArtifactId>FastInfoset</pkgArtifactId>
         <pkgVersion>1.2.12</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.jvnet.fastinfoset*;version=${pkgVersion},
-            com.sun.xml.fastinfoset*;version=${pkgVersion}
+            org.jvnet.fastinfoset*;version=${pkgVersion};-split-package:=merge-first,
+            com.sun.xml.fastinfoset*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             javax.xml.stream*;version="[1,2)",
-            !org.jvnet.fastinfoset*,
-            !com.sun.xml.fastinfoset*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -57,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/fastinfoset-1.2.7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml Tue Jan 24 12:40:14 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,13 +40,11 @@
         <pkgArtifactId>FastInfoset</pkgArtifactId>
         <pkgVersion>1.2.7</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.jvnet.fastinfoset*;version=${pkgVersion},
-            com.sun.xml.fastinfoset*;version=${pkgVersion}
+            org.jvnet.fastinfoset*;version=${pkgVersion};-split-package:=merge-first,
+            com.sun.xml.fastinfoset*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             javax.xml.stream*;version="[1,2)",
-            !org.jvnet.fastinfoset*,
-            !com.sun.xml.fastinfoset*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -57,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>
@@ -92,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml Tue Jan 24 12:40:14 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,10 +43,9 @@
             net.sf.flatpack
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.sf.flatpack*,
             jxl*;resolution:=optional;version="[2.4.2,3)",
             org.jdom*;resolution:=optional;version="[1.0,2)",
-            org.slf4j*;version="[1.1,2)",
+            org.slf4j*;version="[1.1,2)";resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -57,6 +57,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -92,4 +103,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml Tue Jan 24 12:40:14 2012
@@ -18,23 +18,23 @@
         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.flatpack</artifactId>
     <version>3.2.0_3-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-    
+
     <properties>
         <pkgGroupId>net.sf.flatpack</pkgGroupId>
         <pkgArtifactId>flatpack</pkgArtifactId>
@@ -43,14 +43,13 @@
             net.sf.flatpack
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.sf.flatpack*,
             jxl*;resolution:=optional;version="[2.4.2,3)",
             org.jdom*;resolution:=optional;version="[1.0,2)",
             org.slf4j*;resolution:=optional;version="[1.1,2)",
             *
         </servicemix.osgi.import.pkg>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -58,23 +57,33 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on ServiceMix repo
+        <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>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -108,4 +117,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>