You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/06/08 15:37:49 UTC
[1/2] camel git commit: Hystrix component has been removed
Repository: camel
Updated Branches:
refs/heads/master 192c557ec -> ed514433d
Hystrix component has been removed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed514433
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed514433
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed514433
Branch: refs/heads/master
Commit: ed514433d3e86e67d47f09ab6b3a0565d4e8a1a6
Parents: 3d046e9
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jun 8 17:29:56 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jun 8 17:37:42 2016 +0200
----------------------------------------------------------------------
.../camel/itest/karaf/CamelHystrixTest.java | 34 --------------------
1 file changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ed514433/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
deleted file mode 100644
index 19cee1b..0000000
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.karaf;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-public class CamelHystrixTest extends BaseKarafTest {
-
- public static final String COMPONENT = extractName(CamelHystrixTest.class);
-
- @Test
- public void test() throws Exception {
- testComponent(COMPONENT);
- }
-
-}
[2/2] camel git commit: CAMEL-9419: Generate spring-boot auto
configuration for all Camel components that has options that can be
configured.
Posted by da...@apache.org.
CAMEL-9419: Generate spring-boot auto configuration for all Camel components that has options that can be configured.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d046e9d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d046e9d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d046e9d
Branch: refs/heads/master
Commit: 3d046e9d17e17afdeee735eddd79dc24ff4fb279
Parents: 192c557
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jun 8 17:29:37 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jun 8 17:37:42 2016 +0200
----------------------------------------------------------------------
components/camel-cxf/pom.xml | 3 ++-
components/camel-spring/pom.xml | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3d046e9d/components/camel-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 55622d3..e8dd19f 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -31,6 +31,8 @@
<properties>
<camel.osgi.import>
+ !org.springframework.boot.*,
+ !org.springframework.context.annotation.*;resolution:=optional,
!org.apache.camel.component.cxf,
!org.apache.camel.component.cxf.blueprint,
!org.apache.camel.component.cxf.converter,
@@ -61,7 +63,6 @@
org.apache.camel.blueprint;resolution:=optional,
*
</camel.osgi.import>
-
<camel.osgi.export>
org.apache.camel.component.cxf;${camel.osgi.version},
org.apache.camel.component.cxf.blueprint;${camel.osgi.version},
http://git-wip-us.apache.org/repos/asf/camel/blob/3d046e9d/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 026a6c4..971148c 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -32,6 +32,8 @@
<properties>
<!-- use spring-all-version-range to support camel-spring-dm also -->
<camel.osgi.import>
+ !org.springframework.boot.*,
+ !org.springframework.context.annotation.*;resolution:=optional,
!org.apache.camel.spring.*,
!org.apache.camel.component,
!org.apache.camel.component.event,