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 [2/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...

Modified: servicemix/smx4/bundles/trunk/fop-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/fop-1.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/fop-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/fop-1.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 @@
             org.apache.fop
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.apache.fop*,
             javax.crypto,
             javax.crypto.spec,
             javax.media.jai;resolution:=optional,
@@ -69,6 +68,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -104,4 +112,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/freemarker-2.3.15/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/freemarker-2.3.15/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/freemarker-2.3.15/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/freemarker-2.3.15/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>
 
@@ -39,7 +40,6 @@
         <pkgArtifactId>freemarker</pkgArtifactId>
         <pkgVersion>2.3.15</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !freemarker*,
             !com.sun.org.apache*,
             javax.el*;resolution:=optional;version="[1,2)",
             javax.servlet*;resolution:=optional;version="[2.5,3)",
@@ -71,6 +71,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>
@@ -106,4 +115,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/freemarker-2.3.16/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/freemarker-2.3.16/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/freemarker-2.3.16/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/freemarker-2.3.16/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,7 +40,6 @@
         <pkgArtifactId>freemarker</pkgArtifactId>
         <pkgVersion>2.3.16</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !freemarker*,
             !com.sun.org.apache*,
             javax.el*;resolution:=optional;version="[1,2)",
             javax.servlet*;resolution:=optional;version="[2.5,3)",
@@ -72,6 +71,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>
@@ -107,4 +115,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/freemarker-2.3.17/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/freemarker-2.3.17/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/freemarker-2.3.17/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/freemarker-2.3.17/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,7 +40,6 @@
         <pkgArtifactId>freemarker</pkgArtifactId>
         <pkgVersion>2.3.17</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !freemarker*,
             !com.sun.org.apache*,
             javax.el*;resolution:=optional;version="[1,2)",
             javax.servlet*;resolution:=optional;version="[2.5,3)",
@@ -72,6 +71,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>
@@ -107,4 +115,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/freemarker-2.3.18/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/freemarker-2.3.18/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/freemarker-2.3.18/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/freemarker-2.3.18/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,7 +40,6 @@
         <pkgArtifactId>freemarker</pkgArtifactId>
         <pkgVersion>2.3.18</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !freemarker*,
             !com.sun.org.apache*,
             javax.el*;resolution:=optional;version="[1,2)",
             javax.servlet*;resolution:=optional;version="[2.5,3)",
@@ -72,6 +71,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>
@@ -107,4 +115,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/gae-1.4.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/gae-1.4.3/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/gae-1.4.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/gae-1.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>
 
@@ -43,8 +43,7 @@
             com.google.apphosting.api*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !com.google.appengine.api*,
-            !com.google.apphosting.api*
+
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
             com.google.appengine.repackaged*,
@@ -70,6 +69,24 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>appengine-api-1.0-sdk</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>appengine-api-labs</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -112,4 +129,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/gae-1.6.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/gae-1.6.1.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/gae-1.6.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/gae-1.6.1.1/pom.xml Tue Jan 24 12:40:14 2012
@@ -43,6 +43,7 @@
             com.google.apphosting.api*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
+
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
             com.google.appengine.repackaged*,
@@ -68,6 +69,24 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Central
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>appengine-api-1.0-sdk</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>appengine-api-labs</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>

Modified: servicemix/smx4/bundles/trunk/gdata-1.41.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/gdata-1.41.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/gdata-1.41.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/gdata-1.41.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 @@
             com.google.gdata
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !com.google.gdata*,
             com.google.common.collect,
             com.sun.mirror.apt;resolution:=optional,
             com.sun.mirror.declaration;resolution:=optional,
@@ -65,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>
 
     <repositories>
@@ -114,4 +124,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/groovy-1.5.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/groovy-1.5.6/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/groovy-1.5.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/groovy-1.5.6/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,8 +40,6 @@
         <pkgArtifactId>groovy</pkgArtifactId>
         <pkgVersion>1.5.6</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !groovy*,
-            !org.codehaus.groovy*,
             antlr*;version="[2.7.6,3)",
             com.mockobjects*;resolution:=optional;version="[0.9,1)",
             com.thoughtworks.xstream*;resolution:=optional;version="[1.2.2,2)",
@@ -69,6 +68,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -104,4 +112,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/groovy-1.6.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/groovy-1.6.3/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/groovy-1.6.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/groovy-1.6.3/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,8 +40,6 @@
         <pkgArtifactId>groovy</pkgArtifactId>
         <pkgVersion>1.6.3</pkgVersion>
         <servicemix.osgi.import.pkg>
-            !groovy*,
-            !org.codehaus.groovy*,
             antlr*;version="[2.7.7,3)",
             com.mockobjects*;resolution:=optional;version="[0.9,1)",
             com.thoughtworks.xstream*;resolution:=optional;version="[1.3,2)",
@@ -70,6 +69,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -105,4 +113,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/guava-09/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/guava-09/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/guava-09/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/guava-09/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 @@
             com.google.common*;version=09;-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !com.google.common*,
             sun.misc;resolution:=optional,
             javax.annotation
         </servicemix.osgi.import.pkg>
@@ -56,6 +55,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,4 +97,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/guava-10.0.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/guava-10.0.1/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/guava-10.0.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/guava-10.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 @@
             com.google.common*;version=10;-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !com.google.common*,
             sun.misc;resolution:=optional,
             javax.annotation
         </servicemix.osgi.import.pkg>
@@ -56,6 +55,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,4 +97,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/guava-10/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/guava-10/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/guava-10/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/guava-10/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 @@
             com.google.common*;version=10;-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !com.google.common*,
             sun.misc;resolution:=optional,
             javax.annotation
         </servicemix.osgi.import.pkg>
@@ -56,6 +55,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,4 +97,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

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

Modified: servicemix/smx4/bundles/trunk/guava-11/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/guava-11/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/guava-11/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/guava-11/pom.xml Tue Jan 24 12:40:14 2012
@@ -43,7 +43,6 @@
             com.google.common*;version=11;-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !com.google.common*,
             sun.misc;resolution:=optional,
             javax.annotation
         </servicemix.osgi.import.pkg>
@@ -56,6 +55,15 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,4 +97,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/guice-2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/guice-2.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/guice-2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/guice-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>
 
@@ -44,9 +44,7 @@
             com.google.inject*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-            !org.guiceyfruit*,
             com.google.inject.internal.asm.util*;resolution:=optional,
-            !com.google.inject*,
             javax.annotation,
             javax.naming*,
             org.aopalliance*,
@@ -81,6 +79,24 @@
             <version>${pkgVersion}</version>
             <optional>true</optional>
         </dependency>
+
+        <!-- sources -->
+        <!-- Not available on Google repo
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>guiceyfruit-core</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>guice-all</artifactId>
+            <version>${pkgVersion}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -123,4 +139,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/gwt-dev-2.4.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/gwt-dev-2.4.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/gwt-dev-2.4.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/gwt-dev-2.4.0/pom.xml Tue Jan 24 12:40:14 2012
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -26,14 +24,13 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.gwt-dev</artifactId>
     <version>2.4.0_1-SNAPSHOT</version>
-
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
@@ -43,43 +40,43 @@
         <pkgArtifactId>gwt-dev</pkgArtifactId>
         <pkgVersion>2.4.0</pkgVersion>
         <servicemix.osgi.export>
-	        !javax.servlet*,
+            !javax.servlet*,
             !org.apache*,
             !org.eclipse*,
-            com.google.gwt*;version=${pkgVersion}
+            com.google.gwt*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
-	        net.sourceforge.htmlunit.corejs.javascript;resolution:=optional,
-			org.apache.catalina;resolution:=optional,
-			org.apache.catalina.core;resolution:=optional,
-			org.apache.catalina.logger;resolution:=optional,
-			org.apache.catalina.startup;resolution:=optional,
-			org.apache.commons.collections.map;resolution:=optional,
-			org.apache.coyote.tomcat5;resolution:=optional,
-			org.apache.tools.ant.types;resolution:=optional,
-			org.eclipse.jdt.internal.core.util;resolution:=optional,
-			org.mortbay.component;resolution:=optional,
-			org.mortbay.jetty;resolution:=optional,
-			org.mortbay.jetty.handler;resolution:=optional,
-			org.mortbay.jetty.nio;resolution:=optional,
-			org.mortbay.jetty.security;resolution:=optional,
-			org.mortbay.jetty.webapp;resolution:=optional,
-			org.mortbay.log;resolution:=optional,
-			com.gargoylesoftware.htmlunit;resolution:=optional,
-			com.gargoylesoftware.htmlunit.html;resolution:=optional,
-			com.gargoylesoftware.htmlunit.javascript;resolution:=optional,
-			com.gargoylesoftware.htmlunit.javascript.background;resolution:=optional,
-			com.gargoylesoftware.htmlunit.javascript.host;resolution:=optional,
+            net.sourceforge.htmlunit.corejs.javascript;resolution:=optional,
+            org.apache.catalina;resolution:=optional,
+            org.apache.catalina.core;resolution:=optional,
+            org.apache.catalina.logger;resolution:=optional,
+            org.apache.catalina.startup;resolution:=optional,
+            org.apache.commons.collections.map;resolution:=optional,
+            org.apache.coyote.tomcat5;resolution:=optional,
+            org.apache.tools.ant.types;resolution:=optional,
+            org.eclipse.jdt.internal.core.util;resolution:=optional,
+            org.mortbay.component;resolution:=optional,
+            org.mortbay.jetty;resolution:=optional,
+            org.mortbay.jetty.handler;resolution:=optional,
+            org.mortbay.jetty.nio;resolution:=optional,
+            org.mortbay.jetty.security;resolution:=optional,
+            org.mortbay.jetty.webapp;resolution:=optional,
+            org.mortbay.log;resolution:=optional,
+            com.gargoylesoftware.htmlunit;resolution:=optional,
+            com.gargoylesoftware.htmlunit.html;resolution:=optional,
+            com.gargoylesoftware.htmlunit.javascript;resolution:=optional,
+            com.gargoylesoftware.htmlunit.javascript.background;resolution:=optional,
+            com.gargoylesoftware.htmlunit.javascript.host;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private>
-			com.google.gwt.core*,
-			com.google.gwt.dev*,
-			com.google.gwt.lang*,
-			com.google.gwt.soyc*,
+            com.google.gwt.core*,
+            com.google.gwt.dev*,
+            com.google.gwt.lang*,
+            com.google.gwt.soyc*,
             com.google.gwt.thirdparty*,
-            com.google.gwt.util*			
-	    </servicemix.osgi.private>
+            com.google.gwt.util*
+        </servicemix.osgi.private>
     </properties>
 
     <dependencies>
@@ -89,6 +86,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>
@@ -124,4 +130,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/gwt-user-2.4.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/gwt-user-2.4.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/gwt-user-2.4.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/gwt-user-2.4.0/pom.xml Tue Jan 24 12:40:14 2012
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <!--
 
@@ -26,14 +24,13 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>6</version>
+        <version>8-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.gwt-user</artifactId>
     <version>2.4.0_1-SNAPSHOT</version>
-
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
@@ -43,8 +40,8 @@
         <pkgArtifactId>gwt-user</pkgArtifactId>
         <pkgVersion>2.4.0</pkgVersion>
         <servicemix.osgi.export>
-            com.google.gwt*;version=${pkgVersion},
-            com.google.web*;version=${pkgVersion}
+            com.google.gwt*;version=${pkgVersion};-split-package:=merge-first,
+            com.google.web*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
             com.gargoylesoftware.htmlunit;resolution:=optional,
@@ -56,19 +53,19 @@
             com.thoughtworks.selenium;resolution:=optional,
             junit.framework;resolution:=optional,
             net.sourceforge.htmlunit.corejs.javascript;resolution:=optional,
-	        org.apache.tapestry.util.text;resolution:=optional,
-	        org.mortbay.jetty;resolution:=optional,
-	        org.mortbay.jetty.servlet;resolution:=optional,
-	        org.mortbay.jetty.webapp;resolution:=optional,
-	        org.w3c.css.sac;resolution:=optional,
-		    org.w3c.flute.parser;resolution:=optional,
+            org.apache.tapestry.util.text;resolution:=optional,
+            org.mortbay.jetty;resolution:=optional,
+            org.mortbay.jetty.servlet;resolution:=optional,
+            org.mortbay.jetty.webapp;resolution:=optional,
+            org.w3c.css.sac;resolution:=optional,
+            org.w3c.flute.parser;resolution:=optional,
             sun.misc;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private>
-	        com.google.gwt*,
+            com.google.gwt*,
             com.google.web*
-	    </servicemix.osgi.private>
+        </servicemix.osgi.private>
     </properties>
 
     <dependencies>
@@ -78,6 +75,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>
@@ -113,4 +119,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>
\ No newline at end of file

Modified: servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hadoop-core-1.0.0/pom.xml Tue Jan 24 12:40:14 2012
@@ -99,6 +99,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/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1235224&r1=1235223&r2=1235224&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Tue Jan 24 12:40:14 2012
@@ -81,12 +81,31 @@
         <module>commons-dbcp-1.4</module>
         <module>commons-digester-1.8</module>
         <module>commons-httpclient-3.1</module>
+        <module>commons-io-1.4</module>
+        <module>commons-lang-2.4</module>
+        <module>commons-net-1.4.1</module>
+        <module>commons-pool-1.5.4</module>
+        <module>commons-validator-1.3.1</module>
+        <module>dbunit-2.2</module>
+        <module>derbynet-10.8.2.2</module>
+        <module>dom4j-1.6.1</module>
+        <module>dozer-5.3.2</module>
+        <module>drools-5.1.1</module>
+        <module>ehcache-2.4.3</module>
+        <module>ehcache-2.5.0</module>
+        <module>fastinfoset-1.2.12</module>
+        <module>fop-1.0</module>
+        <module>freemarker-2.3.18</module>
+        <module>gae-1.6.1.1</module>
+        <module>guava-11</module>
+        <module>guava-11.0.1</module>
+        <module>gwt-dev-2.4.0</module>
+        <module>gwt-user-2.4.0</module>
 
         <module>smack-3.2.1</module>
         <module>paranamer-2.4</module>
         <module>jopt-simple-4.3</module>
         <module>not-yet-commons-ssl-0.3.11</module>
-        <module>guava-11</module>
         <module>twitter4j-2.2.5</module>
         <module>libthrift-0.7.0</module>
         <module>libthrift-0.8.0</module>
@@ -94,13 +113,7 @@
         <module>saxon-9.3.0.11</module>
         <module>saxon-9.4.0.1</module>
         <module>junit-4.10</module>
-        <module>derbynet-10.8.2.2</module>
-        <module>dozer-5.3.2</module>
-        <module>ehcache-2.5.0</module>
-        <module>fastinfoset-1.2.12</module>
         <module>scala-compiler-2.9.1</module>
-        <module>gae-1.6.1.1</module>
-        <module>guava-11.0.1</module>
         <module>hadoop-core-1.0.0</module>
         <module>jain-sip-ri-1.2.166</module>
         <module>japex-1.2.4</module>