You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2016/03/31 17:41:11 UTC
camel git commit: CAMEL-9764: Fix OSGi import issues in camel-ftp and
camel-ognl.
Repository: camel
Updated Branches:
refs/heads/master d9b9eaf87 -> 7bb9230af
CAMEL-9764: Fix OSGi import issues in camel-ftp and camel-ognl.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7bb9230a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7bb9230a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7bb9230a
Branch: refs/heads/master
Commit: 7bb9230af56076f6fae746578c673a1a0da686ce
Parents: d9b9eaf
Author: Raúl Kripalani <ra...@apache.org>
Authored: Thu Mar 31 16:40:36 2016 +0100
Committer: Raúl Kripalani <ra...@apache.org>
Committed: Thu Mar 31 16:41:01 2016 +0100
----------------------------------------------------------------------
components/camel-ftp/pom.xml | 3 +--
components/camel-ognl/pom.xml | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7bb9230a/components/camel-ftp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 301a662..6e4691e 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -31,8 +31,7 @@
<properties>
<camel.osgi.import.before.defaults>
- com.jcraft.jsch.*;version="[0.1.40,0.2)",
- org.apache.camel.component.file.strategy;${camel.osgi.import.strict.version}
+ com.jcraft.jsch.*;version="[0.1.40,0.2)"
</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.component.file.remote.*</camel.osgi.export.pkg>
<camel.osgi.export.service>
http://git-wip-us.apache.org/repos/asf/camel/blob/7bb9230a/components/camel-ognl/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml
index 24d0e10..0958355 100644
--- a/components/camel-ognl/pom.xml
+++ b/components/camel-ognl/pom.xml
@@ -30,8 +30,6 @@
<description>Camel OGNL support</description>
<properties>
- <!-- 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>