brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreatu...@apache.org
Subject [04/10] git commit: Fix interior version conflicts - qpid
Date Wed, 09 Jul 2014 09:53:49 GMT
Fix interior version conflicts - qpid

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

Branch: refs/heads/master
Commit: a513d8e127c24107afeb7a962daafb9b4f9fd955
Parents: 9b1cbb6
Author: Richard Downer <richard@apache.org>
Authored: Mon Jul 7 15:04:36 2014 +0100
Committer: Richard Downer <richard@apache.org>
Committed: Mon Jul 7 15:10:19 2014 +0100

----------------------------------------------------------------------
 examples/simple-messaging-pubsub/pom.xml | 4 ++--
 pom.xml                                  | 1 +
 software/messaging/pom.xml               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a513d8e1/examples/simple-messaging-pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml
index be09484..fe3b158 100644
--- a/examples/simple-messaging-pubsub/pom.xml
+++ b/examples/simple-messaging-pubsub/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.qpid</groupId>
             <artifactId>qpid-client</artifactId>
-            <version>0.14</version>
+            <version>${qpid.version}</version>
         </dependency>
     </dependencies>
 
@@ -58,7 +58,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.qpid</groupId>
                                     <artifactId>qpid-bdbstore</artifactId>
-                                    <version>0.14</version>
+                                    <version>${qpid.version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>com.sleepycat</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a513d8e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 27c2228..ba0e5de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,7 @@
         <hazelcast.version>3.0</hazelcast.version>
         <commons-lang3.version>3.1</commons-lang3.version>
         <commons-compress.version>1.4</commons-compress.version>
+        <qpid.version>0.20</qpid.version>
 
         <includedTestGroups />
         <excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a513d8e1/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 49d444b..72b2774 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.qpid</groupId>
             <artifactId>qpid-client</artifactId>
-            <version>0.20</version>
+            <version>${qpid.version}</version>
             <scope>test</scope>
         </dependency>
 


Mime
View raw message