This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 703cbe0 Upgrade Spring Cloud to version 2.0.0.RELEASE
703cbe0 is described below
commit 703cbe01c3ddff289fd6cba89cbd45314bb70473
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Wed Jun 20 14:38:29 2018 +0200
Upgrade Spring Cloud to version 2.0.0.RELEASE
---
.../src/main/docs/micrometer-component.adoc | 2 +-
components/camel-spring-cloud-consul/pom.xml | 15 ---------------
components/camel-spring-cloud-netflix/pom.xml | 15 ---------------
components/camel-spring-cloud-zookeeper/pom.xml | 15 ---------------
components/camel-spring-cloud/pom.xml | 15 ---------------
.../consumer/pom.xml | 3 +--
examples/camel-example-spring-cloud-servicecall/pom.xml | 12 ------------
.../consumer/pom.xml | 3 +--
.../camel-example-spring-cloud-serviceregistry/pom.xml | 12 ------------
.../service/pom.xml | 3 +--
parent/pom.xml | 8 ++++----
.../camel-spring-cloud-consul-starter/pom.xml | 12 ------------
.../camel-spring-cloud-netflix-starter/pom.xml | 12 ------------
.../components-starter/camel-spring-cloud-starter/pom.xml | 12 ------------
.../camel-spring-cloud-zookeeper-starter/pom.xml | 12 ------------
15 files changed, 8 insertions(+), 143 deletions(-)
diff --git
a/components/camel-micrometer/src/main/docs/micrometer-component.adoc
b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
index e8a3ff8..89c6db1 100644
--- a/components/camel-micrometer/src/main/docs/micrometer-component.adoc
+++ b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
@@ -78,7 +78,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *metricsType* | *Required* Type of metrics | | Type
| *metricsName* | *Required* Name of metrics | | String
-| *tags* | Tags of metrics | | Tag
+| *tags* | Tags of metrics | | Tag>
|===
diff --git a/components/camel-spring-cloud-consul/pom.xml
b/components/camel-spring-cloud-consul/pom.xml
index 316628b..89aa9bc 100644
--- a/components/camel-spring-cloud-consul/pom.xml
+++ b/components/camel-spring-cloud-consul/pom.xml
@@ -37,23 +37,8 @@
<label>spring,microservice</label>
<camel.osgi.export.pkg/>
-
- <spring-cloud-commons-version>2.0.0.RC2</spring-cloud-commons-version>
- <spring-cloud-consul-version>2.0.0.RC2</spring-cloud-consul-version>
</properties>
- <!-- spring-cloud with support for spring boot 2 is not in maven central yet
-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/components/camel-spring-cloud-netflix/pom.xml
b/components/camel-spring-cloud-netflix/pom.xml
index de29197..429d9e1 100644
--- a/components/camel-spring-cloud-netflix/pom.xml
+++ b/components/camel-spring-cloud-netflix/pom.xml
@@ -37,23 +37,8 @@
<label>spring,microservice</label>
<camel.osgi.export.pkg/>
-
- <spring-cloud-commons-version>2.0.0.RC2</spring-cloud-commons-version>
- <spring-cloud-netflix-version>2.0.0.RC2</spring-cloud-netflix-version>
</properties>
- <!-- spring-cloud with support for spring boot 2 is not in maven central yet
-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/components/camel-spring-cloud-zookeeper/pom.xml
b/components/camel-spring-cloud-zookeeper/pom.xml
index 2c1a9dd..d006e65 100644
--- a/components/camel-spring-cloud-zookeeper/pom.xml
+++ b/components/camel-spring-cloud-zookeeper/pom.xml
@@ -37,23 +37,8 @@
<label>spring,microservice</label>
<camel.osgi.export.pkg/>
-
- <spring-cloud-commons-version>2.0.0.RC2</spring-cloud-commons-version>
- <spring-cloud-zookeeper-version>2.0.0.RC1</spring-cloud-zookeeper-version>
</properties>
- <!-- spring-cloud with support for spring boot 2 is not in maven central yet
-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/components/camel-spring-cloud/pom.xml
b/components/camel-spring-cloud/pom.xml
index 7109ec7..443e5f2 100644
--- a/components/camel-spring-cloud/pom.xml
+++ b/components/camel-spring-cloud/pom.xml
@@ -37,23 +37,8 @@
<label>spring,microservice</label>
<camel.osgi.export.pkg/>
-
- <spring-cloud-commons-version>2.0.0.RC2</spring-cloud-commons-version>
- <spring-cloud-netflix-version>2.0.0.RC2</spring-cloud-netflix-version>
</properties>
- <!-- spring-cloud with support for spring boot 2 is not in maven central yet
-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
index a2b3514..8a3c495 100644
--- a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
@@ -39,7 +39,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
- <spring.cloud-version>2.0.0.M7</spring.cloud-version>
</properties>
<dependencyManagement>
@@ -55,7 +54,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul-dependencies</artifactId>
- <version>${spring.cloud-version}</version>
+ <version>${spring-cloud-consul-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/examples/camel-example-spring-cloud-servicecall/pom.xml
b/examples/camel-example-spring-cloud-servicecall/pom.xml
index 8d193ef..c02173f 100644
--- a/examples/camel-example-spring-cloud-servicecall/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/pom.xml
@@ -38,18 +38,6 @@
<category>Cloud</category>
</properties>
- <!-- spring-cloud with support for spring boot 2 is not in maven central yet
-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<modules>
<module>consumer</module>
<module>service</module>
diff --git
a/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
b/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
index 31188c5..9bfcede 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
@@ -39,7 +39,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
- <spring.cloud-version>2.0.0.RC1</spring.cloud-version>
</properties>
<dependencyManagement>
@@ -55,7 +54,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul-dependencies</artifactId>
- <version>${spring.cloud-version}</version>
+ <version>${spring-cloud-consul-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/examples/camel-example-spring-cloud-serviceregistry/pom.xml
b/examples/camel-example-spring-cloud-serviceregistry/pom.xml
index 75c09eb..785a4ec 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/pom.xml
@@ -39,18 +39,6 @@
<title>Spring Cloud ServiceRegistry</title>
</properties>
- <!-- spring-cloud with support for spring boot 2 is not in maven central yet
-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<modules>
<module>consumer</module>
<module>service</module>
diff --git
a/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
b/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
index eb57bb0..48b401e 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
@@ -39,7 +39,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
- <spring.cloud-version>2.0.0.RC1</spring.cloud-version>
</properties>
<dependencyManagement>
@@ -55,7 +54,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul-dependencies</artifactId>
- <version>${spring.cloud-version}</version>
+ <version>${spring-cloud-consul-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index df871c6..e233d99 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -637,10 +637,10 @@
<spring-batch-version>4.0.1.RELEASE</spring-batch-version>
<spring-batch-bundle-version>4.0.1.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>2.0.3.RELEASE</spring-boot-version>
- <spring-cloud-commons-version>1.3.3.RELEASE</spring-cloud-commons-version>
- <spring-cloud-consul-version>1.3.3.RELEASE</spring-cloud-consul-version>
- <spring-cloud-netflix-version>1.4.4.RELEASE</spring-cloud-netflix-version>
-
<spring-cloud-zookeeper-version>1.2.1.RELEASE</spring-cloud-zookeeper-version>
+ <spring-cloud-commons-version>2.0.0.RELEASE</spring-cloud-commons-version>
+ <spring-cloud-consul-version>2.0.0.RELEASE</spring-cloud-consul-version>
+ <spring-cloud-netflix-version>2.0.0.RELEASE</spring-cloud-netflix-version>
+
<spring-cloud-zookeeper-version>2.0.0.RELEASE</spring-cloud-zookeeper-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>2.0.5.RELEASE</spring-data-commons-version>
<spring-data-commons-bundle-version>2.0.5.RELEASE_1</spring-data-commons-bundle-version>
diff --git
a/platforms/spring-boot/components-starter/camel-spring-cloud-consul-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-spring-cloud-consul-starter/pom.xml
index 040625a..e4f7fe5 100644
---
a/platforms/spring-boot/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-spring-cloud-consul-starter/pom.xml
@@ -50,16 +50,4 @@
</dependency>
<!--END OF GENERATED CODE-->
</dependencies>
- <!--START OF GENERATED CODE-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <!--END OF GENERATED CODE-->
</project>
diff --git
a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml
index 59de1f4..71f342a 100644
---
a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -58,16 +58,4 @@
</dependency>
<!--END OF GENERATED CODE-->
</dependencies>
- <!--START OF GENERATED CODE-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <!--END OF GENERATED CODE-->
</project>
diff --git
a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
index 4421e92..6027461 100644
---
a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
@@ -50,16 +50,4 @@
</dependency>
<!--END OF GENERATED CODE-->
</dependencies>
- <!--START OF GENERATED CODE-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <!--END OF GENERATED CODE-->
</project>
diff --git
a/platforms/spring-boot/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
index 857ed44..020c12f 100644
---
a/platforms/spring-boot/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -58,16 +58,4 @@
</dependency>
<!--END OF GENERATED CODE-->
</dependencies>
- <!--START OF GENERATED CODE-->
- <repositories>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <!--END OF GENERATED CODE-->
</project>
