Repository: camel Updated Branches: refs/heads/master ce80e9bba -> e04dd7f21
CAMEL-10770: Upgrade to Spring Boot 1.5.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e04dd7f2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e04dd7f2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e04dd7f2 Branch: refs/heads/master Commit: e04dd7f2142e3eb9daed51ae7e42617f5992d3f2 Parents: b4cdbf1 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jan 31 11:32:05 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jan 31 11:36:39 2017 +0100 ---------------------------------------------------------------------- .../camel-example-spring-boot-starter/pom.xml | 26 +++++++++++++++++--- .../main/resources/archetype-resources/pom.xml | 15 ++++++++++- .../src/main/resources/application.yml | 3 ++- 3 files changed, 38 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e04dd7f2/examples/camel-example-spring-boot-starter/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-boot-starter/pom.xml b/examples/camel-example-spring-boot-starter/pom.xml index c886edd..0d73f7c 100644 --- a/examples/camel-example-spring-boot-starter/pom.xml +++ b/examples/camel-example-spring-boot-starter/pom.xml @@ -31,12 +31,14 @@ <description>An example showing how to work with Camel and Spring Boot using Spring Boot Starter</description> <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <spring.boot-version>${spring-boot-version}</spring.boot-version> </properties> - <!-- import Spring-Boot and Camel BOM --> <dependencyManagement> <dependencies> + <!-- Spring Boot BOM --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> @@ -44,10 +46,11 @@ <type>pom</type> <scope>import</scope> </dependency> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring-boot-dependencies</artifactId> - <version>${project.version}</version> + <version>${camel-version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -56,13 +59,21 @@ <dependencies> - <!-- spring-web --> + <!-- Spring Boot --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-undertow</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-actuator</artifactId> + </dependency> - <!-- camel --> + <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring-boot-starter</artifactId> @@ -92,6 +103,13 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <version>${spring-boot-version}</version> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/camel/blob/e04dd7f2/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml index 872e9b8..bd9c06c 100755 --- a/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml @@ -55,26 +55,39 @@ </dependencyManagement> <dependencies> + + <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring-boot-starter</artifactId> <version>${camel-version}</version> </dependency> + + <!-- Spring Boot --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-undertow</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> </dependency> - <!-- Testing --> + <!-- testing --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-spring</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/camel/blob/e04dd7f2/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.yml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.yml b/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.yml index 8334198..9d727e8 100644 --- a/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.yml +++ b/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.yml @@ -15,4 +15,5 @@ ## limitations under the License. ## ------------------------------------------------------------------------ -spring.main.sources: ${package}.MySpringBootRouter \ No newline at end of file +# the name of Camel +camel.springboot.name = MyCamel \ No newline at end of file
