camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ond...@apache.org
Subject camel git commit: CAMEL-11762 - CS fix
Date Sat, 09 Sep 2017 22:12:20 GMT
Repository: camel
Updated Branches:
  refs/heads/master 70918650d -> 14273a522


CAMEL-11762 - CS fix

CAMEL-11762 - CR(Code Review) fix


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/14273a52
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14273a52
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14273a52

Branch: refs/heads/master
Commit: 14273a522dd6e32c9dc672502e8805a3a9846a29
Parents: 7091865
Author: onders86 <ondersezgin@gmail.com>
Authored: Sun Sep 10 00:51:56 2017 +0300
Committer: onders86 <ondersezgin@gmail.com>
Committed: Sun Sep 10 01:10:20 2017 +0300

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/features.xml       | 4 ++--
 .../test/java/org/apache/camel/itest/karaf/CamelASN1Test.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/14273a52/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 6b7945b..1022c29 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -116,8 +116,8 @@
   </feature>
   <feature name='camel-asn1' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
-	<bundle dependency='true'>mvn:org.openmuc/jasn1/${jasn1-version}</bundle>
-	<bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle>
+    <bundle dependency='true'>mvn:org.openmuc/jasn1/${jasn1-version}</bundle>
+    <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-asn1/${project.version}</bundle>
   </feature>
   <feature name='camel-asterisk' version='${project.version}' resolver='(obr)' start-level='50'>

http://git-wip-us.apache.org/repos/asf/camel/blob/14273a52/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelASN1Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelASN1Test.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelASN1Test.java
index ec0973f..8589288 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelASN1Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelASN1Test.java
@@ -23,12 +23,12 @@ import org.ops4j.pax.exam.junit.PaxExam;
 @RunWith(PaxExam.class)
 public class CamelASN1Test extends BaseKarafTest {
 
-    public static final String COMPONENT = extractName(CamelASN1Test.class);
+    public static final String COMPONENT = "asn1";
 
     @Test
     public void test() throws Exception {
-        testDataFormat("asn1");
+        testDataFormat(COMPONENT);
     }
 
 
-}
\ No newline at end of file
+}


Mime
View raw message