Repository: camel
Updated Branches:
  refs/heads/master 9338801e1 -> a8e26febf


Upgrade to spring-boot 1.4.1.RELEASE


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

Branch: refs/heads/master
Commit: a8e26febf7f8fb319c6fa6b2ff031e7862b9fc7c
Parents: 9338801
Author: Nicola Ferraro <ni.ferr...@gmail.com>
Authored: Wed Sep 21 12:22:17 2016 +0200
Committer: Nicola Ferraro <ni.ferr...@gmail.com>
Committed: Wed Sep 21 12:22:17 2016 +0200

----------------------------------------------------------------------
 parent/pom.xml                                     |  2 +-
 .../camel-spring-boot-dependencies/pom.xml         |  4 ++--
 .../camel-spring-boot-generator-bom/pom.xml        |  4 ++--
 spring-boot-dm/pom.xml                             | 17 +++++++++--------
 .../itest/springboot/util/ArquillianPackager.java  |  1 +
 5 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a8e26feb/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d2646c6..5905bd2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -541,7 +541,7 @@
     <splunk-version>1.5.0.0_1</splunk-version>
     <spring-batch-version>3.0.7.RELEASE</spring-batch-version>
     <spring-batch-bundle-version>3.0.7.RELEASE_1</spring-batch-bundle-version>
-    <spring-boot-version>1.4.0.RELEASE</spring-boot-version>
+    <spring-boot-version>1.4.1.RELEASE</spring-boot-version>
     <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
     <spring-data-commons-version>1.6.5.RELEASE</spring-data-commons-version>
     <spring-data-redis-version>1.7.2.RELEASE</spring-data-redis-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/a8e26feb/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml 
b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index c49c0d5..221440a 100644
--- a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -51,7 +51,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson.module</groupId>
         <artifactId>jackson-module-scala_2.11</artifactId>
-        <version>2.8.1</version>
+        <version>2.8.2</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.scriptengines</groupId>
@@ -71,7 +71,7 @@
       <dependency>
         <groupId>com.hazelcast</groupId>
         <artifactId>hazelcast-client</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
       </dependency>
       <dependency>
         <groupId>com.jayway.awaitility</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/a8e26feb/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml 
b/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml
index d71a297..371066f 100644
--- a/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml
+++ b/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml
@@ -137,7 +137,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.module</groupId>
                 <artifactId>jackson-module-scala_2.11</artifactId>
-                <version>${jackson2-version}</version>
+                <version>${scala-jackson2-version}</version>
             </dependency>
 
 
@@ -285,4 +285,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/a8e26feb/spring-boot-dm/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/pom.xml b/spring-boot-dm/pom.xml
index 676239f..e9c4581 100644
--- a/spring-boot-dm/pom.xml
+++ b/spring-boot-dm/pom.xml
@@ -38,7 +38,7 @@
 
     <properties>
         <!-- Spring-Boot target version -->
-        <spring-boot-version>1.4.0.RELEASE</spring-boot-version>
+        <spring-boot-version>1.4.1.RELEASE</spring-boot-version>
 
         <!-- The following dependencies should be aligned with the ones in 
standard camel parent -->
         <avro-version>1.8.1</avro-version>
@@ -62,18 +62,19 @@
         
<cassandra-netty-version-testing>4.0.37.Final</cassandra-netty-version-testing>
 
         <!-- The following versions should be aligned with the ones in 
spring-boot-repo/spring-boot-dependencies/pom.xml (for the targeted version of 
spring-boot) -->
-        <jackson2-version>2.8.1</jackson2-version>
+        <jackson2-version>2.8.3</jackson2-version>
+        <scala-jackson2-version>2.8.2</scala-jackson2-version>
         <jetty9-version>9.3.11.v20160721</jetty9-version>
         <jetty-version>${jetty9-version}</jetty-version>
         <jna-version>4.2.2</jna-version>
-        <hazelcast-version>3.6.4</hazelcast-version>
+        <hazelcast-version>3.6.5</hazelcast-version>
         <htmlunit-version>2.21</htmlunit-version>
         <log4j2-version>2.6.2</log4j2-version>
         <slf4j-version>1.7.21</slf4j-version>
-        <spring-version>4.3.2.RELEASE</spring-version>
-        
<spring-data-releasetrain-version>Hopper-SR2</spring-data-releasetrain-version>
-        <spring-integration-version>4.3.1.RELEASE</spring-integration-version>
-        <spring-security-version>4.1.1.RELEASE</spring-security-version>
+        <spring-version>4.3.3.RELEASE</spring-version>
+        
<spring-data-releasetrain-version>Hopper-SR3</spring-data-releasetrain-version>
+        <spring-integration-version>4.3.2.RELEASE</spring-integration-version>
+        <spring-security-version>4.1.3.RELEASE</spring-security-version>
     </properties>
 
     <build>
@@ -151,4 +152,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/a8e26feb/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
----------------------------------------------------------------------
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index d092753..ef91a1a 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -294,6 +294,7 @@ public final class ArquillianPackager {
 
         // A list of known libraries that don't follow the 
all-artifacts-same-version convention
         ignore.add("com.atlassian.jira:jira-rest-java-client-api");
+        ignore.add("com.fasterxml.jackson.module:jackson-module-scala_2.11"); 
// latest version not available
         ignore.add("com.github.jnr");
         ignore.add("com.sun.xml.bind:jaxb-xjc");
         ignore.add("commons-beanutils:commons-beanutils");

Reply via email to