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
The following commit(s) were added to refs/heads/master by this push:
new f7a1785 Upgrade to Spring Boot 1.5.8
f7a1785 is described below
commit f7a178564b3a21acf039adfd9f87d43ac56b2d6b
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Oct 18 13:08:05 2017 +0200
Upgrade to Spring Boot 1.5.8
---
components/camel-chronicle/pom.xml | 21 +++++++++++++++++++++
parent/pom.xml | 4 ++--
.../pom.xml | 4 ++++
.../camel-spring-boot-dependencies/pom.xml | 22 +---------------------
platforms/spring-boot/spring-boot-dm/pom.xml | 8 ++++----
5 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/components/camel-chronicle/pom.xml
b/components/camel-chronicle/pom.xml
index 4857c4e..3d16315 100644
--- a/components/camel-chronicle/pom.xml
+++ b/components/camel-chronicle/pom.xml
@@ -50,8 +50,29 @@
<groupId>net.openhft</groupId>
<artifactId>chronicle-engine</artifactId>
<version>${chronicle-engine-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>${jna-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
diff --git a/parent/pom.xml b/parent/pom.xml
index 8ce2554..33c905c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -340,7 +340,7 @@
<java-apns-version>1.0.0.Beta6</java-apns-version>
<java-ewah-version>1.1.6</java-ewah-version>
<java-util-version>1.31.1</java-util-version>
- <jna-version>4.2.1</jna-version>
+ <jna-version>4.2.2</jna-version>
<jnats-version>1.0</jnats-version>
<javacc-maven-plugin-version>2.6</javacc-maven-plugin-version>
<javacrumbs-version>0.22</javacrumbs-version>
@@ -629,7 +629,7 @@
<splunk-version>1.6.3.0_1</splunk-version>
<spring-batch-version>3.0.8.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.8.RELEASE_1</spring-batch-bundle-version>
- <spring-boot-version>1.5.7.RELEASE</spring-boot-version>
+ <spring-boot-version>1.5.8.RELEASE</spring-boot-version>
<!-- use same version of spring-cloud 1.2.x -->
<spring-cloud-commons-version>1.2.3.RELEASE</spring-cloud-commons-version>
<spring-cloud-netflix-version>1.3.4.RELEASE</spring-cloud-netflix-version>
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 aaddbb5..115c6ed 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
@@ -211,6 +211,7 @@
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>org.slf4j:slf4j-simple</exclude>
+ <exclude>org.slf4j:slf4j-ext</exclude>
<exclude>org.springframework*:*</exclude>
@@ -238,10 +239,13 @@
<exclude>io.netty*:*</exclude>
<exclude>org.scala-lang:*</exclude>
<exclude>org.apache.lucene:*</exclude>
+ <exclude>net.java.dev.jna:*</exclude>
<!-- Jetty -->
<exclude>org.eclipse.jetty:jetty-rewrite</exclude>
<exclude>org.eclipse.jetty:jetty-util-ajax</exclude>
+ <exclude>org.eclipse.jetty.websocket:websocket-api</exclude>
+ <exclude>org.eclipse.jetty.websocket:websocket-common</exclude>
<exclude>org.eclipse.jetty.websocket:websocket-servlet</exclude>
<!-- Unrelated -->
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 d387262..5556aff 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
@@ -58,7 +58,7 @@
<dependency>
<groupId>com.dropbox.core</groupId>
<artifactId>dropbox-core-sdk</artifactId>
- <version>3.0.4</version>
+ <version>3.0.5</version>
</dependency>
<dependency>
<groupId>com.github.dozermapper</groupId>
@@ -152,11 +152,6 @@
<version>1.2.17</version>
</dependency>
<dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>4.2.2</version>
- </dependency>
- <dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>9.7.0-18</version>
@@ -3242,16 +3237,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-api</artifactId>
- <version>9.4.6.v20170531</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-common</artifactId>
- <version>9.4.6.v20170531</version>
- </dependency>
- <dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1.3</version>
@@ -3638,11 +3623,6 @@
<version>2.3.6</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-ext</artifactId>
- <version>1.7.25</version>
- </dependency>
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.21</version>
diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml
b/platforms/spring-boot/spring-boot-dm/pom.xml
index db50392..8394bfa 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -41,7 +41,7 @@
<properties>
<!-- Spring-Boot target version -->
- <spring-boot-version>1.5.7.RELEASE</spring-boot-version>
+ <spring-boot-version>1.5.8.RELEASE</spring-boot-version>
<!-- The following dependencies should be aligned with the ones in
standard camel parent -->
<avro-version>1.8.2</avro-version>
@@ -65,16 +65,16 @@
<groovy-version>2.4.12</groovy-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.7.RELEASE/spring-boot-dependencies/pom.xml
-->
+ <!-- for example:
https://github.com/spring-projects/spring-boot/blob/v1.5.8.RELEASE/spring-boot-dependencies/pom.xml
-->
<jackson2-version>2.8.10</jackson2-version>
- <jetty9-version>9.4.6.v20170531</jetty9-version>
+ <jetty9-version>9.4.7.v20170914</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jna-version>4.2.2</jna-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.11.RELEASE</spring-version>
+ <spring-version>4.3.12.RELEASE</spring-version>
<spring-data-releasetrain-version>Ingalls-SR7</spring-data-releasetrain-version>
<spring-integration-version>4.3.12.RELEASE</spring-integration-version>
<spring-security-version>4.2.3.RELEASE</spring-security-version>
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
