Author: davsclaus
Date: Mon Feb 11 12:28:27 2013
New Revision: 1444748
URL: http://svn.apache.org/r1444748
Log:
CAMEL-6060: Fixed osgi import range for some language components to include the
spi package. The felix bundle plugin has a bug and do not include that package.
Modified:
camel/trunk/components/camel-josql/pom.xml
camel/trunk/components/camel-jxpath/pom.xml
camel/trunk/components/camel-mvel/pom.xml
camel/trunk/components/camel-ognl/pom.xml
Modified: camel/trunk/components/camel-josql/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-josql/pom.xml?rev=1444748&r1=1444747&r2=1444748&view=diff
==============================================================================
--- camel/trunk/components/camel-josql/pom.xml (original)
+++ camel/trunk/components/camel-josql/pom.xml Mon Feb 11 12:28:27 2013
@@ -30,7 +30,7 @@
<description>Camel JoSQL support</description>
<properties>
- <camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>
org.apache.camel.builder.sql.*;${camel.osgi.version},
org.apache.camel.language.sql.*
</camel.osgi.export.pkg>
@@ -40,6 +40,8 @@
${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
+ <!-- need to import spi as felix-bundle-plugin has a bug and do not
include this package despite we use in the source code -->
+
<camel.osgi.import.before.defaults>org.apache.camel.spi;${camel.osgi.import.strict.version}</camel.osgi.import.before.defaults>
<camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=sql</camel.osgi.export.service>
</properties>
Modified: camel/trunk/components/camel-jxpath/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/pom.xml?rev=1444748&r1=1444747&r2=1444748&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/pom.xml (original)
+++ camel/trunk/components/camel-jxpath/pom.xml Mon Feb 11 12:28:27 2013
@@ -30,7 +30,9 @@
<description>Camel JXPath support</description>
<properties>
-
<camel.osgi.export.pkg>org.apache.camel.language.jxpath.*</camel.osgi.export.pkg>
+ <!-- need to import spi as felix-bundle-plugin has a bug and do not
include this package despite we use in the source code -->
+
<camel.osgi.import.before.defaults>org.apache.camel.spi;${camel.osgi.import.strict.version}</camel.osgi.import.before.defaults>
+
<camel.osgi.export.pkg>org.apache.camel.language.jxpath.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=jxpath</camel.osgi.export.service>
</properties>
Modified: camel/trunk/components/camel-mvel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/pom.xml?rev=1444748&r1=1444747&r2=1444748&view=diff
==============================================================================
--- camel/trunk/components/camel-mvel/pom.xml (original)
+++ camel/trunk/components/camel-mvel/pom.xml Mon Feb 11 12:28:27 2013
@@ -30,8 +30,10 @@
<description>Camel MVEL support</description>
<properties>
-
<camel.osgi.export.pkg>org.apache.camel.language.mvel.*</camel.osgi.export.pkg>
-
<camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=mvel</camel.osgi.export.service>
+ <!-- need to import spi as felix-bundle-plugin has a bug and do not
include this package despite we use in the source code -->
+
<camel.osgi.import.before.defaults>org.apache.camel.spi;${camel.osgi.import.strict.version}</camel.osgi.import.before.defaults>
+
<camel.osgi.export.pkg>org.apache.camel.language.mvel.*</camel.osgi.export.pkg>
+
<camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=mvel</camel.osgi.export.service>
</properties>
<dependencies>
@@ -40,11 +42,11 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>${mvel-version}</version>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel2</artifactId>
+ <version>${mvel-version}</version>
</dependency>
<!-- test dependency -->
Modified: camel/trunk/components/camel-ognl/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/pom.xml?rev=1444748&r1=1444747&r2=1444748&view=diff
==============================================================================
--- camel/trunk/components/camel-ognl/pom.xml (original)
+++ camel/trunk/components/camel-ognl/pom.xml Mon Feb 11 12:28:27 2013
@@ -30,7 +30,9 @@
<description>Camel OGNL support</description>
<properties>
-
<camel.osgi.export.pkg>org.apache.camel.language.ognl.*</camel.osgi.export.pkg>
+ <!-- need to import spi as felix-bundle-plugin has a bug and do not
include this package despite we use in the source code -->
+
<camel.osgi.import.before.defaults>org.apache.camel.spi;${camel.osgi.import.strict.version}</camel.osgi.import.before.defaults>
+
<camel.osgi.export.pkg>org.apache.camel.language.ognl.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=ognl</camel.osgi.export.service>
</properties>
