camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nferr...@apache.org
Subject [49/49] camel git commit: CAMEL-10222: Merging changes
Date Wed, 21 Sep 2016 07:20:08 GMT
CAMEL-10222: Merging changes


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/011e4ec5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/011e4ec5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/011e4ec5

Branch: refs/heads/master
Commit: 011e4ec57fcd700ed3e368e3f414233c09df2b1d
Parents: 712378a 1e16019
Author: Nicola Ferraro <ni.ferraro@gmail.com>
Authored: Wed Sep 21 09:16:15 2016 +0200
Committer: Nicola Ferraro <ni.ferraro@gmail.com>
Committed: Wed Sep 21 09:16:15 2016 +0200

----------------------------------------------------------------------
 apache-camel/pom.xml                            | 1097 ++++++
 .../src/main/descriptors/common-bin.xml         |  227 ++
 components-starter/README.adoc                  |   27 +
 components-starter/camel-ahc-starter/pom.xml    |    5 +
 components-starter/camel-ahc-ws-starter/pom.xml |    5 +
 components-starter/camel-bam-starter/pom.xml    |    8 +
 .../camel-blueprint-starter/pom.xml             |   50 -
 .../src/main/resources/META-INF/LICENSE.txt     |  203 --
 .../src/main/resources/META-INF/NOTICE.txt      |   11 -
 .../src/main/resources/META-INF/spring.provides |   18 -
 .../camel-cassandraql-starter/pom.xml           |    5 +
 components-starter/camel-cdi-starter/pom.xml    |   50 -
 .../src/main/resources/META-INF/LICENSE.txt     |  203 --
 .../src/main/resources/META-INF/NOTICE.txt      |   11 -
 .../src/main/resources/META-INF/spring.provides |   18 -
 components-starter/camel-ejb-starter/pom.xml    |   50 -
 .../EjbComponentAutoConfiguration.java          |   71 -
 .../springboot/EjbComponentConfiguration.java   |   56 -
 .../src/main/resources/META-INF/LICENSE.txt     |  203 --
 .../src/main/resources/META-INF/NOTICE.txt      |   11 -
 .../main/resources/META-INF/spring.factories    |   19 -
 .../src/main/resources/META-INF/spring.provides |   18 -
 components-starter/camel-github-starter/pom.xml |    5 +
 .../camel-guava-eventbus-starter/pom.xml        |    1 +
 components-starter/camel-hbase-starter/pom.xml  |    4 +
 components-starter/camel-hl7-starter/pom.xml    |    5 +
 components-starter/camel-ibatis-starter/pom.xml |   50 -
 .../IBatisComponentAutoConfiguration.java       |   71 -
 .../IBatisComponentConfiguration.java           |   70 -
 .../src/main/resources/META-INF/LICENSE.txt     |  203 --
 .../src/main/resources/META-INF/NOTICE.txt      |   11 -
 .../main/resources/META-INF/spring.factories    |   19 -
 .../src/main/resources/META-INF/spring.provides |   18 -
 .../camel-jclouds-starter/pom.xml               |   50 -
 .../JcloudsComponentAutoConfiguration.java      |   72 -
 .../JcloudsComponentConfiguration.java          |   57 -
 .../src/main/resources/META-INF/LICENSE.txt     |  203 --
 .../src/main/resources/META-INF/NOTICE.txt      |   11 -
 .../main/resources/META-INF/spring.factories    |   19 -
 .../src/main/resources/META-INF/spring.provides |   18 -
 components-starter/camel-jcr-starter/pom.xml    |    5 +
 components-starter/camel-jetty9-starter/pom.xml |    6 +-
 components-starter/camel-jira-starter/pom.xml   |    4 +
 .../camel-kubernetes-starter/pom.xml            |    1 -
 .../camel-netty4-http-starter/pom.xml           |    1 -
 components-starter/camel-netty4-starter/pom.xml |    1 -
 components-starter/camel-quartz-starter/pom.xml |   50 -
 .../QuartzComponentAutoConfiguration.java       |   71 -
 .../QuartzComponentConfiguration.java           |  122 -
 .../src/main/resources/META-INF/LICENSE.txt     |  203 --
 .../src/main/resources/META-INF/NOTICE.txt      |   11 -
 .../main/resources/META-INF/spring.factories    |   19 -
 .../src/main/resources/META-INF/spring.provides |   18 -
 .../camel-restlet-starter/pom.xml               |    1 -
 .../camel-salesforce-starter/pom.xml            |   16 +
 components-starter/camel-scala-starter/pom.xml  |   10 +
 .../camel-servletlistener-starter/pom.xml       |    4 +
 .../camel-spark-rest-starter/pom.xml            |   55 -
 .../SparkComponentAutoConfiguration.java        |   71 -
 .../springboot/SparkComponentConfiguration.java |  256 --
 .../src/main/resources/META-INF/LICENSE.txt     |  203 --
 .../src/main/resources/META-INF/NOTICE.txt      |   11 -
 .../main/resources/META-INF/spring.factories    |   19 -
 .../src/main/resources/META-INF/spring.provides |   18 -
 .../camel-swagger-java-starter/pom.xml          |    1 -
 components-starter/camel-test-starter/pom.xml   |   50 -
 .../src/main/resources/META-INF/LICENSE.txt     |  203 --
 .../src/main/resources/META-INF/NOTICE.txt      |   11 -
 .../src/main/resources/META-INF/spring.provides |   18 -
 components-starter/camel-testng-starter/pom.xml |   56 -
 .../src/main/resources/META-INF/LICENSE.txt     |  203 --
 .../src/main/resources/META-INF/NOTICE.txt      |   11 -
 .../src/main/resources/META-INF/spring.provides |   18 -
 .../camel-undertow-starter/pom.xml              |    1 -
 components-starter/pom.xml                      |   13 +-
 .../component/jetty9/JettyContentExchange9.java |   21 +-
 .../component/jetty9/JettyHttpComponent9.java   |    3 +-
 .../jetty/HttpProducerSendEmptyHeaderTest.java  |    2 +
 components/camel-jira/pom.xml                   |    3 +-
 .../JUnitFatJarRouterTest.java                  |    4 +
 examples/camel-example-hystrix/client/pom.xml   |    6 +-
 examples/camel-example-hystrix/service1/pom.xml |    8 +-
 .../camel-example-spring-boot-metrics/pom.xml   |    9 +-
 .../camel-example-spring-boot-starter/pom.xml   |    2 +-
 examples/camel-example-spring-boot/pom.xml      |    7 +
 examples/camel-example-zipkin/client/pom.xml    |    4 -
 examples/camel-example-zipkin/service1/pom.xml  |    2 +-
 examples/camel-example-zipkin/service2/pom.xml  |    4 -
 parent/pom.xml                                  |   65 +-
 pom.xml                                         |    1 +
 spring-boot-dm/README.adoc                      |   46 +
 .../camel-spring-boot-dependencies/pom.xml      | 3115 ++++++++++++++++++
 .../camel-spring-boot-generator-bom/pom.xml     |  287 ++
 .../target-template-pom.xml                     |   39 +
 spring-boot-dm/camel-starter-parent/pom.xml     |  160 +
 spring-boot-dm/pom.xml                          |  154 +
 tests/camel-itest-spring-boot/pom.xml           |  102 +-
 .../itest/springboot/ITestApplication.java      |   38 +-
 .../camel/itest/springboot/ITestConfig.java     |   22 +
 .../itest/springboot/ITestConfigBuilder.java    |   35 +-
 .../springboot/command/UnitTestCommand.java     |   18 +-
 .../StaticDummyFallbackConverter.java           |   44 +
 .../camel/itest/springboot/CamelBamTest.java    |    2 -
 .../itest/springboot/CamelBlueprintTest.java    |   48 -
 .../itest/springboot/CamelCassandraqlTest.java  |    4 +-
 .../camel/itest/springboot/CamelCdiTest.java    |   49 -
 .../camel/itest/springboot/CamelEjbTest.java    |   48 -
 .../camel/itest/springboot/CamelGoraTest.java   |    2 +
 .../camel/itest/springboot/CamelGuiceTest.java  |    1 +
 .../camel/itest/springboot/CamelHbaseTest.java  |    6 +-
 .../itest/springboot/CamelHystrixTest.java      |    1 +
 .../camel/itest/springboot/CamelIbatisTest.java |   49 -
 .../camel/itest/springboot/CamelIgniteTest.java |    2 +
 .../itest/springboot/CamelInfinispanTest.java   |    4 +-
 .../itest/springboot/CamelInfluxdbTest.java     |    1 +
 .../itest/springboot/CamelJcloudsTest.java      |   51 -
 .../camel/itest/springboot/CamelJetty9Test.java |    3 +-
 .../camel/itest/springboot/CamelQuartzTest.java |   49 -
 .../itest/springboot/CamelRestletTest.java      |    3 +-
 .../itest/springboot/CamelSalesforceTest.java   |    2 +
 .../itest/springboot/CamelServletTest.java      |    2 +-
 .../itest/springboot/CamelSparkRestTest.java    |   50 -
 .../camel/itest/springboot/CamelSpringTest.java |    2 +
 .../springboot/util/ArquillianPackager.java     |  463 ++-
 .../itest/springboot/util/BOMResolver.java      |  166 +
 .../springboot/util/DependencyResolver.java     |  183 +-
 .../itest/springboot/util/JarExporter.java      |    2 +-
 .../util/LibraryVersionMismatchChecker.java     |  126 -
 .../itest/springboot/util/LocationUtils.java    |   51 +
 .../src/test/resources/application-pom.xml      |   10 +-
 .../src/test/resources/log4j2-spring.xml        |   16 -
 .../src/test/resources/spring-logback.xml       |   37 +
 .../main/resources/archetype-resources/pom.xml  |    9 +-
 .../maven/bom-generator-maven-plugin/pom.xml    |  102 +
 .../maven/bom/generator/BomGeneratorMojo.java   |  416 +++
 .../maven/bom/generator/DependencyMatcher.java  |   87 +
 .../maven/bom/generator/DependencySet.java      |   58 +
 .../bom/generator/ExternalBomConflictCheck.java |   66 +
 .../generator/ExternalBomConflictCheckSet.java  |   47 +
 .../maven/packaging/SpringBootStarterMojo.java  |   11 +-
 .../spring-boot-fix-dependencies.properties     |   51 +-
 tooling/maven/pom.xml                           |    1 +
 142 files changed, 6993 insertions(+), 4503 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/011e4ec5/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/fatjarroutertests/JUnitFatJarRouterTest.java
----------------------------------------------------------------------
diff --cc components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/fatjarroutertests/JUnitFatJarRouterTest.java
index 33fb5ba,76b9aec..3415c71
--- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/fatjarroutertests/JUnitFatJarRouterTest.java
+++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/fatjarroutertests/JUnitFatJarRouterTest.java
@@@ -20,11 -20,11 +20,15 @@@ import java.io.IOException
  import java.lang.management.ManagementFactory;
  import java.net.URL;
  import java.util.Set;
+ import javax.management.MBeanServer;
+ import javax.management.MalformedObjectNameException;
+ import javax.management.ObjectName;
+ 
  
 +import javax.management.MBeanServer;
 +import javax.management.MalformedObjectNameException;
 +import javax.management.ObjectName;
 +
  import org.apache.commons.io.IOUtils;
  import org.junit.Assert;
  import org.junit.BeforeClass;

http://git-wip-us.apache.org/repos/asf/camel/blob/011e4ec5/parent/pom.xml
----------------------------------------------------------------------


Mime
View raw message