CAMEL-10435: move spring-boot-dm to platforms dir
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a15cbb47 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a15cbb47 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a15cbb47 Branch: refs/heads/master Commit: a15cbb47d9459e462e758318e5e9bb7d32e50df4 Parents: bee13d2 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Fri Nov 4 09:31:56 2016 +0100 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Fri Nov 4 09:31:56 2016 +0100 ---------------------------------------------------------------------- components-starter/pom.xml | 2 +- platforms/pom.xml | 1 + platforms/spring-boot/pom.xml | 21 + .../spring-boot/spring-boot-dm/README.adoc | 46 + .../camel-spring-boot-dependencies/pom.xml | 3145 ++++++++++++++++++ .../camel-spring-boot-generator-bom/pom.xml | 294 ++ .../src/main/resources/target-template-pom.xml | 50 + .../spring-boot-dm/camel-starter-parent/pom.xml | 169 + platforms/spring-boot/spring-boot-dm/pom.xml | 155 + pom.xml | 1 - spring-boot-dm/README.adoc | 46 - .../camel-spring-boot-dependencies/pom.xml | 3125 ----------------- .../camel-spring-boot-generator-bom/pom.xml | 294 -- .../src/main/resources/target-template-pom.xml | 50 - spring-boot-dm/camel-starter-parent/pom.xml | 169 - spring-boot-dm/pom.xml | 155 - .../itest/springboot/util/BOMResolver.java | 9 +- .../springboot/util/DependencyResolver.java | 2 +- 18 files changed, 3888 insertions(+), 3846 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/components-starter/pom.xml ---------------------------------------------------------------------- diff --git a/components-starter/pom.xml b/components-starter/pom.xml index daafb5c..90b9f6e 100644 --- a/components-starter/pom.xml +++ b/components-starter/pom.xml @@ -21,7 +21,7 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-starter-parent</artifactId> <version>2.19.0-SNAPSHOT</version> - <relativePath>../spring-boot-dm/camel-starter-parent</relativePath> + <relativePath>../platforms/spring-boot/spring-boot-dm/camel-starter-parent</relativePath> </parent> <artifactId>components-starter</artifactId> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/platforms/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/pom.xml b/platforms/pom.xml index 6e7ac88..3ba8260 100644 --- a/platforms/pom.xml +++ b/platforms/pom.xml @@ -37,6 +37,7 @@ <module>catalog-maven</module> <module>commands</module> <module>karaf</module> + <module>spring-boot</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/platforms/spring-boot/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/pom.xml b/platforms/spring-boot/pom.xml new file mode 100644 index 0000000..b360b9d --- /dev/null +++ b/platforms/spring-boot/pom.xml @@ -0,0 +1,21 @@ +<?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>camel</artifactId> + <groupId>org.apache.camel</groupId> + <version>2.19.0-SNAPSHOT</version> + <relativePath>../../</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>spring-boot</artifactId> + <packaging>pom</packaging> + <name>Camel :: Platforms :: Spring-Boot</name> + + <modules> + <module>spring-boot-dm</module> + </modules> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/a15cbb47/platforms/spring-boot/spring-boot-dm/README.adoc ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/README.adoc b/platforms/spring-boot/spring-boot-dm/README.adoc new file mode 100755 index 0000000..3af7326 --- /dev/null +++ b/platforms/spring-boot/spring-boot-dm/README.adoc @@ -0,0 +1,46 @@ += Camel Spring-Boot Dependency Management + +The `spring-boot-dm` module include tools to generate a valid spring-boot BOM (bill of materials) +that can be used in spring-boot applications. + +Using the generated BOM (`camel-spring-boot-dependencies`), together with the Spring framework's `spring-boot-dependencies`, + is the preferred way of configuring a Camel-based application running on Spring-Boot. + +The POM of a end user application should include both BOMs, as in the following example: + +[source,xml] +.pom.xml +---- +<?xml version="1.0" encoding="UTF-8"?> +<project> + ... + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring-boot-version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot-dependencies</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <!-- Include all needed camel-xxx-starter modules --> + </dependencies> + + ... + +</project> +---- + +The `camel-spring-boot-dependencies` BOM includes Camel modules +and all transitive dependencies that have no conflicts with the spring-boot BOM. \ No newline at end of file
