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/10/11 06:25:21 UTC
[1/2] camel git commit: Upgrade QuickfixJ to version 1.6.4
Repository: camel
Updated Branches:
refs/heads/master 6def9fb6d -> 5f3856230
Upgrade QuickfixJ to version 1.6.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/511d173d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/511d173d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/511d173d
Branch: refs/heads/master
Commit: 511d173d949f1281c2bf53e3cf5443db40140b5f
Parents: 6def9fb
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Oct 11 08:18:55 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Oct 11 08:18:55 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/quickfixj/QuickfixjEngineTest.java | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/511d173d/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
index 6fa933b..ee30e2e 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
@@ -507,7 +507,7 @@ public class QuickfixjEngineTest extends org.apache.camel.test.junit4.TestSuppor
assertTrue("Logoffs not received", logoffLatch.await(5000, TimeUnit.MILLISECONDS));
quickfixjEngine.removeEventListener(logoffListener);
- assertThat(events.size(), is(2));
+ assertThat(events.size(), is(6));
assertTrue(events.contains(new EventRecord(QuickfixjEventCategory.SessionLogoff, acceptorSessionID, null)));
assertTrue(events.contains(new EventRecord(QuickfixjEventCategory.SessionLogoff, initiatorSessionID, null)));
http://git-wip-us.apache.org/repos/asf/camel/blob/511d173d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5cc0831..47113ae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -570,7 +570,7 @@
<quartz-version>1.8.6</quartz-version>
<quartz-version-range>[1.8,2)</quartz-version-range>
<quartz2-version>2.3.0</quartz2-version>
- <quickfixj-version>1.6.3</quickfixj-version>
+ <quickfixj-version>1.6.4</quickfixj-version>
<rabbitmq-amqp-client-version>5.0.0</rabbitmq-amqp-client-version>
<reactive-streams-version>1.0.0</reactive-streams-version>
<reactor-version>3.0.7.RELEASE</reactor-version>
[2/2] camel git commit: Fixed Camel-Quickfix Karaf feature to reflect
the upgrade
Posted by ac...@apache.org.
Fixed Camel-Quickfix Karaf feature to reflect the upgrade
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5f385623
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f385623
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f385623
Branch: refs/heads/master
Commit: 5f385623093e2bc604eeae4c529ed91e0ee8ecae
Parents: 511d173
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Oct 11 08:24:39 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Oct 11 08:24:39 2017 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5f385623/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 f823aab..e1ec99e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1743,6 +1743,8 @@
<feature name='camel-quickfix' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
<bundle>mvn:org.quickfixj/quickfixj-all/${quickfixj-version}</bundle>
<bundle>mvn:org.apache.camel/camel-quickfix/${project.version}</bundle>
</feature>