Upgrade Spring Boot v1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b46d5cbb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b46d5cbb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b46d5cbb Branch: refs/heads/master Commit: b46d5cbbcaed8565444d232be2ba6401baadc71e Parents: dcf7b50 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Sep 12 19:47:23 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Sep 12 19:47:23 2017 +0200 ---------------------------------------------------------------------- .../camel-spring-boot-dependencies-generator/pom.xml | 1 + .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b46d5cbb/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 74cfefa..ddb30d9 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 @@ -266,6 +266,7 @@ <!-- Jetty --> <exclude>org.eclipse.jetty:jetty-rewrite</exclude> <exclude>org.eclipse.jetty:jetty-util-ajax</exclude> + <exclude>org.eclipse.jetty.websocket:websocket-servlet</exclude> <!-- Unrelated --> <exclude>org.apache.servicemix.bundles:*</exclude> http://git-wip-us.apache.org/repos/asf/camel/blob/b46d5cbb/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 57d620a..2d40c7f 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 @@ -63,7 +63,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> @@ -3242,11 +3242,6 @@ <version>9.4.6.v20170531</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-servlet</artifactId> - <version>9.4.6.v20170531</version> - </dependency> - <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> <version>1.1.3</version>
