Repository: camel Updated Branches: refs/heads/master 70ac57f42 -> 782b04c55
Upgrade Hystrix and related bundle to version 1.5.6 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/782b04c5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/782b04c5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/782b04c5 Branch: refs/heads/master Commit: 782b04c556423b108b32fc8dc6b2d634868d32cf Parents: f2fe7da Author: Andrea Cosentino <anco...@gmail.com> Authored: Mon Nov 7 11:54:18 2016 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Mon Nov 7 11:56:01 2016 +0100 ---------------------------------------------------------------------- components-starter/camel-hystrix-starter/pom.xml | 4 ---- parent/pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/782b04c5/components-starter/camel-hystrix-starter/pom.xml ---------------------------------------------------------------------- diff --git a/components-starter/camel-hystrix-starter/pom.xml b/components-starter/camel-hystrix-starter/pom.xml index 8d47976..a4c6b13 100644 --- a/components-starter/camel-hystrix-starter/pom.xml +++ b/components-starter/camel-hystrix-starter/pom.xml @@ -36,16 +36,13 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-hystrix</artifactId> <version>${project.version}</version> - <!--START OF GENERATED CODE--> <exclusions> <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> </exclusions> - <!--END OF GENERATED CODE--> </dependency> - <!--START OF GENERATED CODE--> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core-starter</artifactId> @@ -54,6 +51,5 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-spring-boot-starter</artifactId> </dependency> - <!--END OF GENERATED CODE--> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/782b04c5/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 26f1248..951daee 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -261,8 +261,8 @@ <httpclient4-version>4.5.2</httpclient4-version> <httpasyncclient-version>4.1.2</httpasyncclient-version> <httpclient-version>3.1</httpclient-version> - <hystrix-version>1.5.5</hystrix-version> - <hystrix-bundle-version>1.5.5_1</hystrix-bundle-version> + <hystrix-version>1.5.6</hystrix-version> + <hystrix-bundle-version>1.5.6_1</hystrix-bundle-version> <ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version> <ibatis-version>2.3.4.726</ibatis-version> <ical4j-version>1.0.7</ical4j-version>
