[camel] branch sandbox/camel-3.x updated (c5778f5 -> a170082)

classic Classic list List threaded Threaded
13 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch sandbox/camel-3.x updated (c5778f5 -> a170082)

acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from c5778f5  UPDATED RestBindingAdvice
     new 263c8fd  Camel-Ipfs: Removed html folder from test resources
     new a075e72  Camel-RestDsl-Swagger-plugin: Fixed CS
     new e525708  Revert "Camel-Ipfs: Removed html folder from test resources"
     new 42f12fe  Upgrade Qpid JMS client to version 0.38.0
     new 3023b76  Upgrade Proton J to version 0.30.0
     new 6484974  Upgrade Awaitility to version 3.1.3
     new a42e973  CAMEL-12774 - Error during type conversion from type: java.lang.String to the required type: org.elasticsearch.action.update.UpdateRequest - Take 2
     new 430986b  Upgrade Infinispan to version 9.4.2.Final
     new 49fd084  Add Camel-NSQ to apache-camel POM
     new a9cb62a  Added camel-ipfs to Apache-Camel POM
     new 6927247  Regen
     new a170082  Upgrade AWS Xray to version 2.1.0

The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 apache-camel/pom.xml                                   | 18 ++++++++++++++++++
 .../converter/ElasticsearchActionRequestConverter.java |  2 +-
 .../ElasticsearchGetSearchDeleteExistsUpdateTest.java  |  6 +++++-
 parent/pom.xml                                         | 10 +++++-----
 .../camel-spring-boot-dependencies/pom.xml             |  2 +-
 .../maven/generator/swagger/AbstractGenerateMojo.java  |  6 +++---
 6 files changed, 33 insertions(+), 11 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel] 01/12: Camel-Ipfs: Removed html folder from test resources

acosentino
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 263c8fd9a8375e5a244f17cd2d35ec29f810a616
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Nov 16 15:33:16 2018 +0100

    Camel-Ipfs: Removed html folder from test resources
---
 .../src/test/resources/html/chap/ch01.html         |  13 -------
 .../src/test/resources/html/css/default.css        |  38 ---------------------
 .../src/test/resources/html/etc/userfile.txt       |   1 -
 .../src/test/resources/html/img/logo.png           | Bin 6715 -> 0 bytes
 .../camel-ipfs/src/test/resources/html/index.html  |  13 -------
 5 files changed, 65 deletions(-)

diff --git a/components/camel-ipfs/src/test/resources/html/chap/ch01.html b/components/camel-ipfs/src/test/resources/html/chap/ch01.html
deleted file mode 100644
index 4edc3fd..0000000
--- a/components/camel-ipfs/src/test/resources/html/chap/ch01.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>IPFS</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="./../css/default.css">
-</head>
-<body>
-<p><a href="../index.html">Home</a></p>
-<h2>Chapter 01</h2>
-<p><img src="../img/logo.png" alt="logo" /></p>
-</body>
-</html>
diff --git a/components/camel-ipfs/src/test/resources/html/css/default.css b/components/camel-ipfs/src/test/resources/html/css/default.css
deleted file mode 100644
index 8c0b2d5..0000000
--- a/components/camel-ipfs/src/test/resources/html/css/default.css
+++ /dev/null
@@ -1,38 +0,0 @@
-body {
-    font-family: "Verdana";
-    color: #137cb9
-}
-
-a {
-    #text-decoration: none;
-    color: #137cb9
-}
-
-a.gray {
-    color: gray;
-}
-
-h1 {
- font-weight: normal;
-    font-size: 20px;
-}
-
-h2 {
-    font-weight: normal;
- font-size: 15px;
-}
-
-th {
- text-align: left;
-    font-weight: normal;
-    font-size: 14px;
-    color: gray;
-}
-
-td.gray {
-    color: gray;
-}
-tr.gray {
-    color: gray;
-}
-
diff --git a/components/camel-ipfs/src/test/resources/html/etc/userfile.txt b/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
deleted file mode 100644
index 8fe2a4b..0000000
--- a/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
+++ /dev/null
@@ -1 +0,0 @@
-The quick brown fox jumps over the lazy dog.
\ No newline at end of file
diff --git a/components/camel-ipfs/src/test/resources/html/img/logo.png b/components/camel-ipfs/src/test/resources/html/img/logo.png
deleted file mode 100644
index ddda52e..0000000
Binary files a/components/camel-ipfs/src/test/resources/html/img/logo.png and /dev/null differ
diff --git a/components/camel-ipfs/src/test/resources/html/index.html b/components/camel-ipfs/src/test/resources/html/index.html
deleted file mode 100644
index 3781300..0000000
--- a/components/camel-ipfs/src/test/resources/html/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>IPFS</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="./css/default.css">
-</head>
-<body>
-<p><a href="index.html">Home</a></p>
-<p><a href="chap/ch01.html">chapter one</a></p>
-<p><img src="img/logo.png" alt="logo" /></p>
-</body>
-</html>

Reply | Threaded
Open this post in threaded view
|

[camel] 02/12: Camel-RestDsl-Swagger-plugin: Fixed CS

acosentino
In reply to this post by acosentino
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 a075e722d2b4a36fffe56c00157290e2bd8f9ce1
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Nov 19 08:49:07 2018 +0100

    Camel-RestDsl-Swagger-plugin: Fixed CS
---
 .../apache/camel/maven/generator/swagger/AbstractGenerateMojo.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
index 7d1903d..83bd4ec 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
@@ -92,14 +92,14 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
     @Parameter(defaultValue = "true")
     String modelWithXml;
 
+    @Parameter
+    String apiContextPath;
+
     @Parameter(defaultValue = "${project}", readonly = true)
     private MavenProject mavenProject;
 
     @Parameter(defaultValue = "${session}", readonly = true)
     private MavenSession mavenSession;
-    
-    @Parameter
-    String apiContextPath;
 
     @Component
     private BuildPluginManager pluginManager;

Reply | Threaded
Open this post in threaded view
|

[camel] 03/12: Revert "Camel-Ipfs: Removed html folder from test resources"

acosentino
In reply to this post by acosentino
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 e525708ad6286b4c2ceb5c77a0c665c73b7951b3
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Nov 19 09:17:37 2018 +0100

    Revert "Camel-Ipfs: Removed html folder from test resources"
   
    This reverts commit c704b6d3422db09cc321870feff5c4bc3e798ff3.
---
 .../src/test/resources/html/chap/ch01.html         |  13 +++++++
 .../src/test/resources/html/css/default.css        |  38 +++++++++++++++++++++
 .../src/test/resources/html/etc/userfile.txt       |   1 +
 .../src/test/resources/html/img/logo.png           | Bin 0 -> 6715 bytes
 .../camel-ipfs/src/test/resources/html/index.html  |  13 +++++++
 5 files changed, 65 insertions(+)

diff --git a/components/camel-ipfs/src/test/resources/html/chap/ch01.html b/components/camel-ipfs/src/test/resources/html/chap/ch01.html
new file mode 100644
index 0000000..4edc3fd
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/chap/ch01.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>IPFS</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="./../css/default.css">
+</head>
+<body>
+<p><a href="../index.html">Home</a></p>
+<h2>Chapter 01</h2>
+<p><img src="../img/logo.png" alt="logo" /></p>
+</body>
+</html>
diff --git a/components/camel-ipfs/src/test/resources/html/css/default.css b/components/camel-ipfs/src/test/resources/html/css/default.css
new file mode 100644
index 0000000..8c0b2d5
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/css/default.css
@@ -0,0 +1,38 @@
+body {
+    font-family: "Verdana";
+    color: #137cb9
+}
+
+a {
+    #text-decoration: none;
+    color: #137cb9
+}
+
+a.gray {
+    color: gray;
+}
+
+h1 {
+ font-weight: normal;
+    font-size: 20px;
+}
+
+h2 {
+    font-weight: normal;
+ font-size: 15px;
+}
+
+th {
+ text-align: left;
+    font-weight: normal;
+    font-size: 14px;
+    color: gray;
+}
+
+td.gray {
+    color: gray;
+}
+tr.gray {
+    color: gray;
+}
+
diff --git a/components/camel-ipfs/src/test/resources/html/etc/userfile.txt b/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
new file mode 100644
index 0000000..8fe2a4b
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
@@ -0,0 +1 @@
+The quick brown fox jumps over the lazy dog.
\ No newline at end of file
diff --git a/components/camel-ipfs/src/test/resources/html/img/logo.png b/components/camel-ipfs/src/test/resources/html/img/logo.png
new file mode 100644
index 0000000..ddda52e
Binary files /dev/null and b/components/camel-ipfs/src/test/resources/html/img/logo.png differ
diff --git a/components/camel-ipfs/src/test/resources/html/index.html b/components/camel-ipfs/src/test/resources/html/index.html
new file mode 100644
index 0000000..3781300
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>IPFS</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="./css/default.css">
+</head>
+<body>
+<p><a href="index.html">Home</a></p>
+<p><a href="chap/ch01.html">chapter one</a></p>
+<p><img src="img/logo.png" alt="logo" /></p>
+</body>
+</html>

Reply | Threaded
Open this post in threaded view
|

[camel] 04/12: Upgrade Qpid JMS client to version 0.38.0

acosentino
In reply to this post by acosentino
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 42f12fe521e7b37ea28cf7568f18fcd656387619
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Nov 19 13:53:17 2018 +0100

    Upgrade Qpid JMS client to version 0.38.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index d59a042..acef02c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -570,7 +570,7 @@
     <pubnub-version>4.20.0</pubnub-version>
     <qpid-broker-version>7.0.6</qpid-broker-version>
     <qpid-proton-j-version>0.29.0</qpid-proton-j-version>
-    <qpid-jms-client-version>0.37.0</qpid-jms-client-version>
+    <qpid-jms-client-version>0.38.0</qpid-jms-client-version>
     <quartz-bundle-version>1.8.6_1</quartz-bundle-version>
     <quartz-version>1.8.6</quartz-version>
     <quartz-version-range>[1.8,2)</quartz-version-range>

Reply | Threaded
Open this post in threaded view
|

[camel] 05/12: Upgrade Proton J to version 0.30.0

acosentino
In reply to this post by acosentino
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 3023b7600f14e747a5b2e66e3fe9590fcb9fc506
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Mon Nov 19 13:53:39 2018 +0100

    Upgrade Proton J to version 0.30.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index acef02c..af41a85 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -569,7 +569,7 @@
     <protonpack-version>1.8</protonpack-version>
     <pubnub-version>4.20.0</pubnub-version>
     <qpid-broker-version>7.0.6</qpid-broker-version>
-    <qpid-proton-j-version>0.29.0</qpid-proton-j-version>
+    <qpid-proton-j-version>0.30.0</qpid-proton-j-version>
     <qpid-jms-client-version>0.38.0</qpid-jms-client-version>
     <quartz-bundle-version>1.8.6_1</quartz-bundle-version>
     <quartz-version>1.8.6</quartz-version>

Reply | Threaded
Open this post in threaded view
|

[camel] 06/12: Upgrade Awaitility to version 3.1.3

acosentino
In reply to this post by acosentino
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 6484974174912b05140256066095b5ef9dd4df0c
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Tue Nov 20 11:08:31 2018 +0100

    Upgrade Awaitility to version 3.1.3
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index af41a85..8354efd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,7 +80,7 @@
     <avro-version>1.8.2</avro-version>
     <avro-bundle-version>1.8.2_1</avro-bundle-version>
     <avro-ipc-bundle-version>1.8.2_1</avro-ipc-bundle-version>
-    <awaitility-version>3.1.2</awaitility-version>
+    <awaitility-version>3.1.3</awaitility-version>
     <aws-java-sdk-bundle-version>1.11.438_1</aws-java-sdk-bundle-version>
     <aws-java-sdk-version>1.11.438</aws-java-sdk-version>
     <aws-xray-version>2.0.1</aws-xray-version>

Reply | Threaded
Open this post in threaded view
|

[camel] 07/12: CAMEL-12774 - Error during type conversion from type: java.lang.String to the required type: org.elasticsearch.action.update.UpdateRequest - Take 2

acosentino
In reply to this post by acosentino
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 a42e973b98921cd0fb25811f4d29f5ae38885e7c
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Tue Nov 20 14:38:30 2018 +0100

    CAMEL-12774 - Error during type conversion from type: java.lang.String to the required type: org.elasticsearch.action.update.UpdateRequest - Take 2
---
 .../converter/ElasticsearchActionRequestConverter.java              | 2 +-
 .../elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
index 1347219..6572c96 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
@@ -61,7 +61,7 @@ public final class ElasticsearchActionRequestConverter {
         } else if (document instanceof Map) {
             updateRequest.doc((Map<String, Object>) document);
         } else if (document instanceof String) {
-            updateRequest.doc(XContentFactory.xContent((String) document), (String) document);
+            updateRequest.doc((String) document, XContentFactory.xContentType((String) document));
         } else if (document instanceof XContentBuilder) {
             updateRequest.doc((XContentBuilder) document);
         } else {
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
index 96e994f..161e629 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
@@ -49,6 +49,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
         GetResponse response = template.requestBody("direct:get", indexId, GetResponse.class);
         assertNotNull("response should not be null", response);
         assertNotNull("response source should not be null", response.getSource());
+        System.err.println(response.getSource());
     }
 
     @Test
@@ -303,12 +304,15 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
         String indexId = template.requestBody("direct:index", map, String.class);
         assertNotNull("indexId should be set", indexId);
 
-        String body = "{\"id\" : 1}";
+        String body = "{\"teststringupdate-key\" : \"teststringupdate-updated\"}";
 
         Map<String, Object> headers = new HashMap<>();
         headers.put(ElasticsearchConstants.PARAM_INDEX_ID, indexId);
         indexId = template.requestBodyAndHeaders("direct:update", body, headers, String.class);
         assertNotNull("indexId should be set", indexId);
+        
+        GetResponse response = template.requestBody("direct:get", indexId, GetResponse.class);
+        assertEquals("teststringupdate-updated", response.getSource().get("teststringupdate-key"));
     }
 
     @Override

Reply | Threaded
Open this post in threaded view
|

[camel] 08/12: Upgrade Infinispan to version 9.4.2.Final

acosentino
In reply to this post by acosentino
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 430986bc1290b23e1898841ba3a023941f27f833
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Wed Nov 21 08:45:05 2018 +0100

    Upgrade Infinispan to version 9.4.2.Final
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 8354efd..ac4cd38 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -313,7 +313,7 @@
     <ibatis-version>2.3.4.726</ibatis-version>
     <ical4j-version>1.0.7</ical4j-version>
     <ignite-version>2.6.0</ignite-version>
-    <infinispan-version>9.4.1.Final</infinispan-version>
+    <infinispan-version>9.4.2.Final</infinispan-version>
     <infinispan-spring-boot-version>2.1.0.Final</infinispan-spring-boot-version>
     <influx-java-driver-version>2.14</influx-java-driver-version>
     <influx-java-driver-bundle-version>2.14_1</influx-java-driver-bundle-version>

Reply | Threaded
Open this post in threaded view
|

[camel] 09/12: Add Camel-NSQ to apache-camel POM

acosentino
In reply to this post by acosentino
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 49fd0840bbc879140b1aac869a9702c54fa5b833
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Wed Nov 21 09:21:37 2018 +0100

    Add Camel-NSQ to apache-camel POM
   
    Conflicts:
    apache-camel/pom.xml
---
 apache-camel/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 090a24c..3922474 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -661,6 +661,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-netty4-http</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-nsq</artifactId>
+    </dependency>
      <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-ognl</artifactId>
@@ -1793,6 +1797,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-nsq-starter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-ognl-starter</artifactId>
       <version>${project.version}</version>
     </dependency>

Reply | Threaded
Open this post in threaded view
|

[camel] 10/12: Added camel-ipfs to Apache-Camel POM

acosentino
In reply to this post by acosentino
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 a9cb62aa80e0e19e0adda304636028951970f935
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Wed Nov 21 09:25:19 2018 +0100

    Added camel-ipfs to Apache-Camel POM
---
 apache-camel/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 3922474..86c7545 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -436,6 +436,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-ipfs</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-irc</artifactId>
     </dependency>
     <dependency>
@@ -1527,6 +1531,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-ipfs-starter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-irc-starter</artifactId>
       <version>${project.version}</version>
     </dependency>

Reply | Threaded
Open this post in threaded view
|

[camel] 11/12: Regen

acosentino
In reply to this post by acosentino
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 69272472f6ab68f231cdec77e4f68c33567392d8
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Wed Nov 21 10:03:18 2018 +0100

    Regen
---
 .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index e3deae7..2ac7b3c 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3358,7 +3358,7 @@
       <dependency>
         <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
       </dependency>
       <dependency>
         <groupId>org.cassandraunit</groupId>

Reply | Threaded
Open this post in threaded view
|

[camel] 12/12: Upgrade AWS Xray to version 2.1.0

acosentino
In reply to this post by acosentino
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 a170082d1fee2fd7706f279ebed6e0c88195ca16
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Wed Nov 21 13:06:11 2018 +0100

    Upgrade AWS Xray to version 2.1.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index ac4cd38..83609fa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -83,7 +83,7 @@
     <awaitility-version>3.1.3</awaitility-version>
     <aws-java-sdk-bundle-version>1.11.438_1</aws-java-sdk-bundle-version>
     <aws-java-sdk-version>1.11.438</aws-java-sdk-version>
-    <aws-xray-version>2.0.1</aws-xray-version>
+    <aws-xray-version>2.1.0</aws-xray-version>
     <axiom-version>1.2.14</axiom-version>
     <azure-storage-java-sdk-version>8.0.0</azure-storage-java-sdk-version>
     <azure-storage-java-sdk-bundle-version>8.0.0_1</azure-storage-java-sdk-bundle-version>