camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nferr...@apache.org
Subject camel git commit: Forcing the correct reactor build order
Date Wed, 28 Sep 2016 14:39:40 GMT
Repository: camel
Updated Branches:
  refs/heads/master 39538986b -> d46de189d


Forcing the correct reactor build order


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

Branch: refs/heads/master
Commit: d46de189dea26f1345e824f4d7c47a3345c78709
Parents: 3953898
Author: Nicola Ferraro <ni.ferraro@gmail.com>
Authored: Wed Sep 28 16:38:53 2016 +0200
Committer: Nicola Ferraro <ni.ferraro@gmail.com>
Committed: Wed Sep 28 16:38:53 2016 +0200

----------------------------------------------------------------------
 .../camel-spring-boot-dependencies/pom.xml         | 17 ++++++++++++++++-
 .../src/main/resources/target-template-pom.xml     | 11 +++++++++++
 spring-boot-dm/camel-starter-parent/pom.xml        |  9 +++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d46de189/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 221440a..cf26120 100644
--- a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -162,7 +162,7 @@
       <dependency>
         <groupId>net.sf.saxon</groupId>
         <artifactId>Saxon-HE</artifactId>
-        <version>9.5.1-5</version>
+        <version>9.7.0-6</version>
       </dependency>
       <dependency>
         <groupId>ognl</groupId>
@@ -257,6 +257,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-asterisk</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-atmos</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -3112,4 +3117,14 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+  <!-- Force the reactor build order -->
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring-boot-generator-bom</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/d46de189/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml
b/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml
index 9956fa2..9ef2068 100644
--- a/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml
+++ b/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml
@@ -36,4 +36,15 @@
         </dependencies>
     </dependencyManagement>
 
+    <!-- Force the reactor build order -->
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring-boot-generator-bom</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/d46de189/spring-boot-dm/camel-starter-parent/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-starter-parent/pom.xml b/spring-boot-dm/camel-starter-parent/pom.xml
index 983a8f5..f84e32f 100644
--- a/spring-boot-dm/camel-starter-parent/pom.xml
+++ b/spring-boot-dm/camel-starter-parent/pom.xml
@@ -41,6 +41,15 @@
             <!--<version>${log4j2-version}</version>-->
         <!--</dependency>-->
 
+        <!-- Force the reactor build order -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring-boot-dependencies</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>


Mime
View raw message