Author: gertv
Date: Mon Dec 27 14:43:53 2010
New Revision: 1053079
URL: http://svn.apache.org/viewvc?rev=1053079&view=rev
Log:
SMX4NMR-235: Ensure proper Spring import range of [2.5,4) for all NMR bundles
Modified:
servicemix/smx4/nmr/trunk/document/pom.xml
servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
servicemix/smx4/nmr/trunk/testing/support/pom.xml
Modified: servicemix/smx4/nmr/trunk/document/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/document/pom.xml?rev=1053079&r1=1053078&r2=1053079&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/document/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/document/pom.xml Mon Dec 27 14:43:53 2010
@@ -101,7 +101,7 @@
<Import-Package>
org.osgi.service.blueprint*;resolution:=optional,
org.apache.aries.blueprint*;resolution:=optional,
- org.springframework.*;resolution:=optional,
+
org.springframework.*;version="${spring.import.range}";resolution:=optional,
*
</Import-Package>
<Private-Package>${project.artifactId}.impl</Private-Package>
Modified: servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml?rev=1053079&r1=1053078&r2=1053079&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/nmr/client/pom.xml Mon Dec 27 14:43:53
2010
@@ -66,7 +66,7 @@
org.apache.servicemix.nmr.api,
org.apache.servicemix.nmr.api.service,
org.osgi.framework,
- org.springframework.beans.factory
+
org.springframework.beans.factory;version="${spring.import.range}"
</Import-Package>
<Private-Package>org.apache.servicemix.nmr.examples.nmr.client</Private-Package>
</instructions>
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=1053079&r1=1053078&r2=1053079&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml Mon Dec 27 14:43:53
2010
@@ -126,6 +126,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
org.springframework.osgi*;resolution:=optional,
+
org.springframework.beans.factory;version="${spring.import.range}",
*
</Import-Package>
<Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=1053079&r1=1053078&r2=1053079&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Mon Dec 27 14:43:53 2010
@@ -136,7 +136,7 @@
javax.transaction,
javax.management.loading,
org.apache.geronimo.transaction.manager;resolution:=optional,
-
org.springframework.transaction;resolution:=optional,
+
org.springframework.transaction;version="${spring.import.range}";resolution:=optional,
org.apache.servicemix.jbi.runtime.impl,
org.apache.tools.ant*;resolution:=optional,
*
Modified: servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml?rev=1053079&r1=1053078&r2=1053079&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml Mon Dec 27 14:43:53 2010
@@ -74,7 +74,7 @@
javax.naming,
javax.transaction,
org.apache.geronimo.transaction.manager;resolution:=optional,
-
org.springframework.transaction;resolution:=optional,
+
org.springframework.transaction;version="${spring.import.range}";resolution:=optional,
org.apache.servicemix.document,
org.apache.servicemix.nmr.api,
org.apache.servicemix.nmr.api.service,
Modified: servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/pom.xml?rev=1053079&r1=1053078&r2=1053079&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/pom.xml Mon Dec 27 14:43:53 2010
@@ -104,7 +104,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
<Import-Package>
-
org.springframework*;resolution:=optional;version="[2.5,4)",
+
org.springframework*;resolution:=optional;version="${spring.import.range}",
*
</Import-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1053079&r1=1053078&r2=1053079&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Mon Dec 27 14:43:53 2010
@@ -112,6 +112,7 @@
<!-- Spring -->
<spring.version>3.0.4.RELEASE</spring.version>
+ <spring.import.range>[2.5,4)</spring.import.range>
<spring.osgi.version>1.2.0</spring.osgi.version>
<!-- Other Dependencies -->
Modified: servicemix/smx4/nmr/trunk/testing/support/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/pom.xml?rev=1053079&r1=1053078&r2=1053079&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/testing/support/pom.xml Mon Dec 27 14:43:53 2010
@@ -137,7 +137,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.management,
- org.springframework.jmx.support,
+
org.springframework.jmx.support;version="${spring.import.range}",
org.apache.felix*;resolution:=optional,
org.apache.servicemix.platform.main;resolution:=optional,
org.apache.servicemix.platform.main.spi;resolution:=optional;version="1.0.0",
