Repository: camel Updated Branches: refs/heads/boot2 251be6e48 -> e7de255f9
spring-boot2 itests configuration Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9a26651 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9a26651 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9a26651 Branch: refs/heads/boot2 Commit: a9a26651561fde6699ec40f67b79d0520eeee45c Parents: 251be6e Author: Nicola Ferraro <[email protected]> Authored: Wed Sep 13 16:29:59 2017 +0200 Committer: Nicola Ferraro <[email protected]> Committed: Wed Sep 13 16:29:59 2017 +0200 ---------------------------------------------------------------------- components/camel-netty4/pom.xml | 1 + parent/pom.xml | 6 ------ .../camel-spring-boot2-starter/pom.xml | 9 ++++----- tests/camel-itest-spring-boot/pom.xml | 13 ++----------- .../camel/itest/springboot/util/JarExporter.java | 3 +-- .../src/test/resources/application-pom.xml | 7 ++++++- 6 files changed, 14 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a9a26651/components/camel-netty4/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml index 60fcd9b..d4aa394 100644 --- a/components/camel-netty4/pom.xml +++ b/components/camel-netty4/pom.xml @@ -46,6 +46,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> + <version>${netty-version}</version> </dependency> <dependency> <groupId>commons-pool</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/a9a26651/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2391134..69c42d6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3641,12 +3641,6 @@ <version>${fastjson-version}</version> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty-version}</version> - </dependency> - <!-- abdera dependencies--> <dependency> <groupId>org.apache.abdera</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/a9a26651/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml index 33f5a71..90797e5 100644 --- a/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-spring-boot2-starter/pom.xml @@ -28,11 +28,15 @@ <packaging>jar</packaging> <name>Spring-Boot Starter :: Camel :: Spring Boot 2</name> <description>Spring-Boot Starter for Using Camel with Spring Boot 2</description> + <properties> + <spring-boot-version>${spring-boot2-version}</spring-boot-version> + </properties> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> <version>${spring-boot-version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -56,11 +60,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-core-starter</artifactId> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot</artifactId> - <optional>true</optional> - </dependency> <!--END OF GENERATED CODE--> </dependencies> <!--START OF GENERATED CODE--> http://git-wip-us.apache.org/repos/asf/camel/blob/a9a26651/tests/camel-itest-spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/pom.xml b/tests/camel-itest-spring-boot/pom.xml index 3c37d58..3d2ce97 100644 --- a/tests/camel-itest-spring-boot/pom.xml +++ b/tests/camel-itest-spring-boot/pom.xml @@ -41,23 +41,14 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring-boot2-starter</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </exclusion> - </exclusions> + <version>${project.version}</version> </dependency> <!-- Dependency needed to incorporate classes in main jar --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-loader</artifactId> - <version>${spring-boot-version}</version> + <version>${spring-boot2-version}</version> </dependency> <!-- Test dependencies needed also at compile/unitTestEnabled time --> http://git-wip-us.apache.org/repos/asf/camel/blob/a9a26651/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java index 4f0de2e..84dde29 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java @@ -32,8 +32,7 @@ public class JarExporter { public void exportJar() throws Exception { Archive<?> archive = ArquillianPackager.springBootPackage(new ITestConfigBuilder() - .module("camel-cache") - .resource("components/cache-ehcache.xml", "ehcache.xml") + .module("camel-ahc") .build()); new ZipExporterImpl(archive).exportTo(new File("target/export.zip"), true); http://git-wip-us.apache.org/repos/asf/camel/blob/a9a26651/tests/camel-itest-spring-boot/src/test/resources/application-pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/resources/application-pom.xml b/tests/camel-itest-spring-boot/src/test/resources/application-pom.xml index a06bd78..7aa6331 100644 --- a/tests/camel-itest-spring-boot/src/test/resources/application-pom.xml +++ b/tests/camel-itest-spring-boot/src/test/resources/application-pom.xml @@ -36,7 +36,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot-version}</version> + <version>${spring-boot2-version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -55,6 +55,11 @@ <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot2-starter</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>#{module}-starter</artifactId> </dependency>
