Repository: camel Updated Branches: refs/heads/camel-2.19.x dc55037d8 -> a3a289a0a
Revert "Upgrade Spring Boot v1" This reverts commit 5362bb9f015ce0df70fb6c5c3afa8468475b30dc. Revert "Upgrade dependency due Spring Boot v1 update" This reverts commit dcf7b503952d77295ba2886e2bd4b7fee43d1fab. Revert "Upgrade Spring Boot v1" This reverts commit b46d5cbbcaed8565444d232be2ba6401baadc71e. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a3a289a0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a3a289a0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a3a289a0 Branch: refs/heads/camel-2.19.x Commit: a3a289a0a17d02add2c5deea277798d1904325b8 Parents: dc55037 Author: Claus Ibsen <[email protected]> Authored: Wed Sep 13 14:48:28 2017 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Sep 13 15:56:05 2017 +0200 ---------------------------------------------------------------------- parent/pom.xml | 6 +++--- .../camel-spring-boot-dependencies/pom.xml | 12 +----------- .../camel-spring-boot-generator-bom/pom.xml | 3 +++ 3 files changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a3a289a0/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f858039..0c01052 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.10</jackson2-version> + <jackson2-version>2.8.7</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.7.RELEASE</spring-boot-version> + <spring-boot-version>1.5.6.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.20.Final</undertow-version> + <undertow-version>1.4.18.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/a3a289a0/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 3b07442..a5a60f2 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.10</version> + <version>2.8.7</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> @@ -3080,16 +3080,6 @@ <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/a3a289a0/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 7b190bc..2fe2c64 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,6 +258,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>
