[camel] 01/02: Upgrade Spring Boot to 2.1.0.RELEASE. The BOM generator needed a code change as SB guys have changed their POM in this new version.

[davsclaus]

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

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit db0501efa67f9cee8b5a6cc090fb4ce906eb89a4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Nov 5 17:03:59 2018 +0100

    Upgrade Spring Boot to 2.1.0.RELEASE. The BOM generator needed a code 
change as SB guys have changed their POM in this new version.
---
 platforms/spring-boot/spring-boot-dm/pom.xml                      | 8 ++++----
 .../org/apache/camel/maven/bom/generator/BomGeneratorMojo.java    | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml 
b/platforms/spring-boot/spring-boot-dm/pom.xml
index f33732b..f25e2db 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -41,13 +41,13 @@
 
   <properties>
     <!-- Spring-Boot target version -->
-    <spring-boot-version>2.0.6.RELEASE</spring-boot-version>
+    <spring-boot-version>2.1.0.RELEASE</spring-boot-version>
 
     <!-- The following dependencies should be aligned with the ones in 
standard camel parent -->
     <!-- Needed by BOM generator-->
     <avro-version>1.8.2</avro-version>
     <jackson-version>1.9.12</jackson-version>
-    <testcontainers-version>1.8.3</testcontainers-version>
+    <testcontainers-version>1.9.1</testcontainers-version>
 
     <!-- needed for testing -->
     <curator-version>2.12.0</curator-version>
@@ -57,9 +57,9 @@
     <google-guava-version>19.0</google-guava-version>
     <lucene3-version>3.6.0</lucene3-version>
     <hadoop2-version>2.7.4</hadoop2-version>
-    
<infinispan-spring-boot-version>2.0.0.Beta1</infinispan-spring-boot-version>
+    
<infinispan-spring-boot-version>2.0.0.Final</infinispan-spring-boot-version>
     <cassandra-driver-guava-version>18.0</cassandra-driver-guava-version>
-    <groovy-version>2.4.15</groovy-version>
+    <groovy-version>2.5.3</groovy-version>
     <grpc-guava-version>20.0</grpc-guava-version>
 
     <!-- Plugin versions -->
diff --git 
a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
 
b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
index 32c4251..2a54e0d 100644
--- 
a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
+++ 
b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
@@ -429,6 +429,10 @@ public class BomGeneratorMojo extends AbstractMojo {
                 String prop = version.substring(start + 2, end);
                 String resolved = project.getProperties().getProperty(prop);
                 if (resolved != null) {
+                    // may contain yet another placeholder
+                    if (resolved.contains("${")) {
+                        resolved = resolveVersion(project, resolved);
+                    }
                     version = version.substring(0, start) + resolved + 
version.substring(end + 1);
                 }
             }