Repository: camel Updated Branches: refs/heads/camel-2.19.x 96c96ee52 -> 73a657dc8
Upgrade back to Spring Boot 1.5.7 This reverts commit a3a289a0a17d02add2c5deea277798d1904325b8. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/73a657dc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/73a657dc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/73a657dc Branch: refs/heads/camel-2.19.x Commit: 73a657dc84368ccb7e4b5c19b33d854989524909 Parents: 96c96ee Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Sep 16 10:49:37 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Sep 16 10:49:37 2017 +0200 ---------------------------------------------------------------------- parent/pom.xml | 6 +++--- .../camel-spring-boot-dependencies/pom.xml | 12 +++++++++++- .../camel-spring-boot-generator-bom/pom.xml | 3 --- 3 files changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/73a657dc/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0c01052..f858039 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -299,7 +299,7 @@ <jackson-version>1.9.12</jackson-version> <jackson-spark-version>2.4.5</jackson-spark-version> <jackson2-scala-version>2.6.1</jackson2-scala-version> - <jackson2-version>2.8.7</jackson2-version> + <jackson2-version>2.8.10</jackson2-version> <jackrabbit-version>2.15.1</jackrabbit-version> <jackrabbit-guava-version>15.0</jackrabbit-guava-version> <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version> @@ -587,7 +587,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.5.6.RELEASE</spring-boot-version> + <spring-boot-version>1.5.7.RELEASE</spring-boot-version> <spring-cloud-commons-version>1.2.0.RELEASE</spring-cloud-commons-version> <spring-cloud-netflix-version>1.3.0.RELEASE</spring-cloud-netflix-version> <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version> @@ -648,7 +648,7 @@ <tika-version>1.16</tika-version> <twitter4j-bundle-version>4.0.6_1</twitter4j-bundle-version> <twitter4j-version>4.0.6</twitter4j-version> - <undertow-version>1.4.18.Final</undertow-version> + <undertow-version>1.4.20.Final</undertow-version> <univocity-parsers-version>2.3.1</univocity-parsers-version> <unix-socket-factory-version>2015-01-27T15-02-14</unix-socket-factory-version> <unix-socket-factory-bundle-version>1.0.0</unix-socket-factory-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/73a657dc/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 a5a60f2..3b07442 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 @@ -56,7 +56,7 @@ <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jsonSchema</artifactId> - <version>2.8.7</version> + <version>2.8.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> @@ -3080,6 +3080,16 @@ <version>9.4.2.v20170220</version> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-rewrite</artifactId> + <version>9.4.2.v20170220</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>9.4.2.v20170220</version> + </dependency> + <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> <version>1.1.3</version> http://git-wip-us.apache.org/repos/asf/camel/blob/73a657dc/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml index 2fe2c64..7b190bc 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml @@ -258,9 +258,6 @@ <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>
