svn commit: r1310419 - in /servicemix/smx4/bundles/trunk: dbunit-2.2/pom.xml pom.xml

[jb...@apache.org]

Author: jbonofre
Date: Fri Apr  6 15:58:16 2012
New Revision: 1310419

URL: http://svn.apache.org/viewvc?rev=1310419&view=rev
Log:
[SMX4-1119] Fix warning messages in dbunit 2.2 bundle
[SMX4-1122] Upgrade to bundles-pom 9-SNAPSHOT

Modified:
    servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml?rev=1310419&r1=1310418&r2=1310419&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dbunit-2.2/pom.xml Fri Apr  6 15:58:16 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>8</version>
+        <version>9-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -36,7 +36,7 @@
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
 
     <properties>
-        <pkgGroupId>dbunit</pkgGroupId>
+        <pkgGroupId>org.dbunit</pkgGroupId>
         <pkgArtifactId>dbunit</pkgArtifactId>
         <pkgVersion>2.2</pkgVersion>
         <servicemix.osgi.export.pkg>
@@ -46,16 +46,14 @@
             javax.naming,
             javax.sql,
             javax.xml.parsers,
-            junit.framework;resolution:=optional,
-            oracle.sql;resolution:=optional,
-            org.apache.commons.collections*,
-            org.apache.commons.lang*,
+            org.xml.sax*,
+            org.apache.commons.collections*;version="[3.1,4)",
+            org.apache.commons.lang*;version="[2.1,3)",
             org.apache.commons.logging*;resolution:=optional,
             org.apache.poi*;resolution:=optional,
             org.apache.tools.ant*;resolution:=optional,
-            org.xml.sax,
-            org.xml.sax.ext,
-            org.xml.sax.helpers
+            junit.framework;resolution:=optional,
+            oracle.sql;resolution:=optional,
         </servicemix.osgi.import.pkg>
     </properties>
 
@@ -110,4 +108,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1310419&r1=1310418&r2=1310419&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Fri Apr  6 15:58:16 2012
@@ -117,6 +117,7 @@
         <module>commons-pool-1.5.4</module>
         <module>commons-validator-1.3.1</module>
         <module>commons-vfs-1.0</module>
+        <module>dbunit-2.2</module>
     </modules>
 
 </project>