CAMEL-10222: Rewriting the examples to use the new spring-boot BOM

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/993e5783
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/993e5783
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/993e5783

Branch: refs/heads/master
Commit: 993e57830eb2e79c81d3b6377c44389f54aa386c
Parents: 046156c
Author: Nicola Ferraro <ni.ferr...@gmail.com>
Authored: Fri Sep 9 11:07:14 2016 +0200
Committer: Nicola Ferraro <ni.ferr...@gmail.com>
Committed: Tue Sep 20 00:39:57 2016 +0200

----------------------------------------------------------------------
 examples/camel-example-hystrix/client/pom.xml      | 13 +------------
 examples/camel-example-hystrix/service1/pom.xml    | 13 +------------
 examples/camel-example-spring-boot-metrics/pom.xml | 12 ++++--------
 examples/camel-example-spring-boot-starter/pom.xml | 13 +------------
 examples/camel-example-spring-boot/pom.xml         | 12 ++++--------
 examples/camel-example-zipkin/client/pom.xml       |  4 ----
 examples/camel-example-zipkin/service1/pom.xml     | 13 +------------
 examples/camel-example-zipkin/service2/pom.xml     |  4 ----
 8 files changed, 12 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/993e5783/examples/camel-example-hystrix/client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-hystrix/client/pom.xml 
b/examples/camel-example-hystrix/client/pom.xml
index d3f9b93..9ce94bc 100644
--- a/examples/camel-example-hystrix/client/pom.xml
+++ b/examples/camel-example-hystrix/client/pom.xml
@@ -30,23 +30,12 @@
   <name>Camel :: Example :: Hystrix :: Client</name>
   <description>An example showing how to use Hystrix EIP as circuit breaker in 
Camel routes</description>
 
-  <properties>
-    <spring.boot-version>${spring-boot-version}</spring.boot-version>
-  </properties>
-
   <!-- import Spring-Boot and Camel BOM -->
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring.boot-version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

http://git-wip-us.apache.org/repos/asf/camel/blob/993e5783/examples/camel-example-hystrix/service1/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-hystrix/service1/pom.xml 
b/examples/camel-example-hystrix/service1/pom.xml
index 5e75bf1..49cf738 100644
--- a/examples/camel-example-hystrix/service1/pom.xml
+++ b/examples/camel-example-hystrix/service1/pom.xml
@@ -30,23 +30,12 @@
   <name>Camel :: Example :: Hystrix :: Service 1</name>
   <description>An example showing how to use Hystrix EIP as circuit breaker in 
Camel routes</description>
 
-  <properties>
-    <spring.boot-version>${spring-boot-version}</spring.boot-version>
-  </properties>
-
   <!-- import Spring-Boot and Camel BOM -->
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring.boot-version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

http://git-wip-us.apache.org/repos/asf/camel/blob/993e5783/examples/camel-example-spring-boot-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-metrics/pom.xml 
b/examples/camel-example-spring-boot-metrics/pom.xml
index f5d3ccb..4b9acc9 100644
--- a/examples/camel-example-spring-boot-metrics/pom.xml
+++ b/examples/camel-example-spring-boot-metrics/pom.xml
@@ -30,16 +30,12 @@
   <name>Camel :: Example :: Spring Boot Metrics</name>
   <description>An example showing how to work with Camel and Spring Boot and 
report metrics to Graphite</description>
 
-  <properties>
-    <spring.boot-version>${spring-boot-version}</spring.boot-version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring.boot-version}</version>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
+        <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -94,7 +90,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>${spring.boot-version}</version>
+        <version>${spring-boot-version}</version>
         <configuration>
           
<mainClass>org.apache.camel.example.spring.boot.metrics.Application</mainClass>
         </configuration>

http://git-wip-us.apache.org/repos/asf/camel/blob/993e5783/examples/camel-example-spring-boot-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-starter/pom.xml 
b/examples/camel-example-spring-boot-starter/pom.xml
index d5b65c5..eda6107 100644
--- a/examples/camel-example-spring-boot-starter/pom.xml
+++ b/examples/camel-example-spring-boot-starter/pom.xml
@@ -30,23 +30,12 @@
   <name>Camel :: Example :: Spring Boot Starter</name>
   <description>An example showing how to work with Camel and Spring Boot using 
Spring Boot Starter</description>
 
-  <properties>
-    <spring.boot-version>${spring-boot-version}</spring.boot-version>
-  </properties>
-
   <!-- import Spring-Boot and Camel BOM -->
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring.boot-version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

http://git-wip-us.apache.org/repos/asf/camel/blob/993e5783/examples/camel-example-spring-boot/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot/pom.xml 
b/examples/camel-example-spring-boot/pom.xml
old mode 100755
new mode 100644
index ffdcd12..4484734
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -31,16 +31,12 @@
   <name>Camel :: Example :: Spring Boot</name>
   <description>An example showing how to work with Camel and Spring 
Boot</description>
 
-  <properties>
-    <spring.boot-version>${spring-boot-version}</spring.boot-version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring.boot-version}</version>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
+        <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -104,7 +100,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>${spring.boot-version}</version>
+        <version>${spring-boot-version}</version>
         <configuration>
           <mainClass>org.apache.camel.spring.boot.FatJarRouter</mainClass>
         </configuration>

http://git-wip-us.apache.org/repos/asf/camel/blob/993e5783/examples/camel-example-zipkin/client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/client/pom.xml 
b/examples/camel-example-zipkin/client/pom.xml
index ac6885f..893b8b2 100644
--- a/examples/camel-example-zipkin/client/pom.xml
+++ b/examples/camel-example-zipkin/client/pom.xml
@@ -30,10 +30,6 @@
   <name>Camel :: Example :: Zipkin :: Client</name>
   <description>An example showing how to trace incoming and outgoing messages 
from Camel with Zipkin</description>
 
-  <properties>
-    <spring.boot-version>${spring-boot-version}</spring.boot-version>
-  </properties>
-
   <!-- import Camel BOM -->
   <dependencyManagement>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/camel/blob/993e5783/examples/camel-example-zipkin/service1/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service1/pom.xml 
b/examples/camel-example-zipkin/service1/pom.xml
index a611f02..dab59a0 100644
--- a/examples/camel-example-zipkin/service1/pom.xml
+++ b/examples/camel-example-zipkin/service1/pom.xml
@@ -30,23 +30,12 @@
   <name>Camel :: Example :: Zipkin :: Service 1</name>
   <description>An example showing how to trace incoming and outgoing messages 
from Camel with Zipkin</description>
 
-  <properties>
-    <spring.boot-version>${spring-boot-version}</spring.boot-version>
-  </properties>
-
   <!-- import Spring-Boot and Camel BOM -->
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring.boot-version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

http://git-wip-us.apache.org/repos/asf/camel/blob/993e5783/examples/camel-example-zipkin/service2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/service2/pom.xml 
b/examples/camel-example-zipkin/service2/pom.xml
index 4e01911..b6dfef9 100644
--- a/examples/camel-example-zipkin/service2/pom.xml
+++ b/examples/camel-example-zipkin/service2/pom.xml
@@ -30,10 +30,6 @@
   <name>Camel :: Example :: Zipkin :: Service 2</name>
   <description>An example showing how to trace incoming and outgoing messages 
from Camel with Zipkin</description>
 
-  <properties>
-    <spring.boot-version>${spring-boot-version}</spring.boot-version>
-  </properties>
-
   <!-- import Camel BOM -->
   <dependencyManagement>
     <dependencies>

Reply via email to