You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/08/06 09:33:44 UTC
[1/3] camel git commit: Update Spring Data Redis and Spring Ldap
features to make them work on Karaf 4.2.x
Repository: camel
Updated Branches:
refs/heads/master 497b68192 -> befbfbd66
Update Spring Data Redis and Spring Ldap features to make them work on Karaf 4.2.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/463d339e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/463d339e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/463d339e
Branch: refs/heads/master
Commit: 463d339e59cbef9705a2cbcf759c846599be9996
Parents: 497b681
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Aug 6 10:55:14 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Aug 6 11:33:28 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 3 ++-
platforms/karaf/features/src/main/resources/features.xml | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/463d339e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4eebdaa..f88d66b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -622,7 +622,8 @@
<spring-cloud-commons-version>1.2.3.RELEASE</spring-cloud-commons-version>
<spring-cloud-netflix-version>1.2.7.RELEASE</spring-cloud-netflix-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
- <spring-data-commons-version>1.11.6.RELEASE</spring-data-commons-version>
+ <spring-data-commons-version>1.13.6.RELEASE</spring-data-commons-version>
+ <spring-data-keyvalue-version>1.2.6.RELEASE</spring-data-keyvalue-version>
<spring-data-redis-version>1.8.6.RELEASE</spring-data-redis-version>
<spring-integration-version>4.3.11.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/463d339e/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 92251a2..a61b301 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1825,6 +1825,8 @@
<feature version='${spring42-version-range}'>spring-tx</feature>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.data/spring-data-redis/${spring-data-redis-version}</bundle>
+ <bundle dependency='true'>mvn:org.springframework.data/spring-data-keyvalue/${spring-data-keyvalue-version}</bundle>
+ <bundle dependency='true'>mvn:org.springframework.data/spring-data-commons/${spring-data-commons-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jedis/${jedis-client-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-redis/${project.version}</bundle>
[2/3] camel git commit: Add a note to Camel Spring Redis feature
Posted by ac...@apache.org.
Add a note to Camel Spring Redis feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ddc9fac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ddc9fac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ddc9fac
Branch: refs/heads/master
Commit: 4ddc9fac685ddcea1ccff07b8a6cc6b18618af1d
Parents: 463d339
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Aug 6 10:57:17 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Aug 6 11:33:29 2017 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4ddc9fac/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index a61b301..7cc182d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1819,7 +1819,7 @@
<bundle>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle>
</feature>
<feature name='camel-spring-redis' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>Does not work with Karaf due KARAF-4921</details>
+ <details>Does not work with Karaf 4.1.x due KARAF-4921, but work with Karaf 4.2.x</details>
<feature version='${project.version}'>camel-core</feature>
<feature version='${spring42-version-range}'>spring</feature>
<feature version='${spring42-version-range}'>spring-tx</feature>
[3/3] camel git commit: Upgrade Spring Cloud Netflix to version
1.3.2.RELEASE
Posted by ac...@apache.org.
Upgrade Spring Cloud Netflix to version 1.3.2.RELEASE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/befbfbd6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/befbfbd6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/befbfbd6
Branch: refs/heads/master
Commit: befbfbd6694628c79f91bb69cf656ff69135b79f
Parents: 4ddc9fa
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Aug 6 11:01:11 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Aug 6 11:33:29 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/befbfbd6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f88d66b..4ae96d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -620,7 +620,7 @@
<spring-boot-version>1.5.6.RELEASE</spring-boot-version>
<!-- use same version of spring-cloud 1.2.x -->
<spring-cloud-commons-version>1.2.3.RELEASE</spring-cloud-commons-version>
- <spring-cloud-netflix-version>1.2.7.RELEASE</spring-cloud-netflix-version>
+ <spring-cloud-netflix-version>1.3.2.RELEASE</spring-cloud-netflix-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.13.6.RELEASE</spring-data-commons-version>
<spring-data-keyvalue-version>1.2.6.RELEASE</spring-data-keyvalue-version>