Author: davsclaus
Date: Mon Oct 29 15:31:57 2012
New Revision: 1403367
URL: http://svn.apache.org/viewvc?rev=1403367&view=rev
Log:
CAMEL-5740: Fixed so import defaults is last to fix camel-spring.
Modified:
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-cdi/pom.xml
camel/trunk/components/camel-spring/pom.xml
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1403367&r1=1403366&r2=1403367&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Mon Oct 29 15:31:57 2012
@@ -33,10 +33,10 @@
<camel.osgi.import>
!org.apache.camel.blueprint.*,
!org.apache.camel.util.blueprint.*,
- ${camel.osgi.import.defaults},
org.apache.camel.*;${camel.osgi.import.strict.version},
org.osgi.service.event*;resolution:=optional,
org.apache.aries*;version="[0.3,2)",
+ ${camel.osgi.import.defaults},
*
</camel.osgi.import>
<camel.osgi.export>
Modified: camel/trunk/components/camel-cdi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/pom.xml?rev=1403367&r1=1403366&r2=1403367&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/pom.xml (original)
+++ camel/trunk/components/camel-cdi/pom.xml Mon Oct 29 15:31:57 2012
@@ -34,8 +34,8 @@
<camel.osgi.import>
!org.apache.camel.cdi.*,
!org.apache.deltaspike.cdise.api.*,
- ${camel.osgi.import.defaults},
org.apache.deltaspike.core.api.*;resolution:=optional,
+ ${camel.osgi.import.defaults},
*
</camel.osgi.import>
<camel.osgi.export.pkg>
Modified: camel/trunk/components/camel-spring/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1403367&r1=1403366&r2=1403367&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Mon Oct 29 15:31:57 2012
@@ -37,10 +37,10 @@
!org.apache.camel.component.event,
!org.apache.camel.language.spel,
org.apache.camel.*;${camel.osgi.import.strict.version},
- ${camel.osgi.import.defaults},
+ org.springframework.osgi.*;version="[1.2,2)",
org.osgi.framework;version="[1.3,2)",
org.osgi.service.event;resolution:=optional,
- org.springframework.osgi.*;version="[1.2,2)",
+ ${camel.osgi.import.defaults},
*
</camel.osgi.import>
<camel.osgi.export>
