You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/11/21 16:23:42 UTC
[1/3] camel git commit: Fixed missing components in osgi manifest
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 21432447f -> bef5bded7
refs/heads/master 4afc18e29 -> 2ab4bf65d
Fixed missing components in osgi manifest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07899daa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07899daa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07899daa
Branch: refs/heads/master
Commit: 07899daa8d70eb1e140e69d9d2725f667a027a91
Parents: 4afc18e
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Nov 21 15:53:38 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Nov 21 15:53:38 2015 +0100
----------------------------------------------------------------------
camel-core/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/07899daa/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 498bfd3..7b05e58 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -69,8 +69,9 @@
org.apache.camel.spi.ComponentResolver;component=properties,
org.apache.camel.spi.ComponentResolver;component=ref,
org.apache.camel.spi.ComponentResolver;component=rest,
- org.apache.camel.spi.ComponentResolver;component=seda,
+ org.apache.camel.spi.ComponentResolver;component=rest-api,
org.apache.camel.spi.ComponentResolver;component=scheduler,
+ org.apache.camel.spi.ComponentResolver;component=seda,
org.apache.camel.spi.ComponentResolver;component=stub,
org.apache.camel.spi.ComponentResolver;component=test,
org.apache.camel.spi.ComponentResolver;component=timer,
@@ -83,9 +84,9 @@
org.apache.camel.spi.DataFormatResolver;dataformat=zip,
org.apache.camel.spi.LanguageResolver;language=bean,
org.apache.camel.spi.LanguageResolver;language=constant,
+ org.apache.camel.spi.LanguageResolver;language=exchangeProperty,
org.apache.camel.spi.LanguageResolver;language=file,
org.apache.camel.spi.LanguageResolver;language=header,
- org.apache.camel.spi.LanguageResolver;language=property,
org.apache.camel.spi.LanguageResolver;language=ref,
org.apache.camel.spi.LanguageResolver;language=simple,
org.apache.camel.spi.LanguageResolver;language=tokenize,
[3/3] camel git commit: Fixed missing components in osgi manifest
Posted by da...@apache.org.
Fixed missing components in osgi manifest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bef5bded
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bef5bded
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bef5bded
Branch: refs/heads/camel-2.16.x
Commit: bef5bded7c61f7100e20fe027d34884ad33f2d14
Parents: 2143244
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Nov 21 15:53:38 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Nov 21 16:23:34 2015 +0100
----------------------------------------------------------------------
camel-core/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bef5bded/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 96ba794..9cdf34a 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -69,8 +69,9 @@
org.apache.camel.spi.ComponentResolver;component=properties,
org.apache.camel.spi.ComponentResolver;component=ref,
org.apache.camel.spi.ComponentResolver;component=rest,
- org.apache.camel.spi.ComponentResolver;component=seda,
+ org.apache.camel.spi.ComponentResolver;component=rest-api,
org.apache.camel.spi.ComponentResolver;component=scheduler,
+ org.apache.camel.spi.ComponentResolver;component=seda,
org.apache.camel.spi.ComponentResolver;component=stub,
org.apache.camel.spi.ComponentResolver;component=test,
org.apache.camel.spi.ComponentResolver;component=timer,
@@ -83,9 +84,9 @@
org.apache.camel.spi.DataFormatResolver;dataformat=zip,
org.apache.camel.spi.LanguageResolver;language=bean,
org.apache.camel.spi.LanguageResolver;language=constant,
+ org.apache.camel.spi.LanguageResolver;language=exchangeProperty,
org.apache.camel.spi.LanguageResolver;language=file,
org.apache.camel.spi.LanguageResolver;language=header,
- org.apache.camel.spi.LanguageResolver;language=property,
org.apache.camel.spi.LanguageResolver;language=ref,
org.apache.camel.spi.LanguageResolver;language=simple,
org.apache.camel.spi.LanguageResolver;language=tokenize,
[2/3] camel git commit: CAMEL-9347: camel-blueprint - Fix auto lookup
of transaction policy
Posted by da...@apache.org.
CAMEL-9347: camel-blueprint - Fix auto lookup of transaction policy
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ab4bf65
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ab4bf65
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ab4bf65
Branch: refs/heads/master
Commit: 2ab4bf65d0a914bb98bc09185019c45774dab1c7
Parents: 07899da
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Nov 21 15:54:04 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Nov 21 15:54:04 2015 +0100
----------------------------------------------------------------------
camel-core/pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ab4bf65/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 7b05e58..d197c02 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -41,6 +41,8 @@
!org.apache.camel.*,
!com.googlecode.concurrentlinkedhashmap,
${camel.osgi.import.defaults},
+ org.springframework.transaction;resolution:=optional,
+ org.apache.camel.spring.spi;resolution:=optional,
org.apache.xalan.xsltc.trax;resolution:=optional,
javax.activation;resolution:=optional,
javax.xml.bind;resolution:=optional,