You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/08/27 22:41:01 UTC

svn commit: r808612 - in /servicemix/smx4/nmr/trunk: document/pom.xml jbi/cluster/config/pom.xml jbi/cluster/engine/pom.xml jbi/commands/pom.xml jbi/deployer/pom.xml jbi/osgi/pom.xml naming/pom.xml nmr/osgi/pom.xml nmr/spring/pom.xml

Author: ccustine
Date: Thu Aug 27 20:41:01 2009
New Revision: 808612

URL: http://svn.apache.org/viewvc?rev=808612&view=rev
Log:
SMX4-344 - Add version ranges for OSGi imports

Modified:
    servicemix/smx4/nmr/trunk/document/pom.xml
    servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml
    servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
    servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
    servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
    servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
    servicemix/smx4/nmr/trunk/naming/pom.xml
    servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
    servicemix/smx4/nmr/trunk/nmr/spring/pom.xml

Modified: servicemix/smx4/nmr/trunk/document/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/document/pom.xml?rev=808612&r1=808611&r2=808612&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/document/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/document/pom.xml Thu Aug 27 20:41:01 2009
@@ -64,6 +64,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>
+                            org.springframework.osgi*;version="[1.2.0,2.0.0)",
+                            org.springframework*;version="[2.5.6,3.0.0)",
+                            *
+                        </Import-Package>
                         <Export-Package>${pom.artifactId},${pom.artifactId}.factory</Export-Package>
                         <Private-Package>${pom.artifactId}.impl</Private-Package>
                         <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>

Modified: servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml?rev=808612&r1=808611&r2=808612&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml Thu Aug 27 20:41:01 2009
@@ -47,6 +47,8 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
+                            org.springframework.osgi*;version="[1.2.0,2.0.0)",
+                            org.springframework*;version="[2.5.6,3.0.0)",
                             javax.jms,
                             org.apache.servicemix.nmr.api,
                             org.apache.servicemix.nmr.api.event,

Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml?rev=808612&r1=808611&r2=808612&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml Thu Aug 27 20:41:01 2009
@@ -119,6 +119,8 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
+                            org.springframework.osgi*;version="[1.2.0,2.0.0)",
+                            org.springframework*;version="[2.5.6,3.0.0)",
                             *
                         </Import-Package>
                         <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>

Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=808612&r1=808611&r2=808612&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Thu Aug 27 20:41:01 2009
@@ -51,6 +51,8 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
+                            org.springframework.osgi*;version="[1.2.0,2.0.0)",
+                            org.springframework*;version="[2.5.6,3.0.0)",
                               org.apache.geronimo.gshell.wisdom.command,
                               org.apache.geronimo.gshell.wisdom.registry,
                               org.apache.servicemix.kernel.gshell.core,

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=808612&r1=808611&r2=808612&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Thu Aug 27 20:41:01 2009
@@ -96,6 +96,8 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
+                            org.springframework.osgi*;version="[1.2.0,2.0.0)",
+                            org.springframework*;version="[2.5.6,3.0.0)",
                             javax.transaction,
                             org.apache.geronimo.transaction.manager;resolution:=optional,
                             org.apache.servicemix.jbi.runtime.impl,

Modified: servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml?rev=808612&r1=808611&r2=808612&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml Thu Aug 27 20:41:01 2009
@@ -68,6 +68,8 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
+                            org.springframework.osgi*;version="[1.2.0,2.0.0)",
+                            org.springframework*;version="[2.5.6,3.0.0)",
                             javax.jbi.component,
                             javax.management,
                             javax.naming,

Modified: servicemix/smx4/nmr/trunk/naming/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/naming/pom.xml?rev=808612&r1=808611&r2=808612&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/naming/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/naming/pom.xml Thu Aug 27 20:41:01 2009
@@ -77,6 +77,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>
+                            org.springframework.osgi*;version="[1.2.0,2.0.0)",
+                            org.springframework*;version="[2.5.6,3.0.0)",
+                            *
+                        </Import-Package>
                         <Export-Package>${pom.artifactId}*</Export-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <Spring-Context>*;publish-context:=false</Spring-Context>

Modified: servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml?rev=808612&r1=808611&r2=808612&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml Thu Aug 27 20:41:01 2009
@@ -84,6 +84,8 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
+                            org.springframework.osgi*;version="[1.2.0,2.0.0)",
+                            org.springframework*;version="[2.5.6,3.0.0)",
                             org.apache.servicemix.document,
                             org.apache.servicemix.executors,
                             org.apache.servicemix.executors.impl,

Modified: servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/pom.xml?rev=808612&r1=808611&r2=808612&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/pom.xml Thu Aug 27 20:41:01 2009
@@ -65,6 +65,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>
+                            org.springframework.osgi*;version="[1.2.0,2.0.0)",
+                            org.springframework*;version="[2.5.6,3.0.0)",
+                            *
+                        </Import-Package>
                         <Export-Package>${pom.artifactId}</Export-Package>
                     </instructions>
                 </configuration>