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 2014/02/06 00:09:56 UTC

svn commit: r1564986 - in /servicemix/smx4/bundles/trunk: derby-10.10.1.1/pom.xml derby-10.9.1.0/pom.xml pom.xml

Author: jbonofre
Date: Wed Feb  5 23:09:56 2014
New Revision: 1564986

URL: http://svn.apache.org/r1564986
Log:
[SMX4-1668] Use dynamic import in derby bundles

Modified:
    servicemix/smx4/bundles/trunk/derby-10.10.1.1/pom.xml
    servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/derby-10.10.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derby-10.10.1.1/pom.xml?rev=1564986&r1=1564985&r2=1564986&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derby-10.10.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derby-10.10.1.1/pom.xml Wed Feb  5 23:09:56 2014
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -63,6 +63,7 @@
             com.ibm.jvm;resolution:=optional,
             javax.servlet*;resolution:=optional
         </servicemix.osgi.import.pkg>
+        <servicemix.osgi.dynamicimport.pkg>*</servicemix.osgi.dynamicimport.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml?rev=1564986&r1=1564985&r2=1564986&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml Wed Feb  5 23:09:56 2014
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>10</version>
+        <version>11</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -61,6 +61,7 @@
             com.ibm.jvm;resolution:=optional,
             javax.servlet*;resolution:=optional
         </servicemix.osgi.import.pkg>
+        <servicemix.osgi.dynamicimport.pkg>*</servicemix.osgi.dynamicimport.pkg>
     </properties>
 
     <dependencies>
@@ -68,19 +69,16 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>derby</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>derbyclient</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>derbynet</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
         </dependency>
 
         <!-- sources

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1564986&r1=1564985&r2=1564986&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Wed Feb  5 23:09:56 2014
@@ -101,6 +101,8 @@
         <module>avro-ipc-1.7.6</module>
         <module>ant-1.9.3</module>
         <module>junit-4.11</module>
+        <module>derby-10.9.1.0</module>
+        <module>derby-10.10.1.1</module>
     </modules>
 
 </project>