camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/4] camel git commit: Upgrade spring-boot starter generator to 1.5.6 release
Date Sat, 02 Sep 2017 12:57:42 GMT
Upgrade spring-boot starter generator to 1.5.6 release


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

Branch: refs/heads/master
Commit: dc224a582e9b79adb8deeebdb696dc0cbcc09ed3
Parents: 4670d09
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Sep 2 14:12:40 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Sep 2 14:12:40 2017 +0200

----------------------------------------------------------------------
 .../pom.xml                                       |  3 +++
 .../camel-spring-boot-dependencies/pom.xml        | 18 ++++--------------
 platforms/spring-boot/spring-boot-dm/pom.xml      | 17 +++++++++--------
 3 files changed, 16 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/dc224a58/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
index a948cc8..74cfefa 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
@@ -263,6 +263,9 @@
               <exclude>org.scala-lang:*</exclude>
               <exclude>org.apache.lucene:*</exclude>
 
+              <!-- Jetty -->
+              <exclude>org.eclipse.jetty:jetty-rewrite</exclude>
+              <exclude>org.eclipse.jetty:jetty-util-ajax</exclude>
 
               <!-- Unrelated -->
               <exclude>org.apache.servicemix.bundles:*</exclude>

http://git-wip-us.apache.org/repos/asf/camel/blob/dc224a58/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index ea589eb..583e7b7 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -68,7 +68,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson.module</groupId>
         <artifactId>jackson-module-scala_2.11</artifactId>
-        <version>2.8.8</version>
+        <version>2.8.9</version>
       </dependency>
       <dependency>
         <groupId>com.github.dozermapper</groupId>
@@ -3219,27 +3219,17 @@
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
         <artifactId>websocket-api</artifactId>
-        <version>9.4.4.v20170414</version>
+        <version>9.4.6.v20170531</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
         <artifactId>websocket-common</artifactId>
-        <version>9.4.4.v20170414</version>
+        <version>9.4.6.v20170531</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
         <artifactId>websocket-servlet</artifactId>
-        <version>9.4.4.v20170414</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-rewrite</artifactId>
-        <version>9.4.4.v20170414</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-util-ajax</artifactId>
-        <version>9.4.4.v20170414</version>
+        <version>9.4.6.v20170531</version>
       </dependency>
       <dependency>
         <groupId>org.jdom</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/dc224a58/platforms/spring-boot/spring-boot-dm/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml
index 1d2e167..630a096 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -43,7 +43,7 @@
 
   <properties>
     <!-- Spring-Boot target version -->
-    <spring-boot-version>1.5.3.RELEASE</spring-boot-version>
+    <spring-boot-version>1.5.6.RELEASE</spring-boot-version>
 
     <!-- The following dependencies should be aligned with the ones in standard camel
parent -->
     <avro-version>1.8.1</avro-version>
@@ -68,19 +68,20 @@
     <infinispan-spring-boot-version>1.0.0.Final</infinispan-spring-boot-version>
 
     <!-- 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) -->
+    <!-- for example: https://github.com/spring-projects/spring-boot/blob/v1.5.6.RELEASE/spring-boot-dependencies/pom.xml
-->
     <jackson2-version>2.8.8</jackson2-version>
-    <scala-jackson2-version>2.8.8</scala-jackson2-version>
-    <jetty9-version>9.4.4.v20170414</jetty9-version>
+    <scala-jackson2-version>2.8.9</scala-jackson2-version>
+    <jetty9-version>9.4.6.v20170531</jetty9-version>
     <jetty-version>${jetty9-version}</jetty-version>
     <jna-version>4.2.2</jna-version>
-    <hazelcast-version>3.7.7</hazelcast-version>
+    <hazelcast-version>3.7.8</hazelcast-version>
     <htmlunit-version>2.21</htmlunit-version>
     <log4j2-version>2.7</log4j2-version>
     <slf4j-version>1.7.25</slf4j-version>
-    <spring-version>4.3.8.RELEASE</spring-version>
-    <spring-data-releasetrain-version>Ingalls-SR3</spring-data-releasetrain-version>
-    <spring-integration-version>4.3.9.RELEASE</spring-integration-version>
-    <spring-security-version>4.2.2.RELEASE</spring-security-version>
+    <spring-version>4.3.10.RELEASE</spring-version>
+    <spring-data-releasetrain-version>Ingalls-SR6</spring-data-releasetrain-version>
+    <spring-integration-version>4.3.11.RELEASE</spring-integration-version>
+    <spring-security-version>4.2.3.RELEASE</spring-security-version>
   </properties>
 
   <build>


Mime
View raw message