Repository: camel Updated Branches: refs/heads/master 15e9e4074 -> 17b738049
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/17b73804 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/17b73804 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/17b73804 Branch: refs/heads/master Commit: 17b73804913b42a93acc4e7d9c920a1b6e296a4e Parents: 15e9e40 Author: Claus Ibsen <[email protected]> Authored: Wed Sep 13 14:48:28 2017 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Sep 13 15:57:03 2017 +0200 ---------------------------------------------------------------------- parent/pom.xml | 8 ++++---- .../camel-spring-boot-dependencies-generator/pom.xml | 1 - .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 7 ++++++- platforms/spring-boot/spring-boot-dm/pom.xml | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/17b73804/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8085959..9a00c41 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -324,7 +324,7 @@ <jackson-spark-version>2.4.5</jackson-spark-version> <jackson2-scala-version>2.6.1</jackson2-scala-version> <!-- jackson 2.9.x is not yet working with all camel components such as swagger-java --> - <jackson2-version>2.8.10</jackson2-version> + <jackson2-version>2.8.7</jackson2-version> <jackrabbit-version>2.15.6</jackrabbit-version> <jackrabbit-guava-version>15.0</jackrabbit-guava-version> <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version> @@ -623,7 +623,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.6.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> @@ -631,7 +631,7 @@ <spring-data-commons-version>1.13.6.RELEASE</spring-data-commons-version> <spring-data-keyvalue-version>1.2.6.RELEASE</spring-data-keyvalue-version> <spring-data-redis-version>1.8.6.RELEASE</spring-data-redis-version> - <spring-integration-version>4.3.12.RELEASE</spring-integration-version> + <spring-integration-version>4.3.11.RELEASE</spring-integration-version> <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version> <spring-ldap-version>2.3.1.RELEASE</spring-ldap-version> <spring-ldap-bundle-version>2.3.1.RELEASE_1</spring-ldap-bundle-version> @@ -685,7 +685,7 @@ <twilio-version>7.9.1</twilio-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/17b73804/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 ddb30d9..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 @@ -266,7 +266,6 @@ <!-- 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/17b73804/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 2d40c7f..57d620a 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.10</version> + <version>2.8.7</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> @@ -3242,6 +3242,11 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/17b73804/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 67ade89..9dcf0f9 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.7.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>
