Repository: camel Updated Branches: refs/heads/master 7f88a949a -> d1c12228e
CAMEL-10119: Upgrade to Spring 4.3 and SpringBoot 1.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1c12228 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1c12228 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1c12228 Branch: refs/heads/master Commit: d1c12228eb17203edb59092ee88c392fa27ed412 Parents: 59a6ac0 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Jul 29 13:29:07 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jul 29 13:35:52 2016 +0200 ---------------------------------------------------------------------- tests/camel-itest-spring-boot/pom.xml | 469 ++++++++++--------- .../ArquillianSyncBootJarLauncher.java | 9 +- 2 files changed, 246 insertions(+), 232 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d1c12228/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 38a6eb1..77388db 100644 --- a/tests/camel-itest-spring-boot/pom.xml +++ b/tests/camel-itest-spring-boot/pom.xml @@ -1,230 +1,245 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>tests</artifactId> - <groupId>org.apache.camel</groupId> - <version>2.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-itest-spring-boot</artifactId> - - <name>Camel :: Integration Tests :: Spring-Boot</name> - <description>Spring-Boot Camel test</description> - - <dependencies> - - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </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> - </dependency> - - <!-- Test dependencies needed also at compile/unitTestEnabled time --> - <dependency> - <groupId>org.jboss.shrinkwrap</groupId> - <artifactId>shrinkwrap-api</artifactId> - <version>${shrinkwrap-version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap</groupId> - <artifactId>shrinkwrap-impl-base</artifactId> - <version>${shrinkwrap-version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <!-- Test dependencies --> - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <version>${arquillian-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-container-test-spi</artifactId> - <version>${arquillian-version}</version> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.protocol</groupId> - <artifactId>arquillian-protocol-jmx</artifactId> - <version>${arquillian-version}</version> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>container-se-api</artifactId> - <version>${arquillian-container-se-managed-version}</version> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>container-se-server</artifactId> - <version>${arquillian-container-se-managed-version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-api</artifactId> - <version>${shrinkwrap-resolver-version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-spi</artifactId> - <version>${shrinkwrap-resolver-version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-api-maven</artifactId> - <version>${shrinkwrap-resolver-version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-spi-maven</artifactId> - <version>${shrinkwrap-resolver-version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-api-maven-archive</artifactId> - <version>${shrinkwrap-resolver-version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <version>${shrinkwrap-resolver-version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId> - <version>${shrinkwrap-resolver-version}</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <childDelegation>false</childDelegation> - <forkedProcessTimeoutInSeconds>15000</forkedProcessTimeoutInSeconds> - <rerunFailingTestsCount>0</rerunFailingTestsCount> - <includes> - <include>**/*Test.java</include> - </includes> - <systemProperties> - - <!-- Test configuration --> - <!-- - It is better disabling unit testing in surefire, as some of them fail for various reasons - (unrelated to spring-boot) when running in the arquillian jar. - - Tests are enabled when running from IDE. See org.apache.camel.itest.springboot.ITestConfigBuilder - for property names and defaults values. - --> - <property> - <name>itest.springboot.unitTestEnabled</name> - <value>false</value> - </property> - <property> - <name>itest.springboot.includeTestDependencies</name> - <value>true</value> - </property> - <property> - <name>itest.springboot.mavenOfflineResolution</name> - <value>false</value> - </property> - - - <!-- Additional dependencies required by modules --> - <property> - <name>version_org.apache.camel:camel-core</name> - <value>${project.version}</value> - </property> - <property> - <name>version_org.apache.camel:camel-netty4</name> - <value>${project.version}</value> - </property> - <property> - <name>version_org.springframework.data:spring-data-redis</name> - <value>${spring-data-redis-version}</value> - </property> - <property> - <name>version_org.hibernate:hibernate-validator</name> - <value>${hibernate-validator-version}</value> - </property> - <property> - <name>version_xom:xom</name> - <value>${xom-version}</value> - </property> - <property> - <name>version_org.springframework.boot:spring-boot-starter-web</name> - <value>${spring-boot-version}</value> - </property> - <property> - <name>version_2.10_org.scala-lang:scala-library</name> - <value>${scala-2.10-version}</value> - </property> - <property> - <name>version_org.springframework:spring-webmvc</name> - <value>${spring-version}</value> - </property> - <property> - <name>version_org.apache.lucene:lucene-core</name> - <value>${lucene3-version}</value> - </property> - <property> - <name>version_com.google.inject:guice</name> - <value>${guice3-version}</value> - </property> - <property> - <name>version_com.google.guava:guava</name> - <value>${google-guava-version}</value> - </property> - <property> - <name>version_org.apache.hadoop:hadoop-hdfs</name> - <value>${hadoop2-version}</value> - </property> - <property> - <name>version_io.netty:netty-all</name> - <value>${netty-version}</value> - </property> - <property> - <name>version_org.glassfish.grizzly:grizzly-websockets</name> - <value>${grizzly-websockets-version}</value> - </property> - <property> - <name>version_org.glassfish.grizzly:connection-pool</name> - <value>${grizzly-websockets-version}</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>tests</artifactId> + <groupId>org.apache.camel</groupId> + <version>2.18-SNAPSHOT</version> + </parent> + + <artifactId>camel-itest-spring-boot</artifactId> + <name>Camel :: Integration Tests :: Spring-Boot</name> + <description>Spring-Boot Camel test</description> + + <dependencies> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot-starter</artifactId> + </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> + </dependency> + + <!-- Test dependencies needed also at compile/unitTestEnabled time --> + <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-api</artifactId> + <version>${shrinkwrap-version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-impl-base</artifactId> + <version>${shrinkwrap-version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <version>${arquillian-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-container-test-spi</artifactId> + <version>${arquillian-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-jmx</artifactId> + <version>${arquillian-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>container-se-api</artifactId> + <version>${arquillian-container-se-managed-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>container-se-server</artifactId> + <version>${arquillian-container-se-managed-version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-api</artifactId> + <version>${shrinkwrap-resolver-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-spi</artifactId> + <version>${shrinkwrap-resolver-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-api-maven</artifactId> + <version>${shrinkwrap-resolver-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-spi-maven</artifactId> + <version>${shrinkwrap-resolver-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-api-maven-archive</artifactId> + <version>${shrinkwrap-resolver-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-impl-maven</artifactId> + <version>${shrinkwrap-resolver-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId> + <version>${shrinkwrap-resolver-version}</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <childDelegation>false</childDelegation> + <forkedProcessTimeoutInSeconds>15000</forkedProcessTimeoutInSeconds> + <rerunFailingTestsCount>0</rerunFailingTestsCount> + <includes> + <include>**/*Test.java</include> + </includes> + <systemProperties> + + <!-- Test configuration --> + <!-- + It is better disabling unit testing in surefire, as some of them fail for various reasons + (unrelated to spring-boot) when running in the arquillian jar. + + Tests are enabled when running from IDE. See org.apache.camel.itest.springboot.ITestConfigBuilder + for property names and defaults values. + --> + <property> + <name>itest.springboot.unitTestEnabled</name> + <value>false</value> + </property> + <property> + <name>itest.springboot.includeTestDependencies</name> + <value>true</value> + </property> + <property> + <name>itest.springboot.mavenOfflineResolution</name> + <value>false</value> + </property> + + + <!-- Additional dependencies required by modules --> + <property> + <name>version_org.apache.camel:camel-core</name> + <value>${project.version}</value> + </property> + <property> + <name>version_org.apache.camel:camel-netty4</name> + <value>${project.version}</value> + </property> + <property> + <name>version_org.springframework.data:spring-data-redis</name> + <value>${spring-data-redis-version}</value> + </property> + <property> + <name>version_org.hibernate:hibernate-validator</name> + <value>${hibernate-validator-version}</value> + </property> + <property> + <name>version_xom:xom</name> + <value>${xom-version}</value> + </property> + <property> + <name>version_org.springframework.boot:spring-boot-starter-web</name> + <value>${spring-boot-version}</value> + </property> + <property> + <name>version_2.10_org.scala-lang:scala-library</name> + <value>${scala-2.10-version}</value> + </property> + <property> + <name>version_org.springframework:spring-webmvc</name> + <value>${spring-version}</value> + </property> + <property> + <name>version_org.apache.lucene:lucene-core</name> + <value>${lucene3-version}</value> + </property> + <property> + <name>version_com.google.inject:guice</name> + <value>${guice3-version}</value> + </property> + <property> + <name>version_com.google.guava:guava</name> + <value>${google-guava-version}</value> + </property> + <property> + <name>version_org.apache.hadoop:hadoop-hdfs</name> + <value>${hadoop2-version}</value> + </property> + <property> + <name>version_io.netty:netty-all</name> + <value>${netty-version}</value> + </property> + <property> + <name>version_org.glassfish.grizzly:grizzly-websockets</name> + <value>${grizzly-websockets-version}</value> + </property> + <property> + <name>version_org.glassfish.grizzly:connection-pool</name> + <value>${grizzly-websockets-version}</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/d1c12228/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/arquillian/ArquillianSyncBootJarLauncher.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/arquillian/ArquillianSyncBootJarLauncher.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/arquillian/ArquillianSyncBootJarLauncher.java index 2b8f336..2a8c987 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/arquillian/ArquillianSyncBootJarLauncher.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/arquillian/ArquillianSyncBootJarLauncher.java @@ -17,6 +17,7 @@ package org.apache.camel.itest.springboot.arquillian; import org.springframework.boot.loader.JarLauncher; +import org.springframework.boot.loader.MainMethodRunner; /** * A Spring-boot jar launcher that uses the current thread instead of creating a new thread for spring-boot. @@ -28,17 +29,15 @@ public class ArquillianSyncBootJarLauncher extends JarLauncher { public ArquillianSyncBootJarLauncher() { } - public void run(String[] args) { + public void run(String[] args) throws Exception { this.launch(args); } @Override - protected void launch(String[] args, String mainClass, ClassLoader classLoader) - throws Exception { - + protected void launch(String[] args, String mainClass, ClassLoader classLoader) throws Exception { this.classLoader = classLoader; - Runnable runner = createMainMethodRunner(mainClass, args, classLoader); + MainMethodRunner runner = createMainMethodRunner(mainClass, args, classLoader); Thread.currentThread().setContextClassLoader(classLoader); runner.run();
