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 2019/12/16 11:34:56 UTC

[camel-spring-boot] branch master updated (47028f4 -> f71f3e3)

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

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.


    from 47028f4  Fix modules names
     new 0ef0239  Upgrade Spring cloud consul to version 2.2.0.RELEASE
     new 789093d  Upgrade Spring Cloud commons to version 2.2.0.RELEASE
     new 7c1e413  Removed duplicated property placeholder for Spring Cloud Consul
     new b8b8580  Upgrade Spring-Cloud Netflix to version 2.2.0.RELEASE
     new c0e95cc  Upgrade Spring Cloud Zookeeper to version 2.2.0.RELEASE
     new 6e728f6  Reintroduce Camel-Spring Cloud Spring Boot Itest
     new ddb9dd4  Reintroduce Camel-Spring cloud Netflix Spring Boot Itest
     new f71f3e3  Regen

The 8 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:
 .../camel/itest/springboot/CamelSpringCloudNetflixTest.java  |  1 -
 .../apache/camel/itest/springboot/CamelSpringCloudTest.java  |  1 -
 components-starter/camel-corda-starter/pom.xml               | 12 ++++++++++++
 pom.xml                                                      |  9 ++++-----
 4 files changed, 16 insertions(+), 7 deletions(-)


[camel-spring-boot] 04/08: Upgrade Spring-Cloud Netflix to version 2.2.0.RELEASE

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit b8b85804fd70e9bf57e2a17a8abac9ce27701294
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 16 12:10:27 2019 +0100

    Upgrade Spring-Cloud Netflix to version 2.2.0.RELEASE
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9bd686a..367ebfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
         <freemarker-version>2.3.29</freemarker-version>
         <openjpa-version>3.1.0</openjpa-version>
         <spring-cloud-commons-version>2.2.0.RELEASE</spring-cloud-commons-version>
-        <spring-cloud-netflix-version>2.1.4.RELEASE</spring-cloud-netflix-version>
+        <spring-cloud-netflix-version>2.2.0.RELEASE</spring-cloud-netflix-version>
         <spring-cloud-zookeeper-version>2.1.4.RELEASE</spring-cloud-zookeeper-version>
         <rxjava-version>1.3.8</rxjava-version>
 


[camel-spring-boot] 08/08: Regen

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit f71f3e369e1a8e2a088af8dbe52ae2e9b8733b8e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 16 12:34:33 2019 +0100

    Regen
---
 components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index 03f6f99..c53206b 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-corda</artifactId>
       <version>${camel-version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-classic</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-core</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>


[camel-spring-boot] 07/08: Reintroduce Camel-Spring cloud Netflix Spring Boot Itest

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit ddb9dd41d2270ae6c3353d387f54ad82820a5ca6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 16 12:11:50 2019 +0100

    Reintroduce Camel-Spring cloud Netflix Spring Boot Itest
---
 .../org/apache/camel/itest/springboot/CamelSpringCloudNetflixTest.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudNetflixTest.java b/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudNetflixTest.java
index 8df5354..744b13e 100644
--- a/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudNetflixTest.java
+++ b/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudNetflixTest.java
@@ -26,7 +26,6 @@ import org.junit.runner.RunWith;
 
 
 @RunWith(Arquillian.class)
-@Ignore("Spring-Cloud referenced in Spring-Boot 2.0.0.RELEASE is not GA")
 public class CamelSpringCloudNetflixTest extends AbstractSpringBootTestSupport {
 
     @Deployment


[camel-spring-boot] 02/08: Upgrade Spring Cloud commons to version 2.2.0.RELEASE

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 789093de932b6c0507fb117b9a2849f80ee9c082
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 16 12:09:47 2019 +0100

    Upgrade Spring Cloud commons to version 2.2.0.RELEASE
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1a85799..6fe7ddd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@
         <junit-jupiter-version>5.5.2</junit-jupiter-version>
         <freemarker-version>2.3.29</freemarker-version>
         <openjpa-version>3.1.0</openjpa-version>
-        <spring-cloud-commons-version>2.1.4.RELEASE</spring-cloud-commons-version>
+        <spring-cloud-commons-version>2.2.0.RELEASE</spring-cloud-commons-version>
         <spring-cloud-consul-version>2.1.4.RELEASE</spring-cloud-consul-version>
         <spring-cloud-netflix-version>2.1.4.RELEASE</spring-cloud-netflix-version>
         <spring-cloud-zookeeper-version>2.1.4.RELEASE</spring-cloud-zookeeper-version>


[camel-spring-boot] 06/08: Reintroduce Camel-Spring Cloud Spring Boot Itest

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 6e728f62afcd32dda6ef7d21ee0b78a0bff803cd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 16 12:11:23 2019 +0100

    Reintroduce Camel-Spring Cloud Spring Boot Itest
---
 .../java/org/apache/camel/itest/springboot/CamelSpringCloudTest.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudTest.java b/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudTest.java
index df6af6a..e8498bb 100644
--- a/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudTest.java
+++ b/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSpringCloudTest.java
@@ -26,7 +26,6 @@ import org.junit.runner.RunWith;
 
 
 @RunWith(Arquillian.class)
-@Ignore("Spring-Cloud referenced in Spring-Boot 2.0.0.RELEASE is not GA")
 public class CamelSpringCloudTest extends AbstractSpringBootTestSupport {
 
     @Deployment


[camel-spring-boot] 03/08: Removed duplicated property placeholder for Spring Cloud Consul

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 7c1e413df6cb83e16363442742df00ad6d03b6dd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 16 12:10:07 2019 +0100

    Removed duplicated property placeholder for Spring Cloud Consul
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6fe7ddd..9bd686a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,6 @@
         <freemarker-version>2.3.29</freemarker-version>
         <openjpa-version>3.1.0</openjpa-version>
         <spring-cloud-commons-version>2.2.0.RELEASE</spring-cloud-commons-version>
-        <spring-cloud-consul-version>2.1.4.RELEASE</spring-cloud-consul-version>
         <spring-cloud-netflix-version>2.1.4.RELEASE</spring-cloud-netflix-version>
         <spring-cloud-zookeeper-version>2.1.4.RELEASE</spring-cloud-zookeeper-version>
         <rxjava-version>1.3.8</rxjava-version>


[camel-spring-boot] 01/08: Upgrade Spring cloud consul to version 2.2.0.RELEASE

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 0ef0239c5eed615459c2a08c33ad8dc92c8f0253
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 16 12:09:14 2019 +0100

    Upgrade Spring cloud consul to version 2.2.0.RELEASE
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 532005d..1a85799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
         <curator-version>2.12.0</curator-version>
 
         <log4j2-version>2.12.1</log4j2-version>
-        <spring-cloud-consul-version>2.1.4.RELEASE</spring-cloud-consul-version>
+        <spring-cloud-consul-version>2.2.0.RELEASE</spring-cloud-consul-version>
         <protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
 
         <!-- Needed by starters -->


[camel-spring-boot] 05/08: Upgrade Spring Cloud Zookeeper to version 2.2.0.RELEASE

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit c0e95cc15827fba58f098c2ad0edba7d0058d7d1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 16 12:10:44 2019 +0100

    Upgrade Spring Cloud Zookeeper to version 2.2.0.RELEASE
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 367ebfe..671d496 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
         <openjpa-version>3.1.0</openjpa-version>
         <spring-cloud-commons-version>2.2.0.RELEASE</spring-cloud-commons-version>
         <spring-cloud-netflix-version>2.2.0.RELEASE</spring-cloud-netflix-version>
-        <spring-cloud-zookeeper-version>2.1.4.RELEASE</spring-cloud-zookeeper-version>
+        <spring-cloud-zookeeper-version>2.2.0.RELEASE</spring-cloud-zookeeper-version>
         <rxjava-version>1.3.8</rxjava-version>
 
         <arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>