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 2018/12/12 10:45:23 UTC
[camel] 02/05: Fixed broke karaf and springboot itests for
camel-jgroups-raft component.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 820d84247b42d29864e7bbf681550c5968a630f4
Author: Andrea Tarocchi <at...@redhat.com>
AuthorDate: Tue Dec 11 23:17:58 2018 +0100
Fixed broke karaf and springboot itests for camel-jgroups-raft component.
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
.../src/main/resources/META-INF/spring.factories | 4 ++--
.../org/apache/camel/itest/springboot/util/ArquillianPackager.java | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 1e10b38..9933049 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1248,7 +1248,7 @@
<feature name='camel-jgroups-raft' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.camel/camel-jgroups-raft/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-jgroups-raft/${project.version}</bundle>
<bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-raft-jgroups-version}</bundle>
<bundle dependency='true'>mvn:org.jgroups/jgroups-raft/${jgroups-raft-version}</bundle>
<bundle dependency='true'>mvn:org.fusesource.leveldbjni/leveldbjni-all/${jgroups-raft-leveldbjni-version}</bundle>
diff --git a/platforms/spring-boot/components-starter/camel-jgroups-raft-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-jgroups-raft-starter/src/main/resources/META-INF/spring.factories
index 71812c7..20102b9 100644
--- a/platforms/spring-boot/components-starter/camel-jgroups-raft-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-jgroups-raft-starter/src/main/resources/META-INF/spring.factories
@@ -16,6 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.jgroups.raft.springboot.JgroupsRaftComponentAutoConfiguration,\
-org.apache.camel.component.jgroups.raft.springboot.JGroupsRaftComponentAutoConfiguration
+org.apache.camel.component.jgroups.raft.springboot.JGroupsRaftComponentAutoConfiguration,\
+org.apache.camel.component.jgroups.raft.springboot.cluster.springboot.JGroupsRaftClusterServiceAutoConfiguration
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index 788efe5..3cf3aae 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -347,6 +347,7 @@ public final class ArquillianPackager {
ignore.add("xml-apis:xml-apis-ext");
ignore.add("org.jboss.logging");
ignore.add("org.jboss.marshalling");
+ ignore.add("org.jgroups:jgroups-raft");
Map<String, Map<String, String>> status = new TreeMap<>();
Set<String> mismatches = new TreeSet<>();