[resolves wildfly-extras#1992] Add support for component consul

ppalaga · Nov 6, 2017 · a730d93 · a730d93
1 parent 39eacf6
commit a730d93
Show file tree

Hide file tree

Showing 19 changed files with 376 additions and 17 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -8,9 +8,9 @@
   Licensed 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.
@@ -30,13 +30,13 @@
     </parent>
 
     <name>Wildfly Camel :: BOM</name>
-    
+
     <artifactId>wildfly-camel-bom</artifactId>
     <packaging>pom</packaging>
 
     <dependencyManagement>
         <dependencies>
-        
+
             <!-- Camel & WildFly define conflicting shrinkwrap versions, here we say which one we want -->
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
@@ -52,7 +52,7 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-parent</artifactId>
@@ -67,7 +67,7 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.wildfly.camel</groupId>
                 <artifactId>wildfly-camel-config</artifactId>
@@ -98,7 +98,7 @@
                 <artifactId>wildfly-camel-subsystem-undertow</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>args4j</groupId>
                 <artifactId>args4j</artifactId>
@@ -124,6 +124,11 @@
                 <artifactId>jackson-dataformat-yaml</artifactId>
                 <version>${version.wildfly.fasterxml.jackson}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-guava</artifactId>
+                <version>${version.wildfly.fasterxml.jackson}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-joda</artifactId>
@@ -317,5 +322,5 @@
 
         </dependencies>
     </dependencyManagement>
-    
+
 </project>
diff --git a/catalog/src/main/resources/component.roadmap b/catalog/src/main/resources/component.roadmap
@@ -42,6 +42,7 @@ cm-sms
 coap
 cometd
 cometds
+consul                                              #1992
 context                                             #deprecated
 controlbus
 couchbase
@@ -248,7 +249,6 @@ azure-blob                                          #1818
 azure-queue                                         #1819
 beanstalk                                           #1419
 cmis                                                #1989
-consul                                              #1992
 digitalocean                                        #1822
 docker                                              #1424
 drill                                               #1823

diff --git a/docs/guide/components/camel-consul.adoc b/docs/guide/components/camel-consul.adoc
@@ -0,0 +1,4 @@
+### camel-consul
+
+The https://github.com/apache/camel/blob/camel-{camel-version}/components/camel-consul/src/main/docs/consul-component.adoc[consul,window=_blank] component allows you to work with Consul a distributed highly available datacenter-aware service discovery and configuration system.
+
diff --git a/docs/guide/components/index.adoc b/docs/guide/components/index.adoc
@@ -68,6 +68,8 @@ include::camel-coap.adoc[]
 
 include::camel-cometd.adoc[]
 
+include::camel-consul.adoc[]
+
 include::camel-context.adoc[]
 
 include::camel-couchbase.adoc[]

diff --git a/feature/common/etc/smartics/skipped-modules.xml b/feature/common/etc/smartics/skipped-modules.xml
@@ -345,7 +345,11 @@
     <module name="org.glassfish.web" skip="true">
         <include artifact="org.glassfish.web:javax.el" />
     </module>
-
+
+    <module name="org.immutables.value" skip="true">
+        <include artifact="org.immutables:value" />
+    </module>
+
     <module name="org.infinispan.skipped" skip="true">
         <include artifact="org.infinispan:infinispan-cdi-common" />
         <include artifact="org.infinispan:infinispan-cdi-embedded" />

diff --git a/...etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml b/...etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml
@@ -50,6 +50,7 @@
         <module name="org.apache.camel.component.cm.sms" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.coap" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.cometd" export="true" services="export" optional="true" />
+        <module name="org.apache.camel.component.consul" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.context" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.connector" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.couchbase" export="true" services="export" optional="true" />

diff --git a/feature/modules/etc/smartics/camel-modules.xml b/feature/modules/etc/smartics/camel-modules.xml
@@ -520,6 +520,33 @@
         </dependencies>
     </module>
 
+    <module name="org.apache.camel.component.consul">
+        <include artifact="org.apache.camel:camel-consul" />
+        <include artifact="com.orbitz.consul:consul-client" />
+        <apply-to-dependencies skip="true">
+            <include module="com.google.code.findbugs" />
+            <include module="org.apache.camel.apt" />
+            <include module="org.immutables.value" />
+            <include module="org.springframework.boot" />
+        </apply-to-dependencies>
+        <dependencies>
+            <module name="com.fasterxml.jackson.core.jackson-annotations" />
+            <module name="com.fasterxml.jackson.core.jackson-core" />
+            <module name="com.fasterxml.jackson.core.jackson-databind" />
+            <module name="com.fasterxml.jackson.datatype.jackson-datatype-guava" />
+            <module name="com.google.guava" />
+            <module name="com.squareup.retrofit2" />
+            <module name="com.squareup.okhttp3" />
+            <module name="org.apache.commons.lang3" />
+            <module name="org.slf4j" />
+        </dependencies>
+        <exports>
+            <exclude path="com/orbitz" />
+            <include path="com/orbitz/consul" />
+            <include path="com/orbitz/consul/**" />
+        </exports>
+    </module>
+
     <module name="org.apache.camel.component.context">
         <include artifact="org.apache.camel:camel-context" />
         <apply-to-dependencies skip="true">

diff --git a/feature/modules/etc/smartics/other-modules.xml b/feature/modules/etc/smartics/other-modules.xml
@@ -217,7 +217,7 @@
         </properties>
         <include artifact="com.eclipsesource.minimal-json:minimal-json" />
     </module>
-    
+
     <module name="com.fasterxml.aalto">
         <properties>
             <property name="jboss.api" value="private"/>
@@ -277,6 +277,19 @@
         <include artifact=":jackson-module-afterburner" />
     </module>
 
+    <module name="com.fasterxml.jackson.datatype.jackson-datatype-guava">
+        <properties>
+            <property name="jboss.api" value="private"/>
+        </properties>
+        <include artifact="com.fasterxml.jackson.datatype:jackson-datatype-guava" />
+        <dependencies>
+          <module name="com.fasterxml.jackson.core.jackson-annotations" />
+          <module name="com.fasterxml.jackson.core.jackson-core" />
+          <module name="com.fasterxml.jackson.core.jackson-databind" />
+          <module name="com.google.guava" />
+        </dependencies>
+    </module>
+
     <module name="com.fasterxml.jackson.module.jsonSchema">
         <properties>
             <property name="jboss.api" value="private"/>
@@ -1421,7 +1434,7 @@
         </properties>
         <include artifact="org.apache.qpid:proton-(.*)" />
     </module>
-    
+
     <module name="org.apache.sshd">
         <properties>
             <property name="jboss.api" value="private"/>
@@ -1444,7 +1457,7 @@
             <module name="javax.api"/>
         </dependencies>
     </module>
-    
+
     <module name="org.apache.thrift">
         <include artifact="org.apache.thrift:libthrift" />
     </module>

diff --git a/feature/modules/pom.xml b/feature/modules/pom.xml
@@ -118,6 +118,10 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
@@ -705,6 +709,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-pubnub</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-consul</artifactId><!-- consul after pubnub because of retrofit2 -->
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-quartz2</artifactId>

diff --git a/.../system/layers/fuse/com/fasterxml/jackson/datatype/jackson-datatype-guava/main/module.xml b/.../system/layers/fuse/com/fasterxml/jackson/datatype/jackson-datatype-guava/main/module.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.1" name="com.fasterxml.jackson.datatype.jackson-datatype-guava">
+  <properties>
+    <property name="jboss.api" value="private" />
+  </properties>
+  <resources>
+    <artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-guava}" />
+  </resources>
+  <dependencies>
+    <module name="com.fasterxml.jackson.core.jackson-annotations" />
+    <module name="com.fasterxml.jackson.core.jackson-core" />
+    <module name="com.fasterxml.jackson.core.jackson-databind" />
+    <module name="com.google.guava" />
+  </dependencies>
+</module>
diff --git a/...pack/src/main/resources/modules/system/layers/fuse/com/squareup/retrofit2/main/module.xml b/...pack/src/main/resources/modules/system/layers/fuse/com/squareup/retrofit2/main/module.xml
@@ -5,12 +5,14 @@
   </properties>
   <resources>
     <artifact name="${com.squareup.retrofit2:converter-gson}" />
+    <artifact name="${com.squareup.retrofit2:converter-jackson}" />
     <artifact name="${com.squareup.retrofit2:converter-moshi}" />
     <artifact name="${com.squareup.retrofit2:retrofit}" />
   </resources>
   <dependencies>
     <module name="com.squareup.okio" />
     <module name="com.squareup.okhttp3" />
+    <module name="com.fasterxml.jackson.core.jackson-databind" />
     <module name="com.google.code.gson" />
     <module name="com.squareup.moshi" />
   </dependencies>

diff --git a/...in/resources/modules/system/layers/fuse/org/apache/camel/component/consul/main/module.xml b/...in/resources/modules/system/layers/fuse/org/apache/camel/component/consul/main/module.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.consul">
+  <resources>
+    <artifact name="${org.apache.camel:camel-consul}" />
+    <artifact name="${com.orbitz.consul:consul-client}" />
+  </resources>
+  <dependencies>
+    <module name="com.fasterxml.jackson.core.jackson-annotations" />
+    <module name="com.fasterxml.jackson.core.jackson-core" />
+    <module name="com.fasterxml.jackson.core.jackson-databind" />
+    <module name="com.fasterxml.jackson.datatype.jackson-datatype-guava" />
+    <module name="com.google.guava" />
+    <module name="com.squareup.retrofit2" />
+    <module name="com.squareup.okhttp3" />
+    <module name="org.apache.commons.lang3" />
+    <module name="org.slf4j" />
+    <module name="javax.xml.bind.api" />
+    <module name="org.apache.camel.core" />
+  </dependencies>
+  <exports>
+    <exclude path="com/orbitz" />
+    <include path="com/orbitz/consul" />
+    <include path="com/orbitz/consul/**" />
+  </exports>
+</module>
diff --git a/.../src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml b/.../src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml
@@ -50,6 +50,7 @@
         <module name="org.apache.camel.component.cm.sms" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.coap" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.cometd" export="true" services="export" optional="true" />
+        <module name="org.apache.camel.component.consul" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.context" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.connector" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.couchbase" export="true" services="export" optional="true" />

diff --git a/itests/standalone/docker/pom.xml b/itests/standalone/docker/pom.xml
@@ -64,6 +64,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-consul</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		### camel-consul

		The https://github.com/apache/camel/blob/camel-{camel-version}/components/camel-consul/src/main/docs/consul-component.adoc[consul,window=_blank] component allows you to work with Consul a distributed highly available datacenter-aware service discovery and configuration system.