camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: CAMEL-11769: Allow -starter to be compiled with Spring Boot 2
Date Mon, 11 Sep 2017 13:23:10 GMT
Repository: camel
Updated Branches:
  refs/heads/boot2 351a7501e -> 1ce30623f


CAMEL-11769: Allow -starter to be compiled with Spring Boot 2


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

Branch: refs/heads/boot2
Commit: 07763c4d71a5a824dea72faa05b52208af6c0009
Parents: 351a750
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Sep 11 15:12:55 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Sep 11 15:12:55 2017 +0200

----------------------------------------------------------------------
 .../camel-example-spring-boot-rest-jpa/pom.xml  |  3 +-
 .../spring-boot-dm/camel-starter-parent/pom.xml | 36 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/07763c4d/examples/camel-example-spring-boot-rest-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml
index 337bf06..57777ad 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -53,12 +53,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
+        <artifactId>camel-spring-boot-dependencies</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <!-- We need to align the Hibernate versions -->
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-entitymanager</artifactId>

http://git-wip-us.apache.org/repos/asf/camel/blob/07763c4d/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
index 1eaf84c..74eb462 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
@@ -33,6 +33,11 @@
   <packaging>pom</packaging>
   <name>Camel :: Platforms :: Spring-Boot :: Dependency Management :: Starter Parent</name>
 
+  <properties>
+    <spring-boot2-version>2.0.0.M3</spring-boot2-version>
+    <spring5-version>5.0.0.RC3</spring5-version>
+  </properties>
+
   <dependencies>
     <!-- Dependencies added for all starters -->
 
@@ -170,6 +175,37 @@
   </dependencyManagement>
 
   <profiles>
+
+    <!-- spring-boot2 experiment -->
+    <profile>
+      <id>spring-boot2</id>
+      <properties>
+        <spring-boot-version>${spring-boot2-version}</spring-boot-version>
+        <spring-version>${spring5-version}</spring-version>
+        <jackson2-version>2.9.1</jackson2-version>
+      </properties>
+       <repositories>
+        <repository>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/libs-milestone</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/libs-milestone</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+
     <profile>
       <id>nochecks</id>
       <activation>


Mime
View raw message