Repository: camel Updated Branches: refs/heads/camel-2.17.x cbe8c3268 -> cdd0704db
CAMEL-10079: Upgrade quickfixj to v1.6.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cdd0704d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cdd0704d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cdd0704d Branch: refs/heads/camel-2.17.x Commit: cdd0704db24d3260b019cdacc59f6ca7d8265304 Parents: cbe8c32 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Tue Jun 21 09:00:22 2016 +0200 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Tue Jun 21 09:09:14 2016 +0200 ---------------------------------------------------------------------- components/camel-quickfix/pom.xml | 6 +++--- parent/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cdd0704d/components/camel-quickfix/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml index 602f3e5..81d677a 100644 --- a/components/camel-quickfix/pom.xml +++ b/components/camel-quickfix/pom.xml @@ -41,9 +41,9 @@ <artifactId>camel-core</artifactId> </dependency> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.quickfix</artifactId> - <version>${quickfix-bundle-version}</version> + <groupId>org.quickfixj</groupId> + <artifactId>quickfixj-all</artifactId> + <version>${quickfixj-version}</version> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/cdd0704d/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b837bbb..3c86f22 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -457,7 +457,7 @@ <quartz-version>1.8.6</quartz-version> <quartz-version-range>[1.8,2)</quartz-version-range> <quartz2-version>2.2.2</quartz2-version> - <quickfix-bundle-version>1.6.1_1</quickfix-bundle-version> + <quickfixj-version>1.6.2</quickfixj-version> <rabbitmq-amqp-client-version>3.6.1</rabbitmq-amqp-client-version> <reflections-bundle-version>0.9.10_3</reflections-bundle-version> <regexp-bundle-version>1.4_1</regexp-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/cdd0704d/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 fd8f2e6..1e9cde4 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1283,8 +1283,8 @@ </feature> <feature name='camel-quickfix' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quickfix/${quickfix-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle> + <bundle>mvn:org.quickfixj/quickfixj-all/${quickfixj-version}</bundle> <bundle>mvn:org.apache.camel/camel-quickfix/${project.version}</bundle> </feature> <feature name='camel-rabbitmq' version='${project.version}' resolver='(obr)' start-level='50'>