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 2016/05/05 09:37:06 UTC
camel git commit: Fixed camel-hystrix feature and removed @Ignore
from camel-hystrix karaf test
Repository: camel
Updated Branches:
refs/heads/master 7d7f443a7 -> 050c76cdc
Fixed camel-hystrix feature and removed @Ignore from camel-hystrix karaf test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/050c76cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/050c76cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/050c76cd
Branch: refs/heads/master
Commit: 050c76cdcc9d8420eb2986f7ed8a3177b9adf756
Parents: 7d7f443
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu May 5 11:34:06 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu May 5 11:34:06 2016 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 2 ++
.../test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/050c76cd/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 7eed21b..013f064 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -729,6 +729,8 @@
<feature name='camel-hystrix' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hystrix/${hystrix-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hystrix-event-stream/${hystrix-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:io.reactivex/rxjava/${rxjava-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/050c76cd/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
index 941647b..19cee1b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-@Ignore("Need a new hystrix SMX bundle")
public class CamelHystrixTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelHystrixTest.class);
@@ -32,4 +31,4 @@ public class CamelHystrixTest extends BaseKarafTest {
testComponent(COMPONENT);
}
-}
\ No newline at end of file
+}