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 [3/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/serp-1.13.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml Fri Jan 27 16:32:20 2012
@@ -1,38 +1,39 @@
-<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
+         contributor license agreements. See the NOTICE file distributed with
+         this work for additional information regarding copyright ownership.
+         The ASF licenses this file to You under the Apache License, Version
+         2.0 (the "License"); you may not use this file except in compliance
+         with the License. You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+         applicable law or agreed to in writing, software distributed under the
+         License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+         CONDITIONS OF ANY KIND, either express or implied. See the License for
+         the specific language governing permissions and limitations under the
+         License.
+     -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>bundles-pom</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <version>8-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.serp</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+    <version>1.13.1_5-SNAPSHOT</version>
+    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
 
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to You under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-		applicable law or agreed to in writing, software distributed under the
-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-		CONDITIONS OF ANY KIND, either express or implied. See the License for
-		the specific language governing permissions and limitations under the
-		License.
-	-->
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<artifactId>bundles-pom</artifactId>
-		<groupId>org.apache.servicemix.bundles</groupId>
-		<version>6</version>
-      <relativePath>../bundles-pom/pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.apache.servicemix.bundles</groupId>
-	<artifactId>org.apache.servicemix.bundles.serp</artifactId>
-	<packaging>bundle</packaging>
-	<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-	<version>1.13.1_5-SNAPSHOT</version>
-	<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-	
     <properties>
         <pkgGroupId>net.sourceforge.serp</pkgGroupId>
         <pkgArtifactId>serp</pkgArtifactId>
@@ -41,49 +42,61 @@
             serp
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !serp*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <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>
-		<plugins>
-			<plugin>
-				<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>
+    <build>
+        <plugins>
+            <plugin>
+                <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/shiro-1.1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/shiro-1.1.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/shiro-1.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/shiro-1.1.0/pom.xml Fri Jan 27 16:32:20 2012
@@ -23,7 +23,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>
 
@@ -32,8 +32,7 @@
     <version>1.1.0_3-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.
-    </description>
+    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
 
     <properties>
         <pkgGroupId>org.apache.shiro</pkgGroupId>
@@ -43,7 +42,6 @@
             org.apache.shiro
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.shiro*,
             javax.crypto*,
             javax.naming*,
             javax.sql*,
@@ -60,6 +58,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>
@@ -95,4 +102,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/smack-3.0.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/smack-3.0.4/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/smack-3.0.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/smack-3.0.4/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,6 +44,8 @@
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.jivesoftware*,
+            !com.jcraft.jzlib*,
+            !org.xmlpull*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -60,6 +63,24 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>smack</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>smackx</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <repositories>
@@ -112,4 +133,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/smack-3.1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/smack-3.1.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/smack-3.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/smack-3.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>
     
@@ -68,6 +68,22 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>smack</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>smackx</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
     
     <repositories>
@@ -120,4 +136,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/smack-3.2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/smack-3.2.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/smack-3.2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/smack-3.2.0/pom.xml Fri Jan 27 16:32:20 2012
@@ -68,6 +68,24 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>smack</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>smackx</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <repositories>
@@ -120,4 +138,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/smack-3.2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/smack-3.2.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/smack-3.2.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/smack-3.2.1/pom.xml Fri Jan 27 16:32:20 2012
@@ -137,4 +137,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/snappy-java-1.0.4.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/snappy-java-1.0.4.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/snappy-java-1.0.4.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/snappy-java-1.0.4.1/pom.xml Fri Jan 27 16:32:20 2012
@@ -39,11 +39,10 @@
         <pkgGroupId>org.xerial.snappy</pkgGroupId>
         <pkgArtifactId>snappy-java</pkgArtifactId>
         <pkgVersion>1.0.4.1</pkgVersion>
-        <servicemix.osgi.export>
-            org.xerial.snappy;version="${pkgVersion}";-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.xerial.snappy
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.xerial.snappy*,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.native>
@@ -69,6 +68,15 @@
             <artifactId>org.osgi.core</artifactId>
             <version>4.2.0</version>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -137,4 +145,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/snmp4j-1.10.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/snmp4j-1.10.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/snmp4j-1.10.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/snmp4j-1.10.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">
 
     <!--
 
@@ -42,12 +42,11 @@
         <servicemix.osgi.import.pkg>
             javax.crypto*;resolution:=optional,
             org.apache.log4j*;resolution:=optional,
-            !org.snmp4j*,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            org.snmp4j*;version=${pkgVersion}
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.snmp4j
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>
@@ -57,6 +56,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>

Modified: servicemix/smx4/bundles/trunk/snmp4j-1.8.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/snmp4j-1.8.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/snmp4j-1.8.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/snmp4j-1.8.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>
 
@@ -41,12 +42,11 @@
         <servicemix.osgi.import.pkg>
             javax.crypto*;resolution:=optional,
             org.apache.log4j*;resolution:=optional,
-            !org.snmp4j*,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            org.snmp4j*;version=${pkgVersion}
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.snmp4j
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>
@@ -56,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,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/solr-solrj-3.4.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/solr-solrj-3.4.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/solr-solrj-3.4.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/solr-solrj-3.4.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.solr
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.solr*,
             javax.xml.stream,
             javax.xml.transform*,
             org.apache.commons.httpclient*;version="[3,4)",
@@ -61,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>
@@ -96,4 +104,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/solr-solrj-3.5.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/solr-solrj-3.5.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/solr-solrj-3.5.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/solr-solrj-3.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>
 
@@ -43,7 +43,6 @@
             org.apache.solr
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.solr*,
             javax.xml.stream,
             javax.xml.transform*,
             org.apache.commons.httpclient*;version="[3,4)",
@@ -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/spymemcached-2.5/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/spymemcached-2.5/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/spymemcached-2.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/spymemcached-2.5/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
@@ -22,7 +23,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -41,7 +42,6 @@
             net.spy.memcached
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !net.spy.spymemcached*,
             javax.security*,
             org.apache.log4j;version="[1.2,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/stax-utils-20040917/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/stax-utils-20040917/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/stax-utils-20040917/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/stax-utils-20040917/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 @@
             javanet.staxutils
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !javanet.staxutils*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -55,6 +54,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>
@@ -90,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/stringtemplate-3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/stringtemplate-3.2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/stringtemplate-3.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/stringtemplate-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">
 
     <!--
 
@@ -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,14 +40,13 @@
         <pkgArtifactId>stringtemplate</pkgArtifactId>
         <pkgVersion>3.2</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.antlr.stringtemplate*,
             antlr*;resolution:=optional;version="[2.7.7,3)",
             junit*;resolution:=optional;version="[3.8,4)",
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            org.antlr.stringtemplate*;version=${pkgVersion}
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.antlr.stringtemplate
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>
@@ -56,6 +56,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -91,4 +102,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/stringtemplate-4.0.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/stringtemplate-4.0.2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/stringtemplate-4.0.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/stringtemplate-4.0.2/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">
 
     <!--
 
@@ -39,9 +39,6 @@
         <pkgGroupId>org.antlr</pkgGroupId>
         <pkgArtifactId>stringtemplate</pkgArtifactId>
         <pkgVersion>4.0.2</pkgVersion>
-        <servicemix.osgi.import.pkg>
-
-        </servicemix.osgi.import.pkg>
         <servicemix.osgi.export.pkg>
             org.stringtemplate
         </servicemix.osgi.export.pkg>
@@ -54,6 +51,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/struts2-2.2.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/struts2-2.2.1.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/struts2-2.2.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/struts2-2.2.1.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,10 +40,9 @@
         <pkgArtifactId>struts2-core</pkgArtifactId>
         <pkgVersion>2.2.1.1</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.struts*;version=${pkgVersion}
+            org.apache.struts
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.struts.*,
             org.apache.commons.lang.xwork*;version=${pkgVersion},
             *
         </servicemix.osgi.import.pkg>
@@ -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/struts2-xwork-2.2.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/struts2-xwork-2.2.1.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/struts2-xwork-2.2.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/struts2-xwork-2.2.1.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>
@@ -32,23 +33,18 @@
     <version>2.2.1.1_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.apache.struts.xwork</pkgGroupId>
         <pkgArtifactId>xwork-core</pkgArtifactId>
         <pkgVersion>2.2.1.1</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.apache.commons.lang.xwork*;version=${pkgVersion},
-            com.opensymphony.xwork2*;version=${pkgVersion},
-            org.objectweb.asm.xwork*;version=${pkgVersion}
-        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.export>
+            org.apache.commons.lang.xwork*;version=${pkgVersion};-split-package:=merge-first,
+            com.opensymphony.xwork2*;version=${pkgVersion};-split-package:=merge-first,
+            org.objectweb.asm.xwork*;version=${pkgVersion};-split-package:=merge-first
+        </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !org.apache.commons.lang.xwork*,
-            !com.opensymphony.xwork2*,
-            !org.objectweb.asm.xwork*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -60,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>
@@ -95,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/tagsoup-1.2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/tagsoup-1.2.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/tagsoup-1.2.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/tagsoup-1.2.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">
 
     <!--
 
@@ -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/tagsoup-1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/tagsoup-1.2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/tagsoup-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/tagsoup-1.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">
 
     <!--
 
@@ -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,12 +40,11 @@
         <pkgArtifactId>tagsoup</pkgArtifactId>
         <pkgVersion>1.2</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !org.ccil.cowan.tagsoup*,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            org.ccil.cowan.tagsoup*;version=${pkgVersion}
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.ccil.cowan.tagsoup
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>
@@ -54,6 +54,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>
@@ -89,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/twitter4j-2.0.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">
 
     <!--
 
@@ -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 @@
             twitter4j
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !twitter4j*,
 	        com.sun.syndication.*;resolution:=optional;version="[0.9,1)",
             !dalvik.system*,
 	        javax.crypto;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/twitter4j-2.2.5/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/twitter4j-2.2.5/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/twitter4j-2.2.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/twitter4j-2.2.5/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">
 
     <!--
 
@@ -42,10 +43,9 @@
             twitter4j
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !twitter4j*,
             !dalvik.system,
             !com.google.appengine.api.urlfetch.URLFetchService,
-	    javax.crypto;resolution:=optional,
+	        javax.crypto;resolution:=optional,
             javax.crypto.spec;resolution:=optional,
             javax.management;resolution:=optional,
             javax.management.openmbean;resolution:=optional,
@@ -70,6 +70,22 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>twitter4j-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>twitter4j-stream</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -112,4 +128,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/velocity-1.6.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/velocity-1.6.2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/velocity-1.6.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/velocity-1.6.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">
 
     <!--
 
@@ -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.velocity
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.velocity*,
             com.werken.xpath*;resolution:=optional;version="[0.9.4,1)",
             javax.servlet*;resolution:=optional;version="[2.3,3)",
             org.apache.commons.collections*;version="[3.2,4)",
@@ -64,6 +64,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>
@@ -99,4 +110,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/velocity-1.6.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/velocity-1.6.4/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/velocity-1.6.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/velocity-1.6.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>
     
@@ -33,8 +33,7 @@
     <version>1.6.4_4-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.
-    </description>
+    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
     
     <properties>
         <pkgGroupId>org.apache.velocity</pkgGroupId>
@@ -44,7 +43,6 @@
             org.apache.velocity
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.velocity*,
             com.werken.xpath*;resolution:=optional;version="[0.9.4,1)",
             javax.servlet*;resolution:=optional;version="[2.3,3)",
             org.apache.commons.collections*;version="[3.2,4)",
@@ -66,6 +64,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,7 +100,7 @@
                                     </excludes>
                                 </filter>
                             </filters>
-                            <promoteTransitiveDependency>true</promoteTransitiveDependency>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                         </configuration>
                     </execution>
@@ -101,4 +108,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/velocity-1.7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/velocity-1.7/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/velocity-1.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/velocity-1.7/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.velocity
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.velocity*,
             com.werken.xpath*;resolution:=optional;version="[0.9.4,1)",
             javax.servlet*;resolution:=optional;version="[2.3,3)",
             org.apache.commons.collections*;version="[3.2,4)",
@@ -64,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>
@@ -100,9 +108,4 @@
         </plugins>
     </build>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/smx4/bundles/tags/org.apache.servicemix.bundles.velocity-1.7_3</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/smx4/bundles/tags/org.apache.servicemix.bundles.velocity-1.7_3</developerConnection>
-    <url>http://svn.apache.org/viewvc/servicemix/smx4/bundles/tags/org.apache.servicemix.bundles.velocity-1.7_3</url>
-  </scm>
 </project>

Modified: servicemix/smx4/bundles/trunk/velocity-tools-2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/velocity-tools-2.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/velocity-tools-2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/velocity-tools-2.0/pom.xml Fri Jan 27 16:32:20 2012
@@ -42,9 +42,6 @@
         <servicemix.osgi.export.pkg>
             org.apache.velocity.tools
         </servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-
-        </servicemix.osgi.import.pkg>
     </properties>
 
     <dependencies>
@@ -54,6 +51,17 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>

Modified: servicemix/smx4/bundles/trunk/werken-xpath-0.9.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/werken-xpath-0.9.4/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/werken-xpath-0.9.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/werken-xpath-0.9.4/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>
 
@@ -42,7 +43,6 @@
             com.werken.xpath
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.werken.xpath*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -54,6 +54,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>
@@ -89,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/woodstox-3.2.8/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/woodstox-3.2.8/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/woodstox-3.2.8/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/woodstox-3.2.8/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>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>
@@ -63,8 +63,8 @@
             <optional>true</optional>
             <exclusions>
                 <exclusion>
-		            <groupId>stax</groupId>
-		            <artifactId>stax-api</artifactId>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -74,6 +74,21 @@
             <version>1.0.0</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -109,4 +124,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/woodstox-3.2.9/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/woodstox-3.2.9/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/woodstox-3.2.9/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/woodstox-3.2.9/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>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>
@@ -63,8 +63,8 @@
             <optional>true</optional>
             <exclusions>
                 <exclusion>
-		            <groupId>stax</groupId>
-		            <artifactId>stax-api</artifactId>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -74,6 +74,21 @@
             <version>1.0.0</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -109,4 +124,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/ws-commons-util-1.0.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ws-commons-util-1.0.2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ws-commons-util-1.0.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ws-commons-util-1.0.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>
 
@@ -43,7 +43,6 @@
             org.apache.ws.commons
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.ws.commons*,
             javax.xml.namespace,
             org.w3c.dom,
             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>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/wsdl4j-1.6.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/wsdl4j-1.6.2/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/wsdl4j-1.6.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/wsdl4j-1.6.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>
@@ -43,8 +44,6 @@
             com.ibm.wsdl*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !com.ibm.wsdl*,
-            !javax.wsdl*,
             *
         </servicemix.osgi.import.pkg>
     </properties>
@@ -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/wss4j-1.5.4/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/wss4j-1.5.4/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/wss4j-1.5.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/wss4j-1.5.4/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.ws.security</pkgGroupId>
         <pkgArtifactId>wss4j</pkgArtifactId>
         <pkgVersion>1.5.4</pkgVersion>
-        <servicemix.osgi.export.pkg>org.apache.ws</servicemix.osgi.export.pkg>
+        <servicemix.osgi.export.pkg>
+            org.apache.ws
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.ws*,
             javax.xml.rpc*;resolution:=optional,
             javax.xml.soap*;resolution:=optional,
             org.apache.axis*;resolution:=optional,
@@ -71,6 +73,29 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>axis</groupId>
+                    <artifactId>axis-ant</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk13</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

Modified: servicemix/smx4/bundles/trunk/xalan-2.7.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xalan-2.7.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xalan-2.7.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xalan-2.7.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,13 +40,6 @@
         <pkgArtifactId>xalan</pkgArtifactId>
         <pkgVersion>2.7.1</pkgVersion>
         <servicemix.osgi.import.pkg>
-          !java_cup*,
-          !org.apache.xalan*,
-          !org.apache.xml.dtm*,
-          !org.apache.xml.res*,
-          !org.apache.xml.serializer*,
-          !org.apache.xml.utils*,
-          !org.apache.xpath*,
           org.apache.bcel*;version="[5.1,6)",
           org.apache.xerces*;version="[2.8.1,3)",
           org.apache.xml.serialize*;version="[2.8.1,3)",
@@ -53,13 +47,13 @@
           *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-          java_cup*;version=${pkgVersion}, 
-          org.apache.xalan*;version=${pkgVersion},
-          org.apache.xml.dtm*;version=${pkgVersion}, 
-          org.apache.xml.res*;version=${pkgVersion}, 
-          org.apache.xml.serializer*;version=${pkgVersion}, 
-          org.apache.xml.utils*;version=${pkgVersion}, 
-          org.apache.xpath*;version=${pkgVersion}
+          java_cup*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xalan*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xml.dtm*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xml.res*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xml.serializer*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xml.utils*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xpath*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.private.pkg>
             META-INF.services
@@ -71,6 +65,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>
 
@@ -107,4 +111,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/xalan-serializer-2.7.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xalan-serializer-2.7.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xalan-serializer-2.7.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xalan-serializer-2.7.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>serializer</pkgArtifactId>
         <pkgVersion>2.7.1</pkgVersion>
         <servicemix.osgi.import.pkg>
-          !org.apache.xml.serializer*,
           *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export.pkg>
@@ -52,7 +52,19 @@
             <groupId>${pkgGroupId}</groupId>
             <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>
@@ -88,4 +100,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/xerces-2.10.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xerces-2.10.0/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xerces-2.10.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xerces-2.10.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">
 
     <!--
 
@@ -41,18 +41,14 @@
         <pkgVersion>2.10.0</pkgVersion>
         <servicemix.osgi.import.pkg>
           !sun.io*,
-          !org.apache.html*,
-          !org.apache.wml*,
-          !org.apache.xerces*,
-          !org.apache.xml.serialize,
           org.apache.xml.resolver*;version="[1.2,2)",
           *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export.pkg>
-          org.apache.html*;version=${pkgVersion},
-          org.apache.wml*;version=${pkgVersion},
-          org.apache.xerces*;version=${pkgVersion},
-          org.apache.xml.serialize*;version=${pkgVersion}
+          org.apache.html*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.wml*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xerces*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xml.serialize*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.private.pkg>
             META-INF.services*
@@ -65,6 +61,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>
 

Modified: servicemix/smx4/bundles/trunk/xerces-2.9.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xerces-2.9.1/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xerces-2.9.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xerces-2.9.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>
 
@@ -40,18 +41,14 @@
         <pkgVersion>2.9.1</pkgVersion>
         <servicemix.osgi.import.pkg>
           !sun.io*,
-          !org.apache.html*,
-          !org.apache.wml*,
-          !org.apache.xerces*,
-          !org.apache.xml.serialize,
           org.apache.xml.resolver*;version="[1.2,1.3)",
           *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export.pkg>
-          org.apache.html*;version=${pkgVersion},
-          org.apache.wml*;version=${pkgVersion},
-          org.apache.xerces*;version=${pkgVersion},
-          org.apache.xml.serialize*;version=${pkgVersion}
+          org.apache.html*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.wml*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xerces*;version=${pkgVersion};-split-package:=merge-first,
+          org.apache.xml.serialize*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.private.pkg>
             META-INF.services*
@@ -64,7 +61,19 @@
             <groupId>${pkgGroupId}</groupId>
             <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>
@@ -100,4 +109,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/xfire-1.2.5/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xfire-1.2.5/pom.xml?rev=1236741&r1=1236740&r2=1236741&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xfire-1.2.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xfire-1.2.5/pom.xml Fri Jan 27 16:32:20 2012
@@ -18,16 +18,16 @@
         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.xfire</artifactId>
     <packaging>bundle</packaging>
@@ -37,7 +37,7 @@
         This OSGi bundle wraps xfire-aegis, xfire-annotations, xfire-castor, xfire-core, xfire-generator,
         xfire-jaxb2, xfire-jaxws, xfire-jibx, xfire-xmlbeans ${pkgVersion} jar files.
     </description>
-    
+
     <properties>
         <pkgGroupId>org.codehaus.xfire</pkgGroupId>
         <pkgVersion>1.2.5</pkgVersion>
@@ -45,7 +45,6 @@
             org.codehaus.xfire
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.codehaus.xfire*,
             com.thoughtworks.qdox*;version="[1.5,2)",
             org.apache.commons.attributes;version="[2.1,3)",
             javanet.staxutils*,
@@ -61,64 +60,261 @@
             *
         </servicemix.osgi.import.pkg>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>xfire-aegis</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>xfire-annotations</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>xfire-castor</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>xfire-core</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>xfire-generator</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>xfire-jaxb2</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>xfire-jaxws</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>xfire-jibx</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jibx</groupId>
+                    <artifactId>jibx-run</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jibx</groupId>
+                    <artifactId>jibx-bind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jibx</groupId>
+                    <artifactId>jibx-extras</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>xfire-xmlbeans</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>xfire-aegis</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>xfire-annotations</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>xfire-castor</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>xfire-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>xfire-generator</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>xfire-jaxb2</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>xfire-jaxws</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>xfire-jibx</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jibx</groupId>
+                    <artifactId>jibx-run</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jibx</groupId>
+                    <artifactId>jibx-bind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jibx</groupId>
+                    <artifactId>jibx-extras</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>xfire-xmlbeans</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>castor</groupId>
+                    <artifactId>castor</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -208,4 +404,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>