brooklyn-commits mailing list archives

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

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

Branch: refs/heads/master
Commit: 342a00dd2e59cfbd5f3747bac623221ce27db156
Parents: d694486
Author: Richard Downer <richard@apache.org>
Authored: Mon Jul 7 15:13:11 2014 +0100
Committer: Richard Downer <richard@apache.org>
Committed: Mon Jul 7 15:13:11 2014 +0100

----------------------------------------------------------------------
 examples/webapps/hello-world-sql/pom.xml | 2 +-
 pom.xml                                  | 1 +
 software/nosql/pom.xml                   | 6 +-----
 3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/342a00dd/examples/webapps/hello-world-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-sql/pom.xml b/examples/webapps/hello-world-sql/pom.xml
index a77670b..2befd46 100644
--- a/examples/webapps/hello-world-sql/pom.xml
+++ b/examples/webapps/hello-world-sql/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-            <version>2.11.4</version>
+            <version>${mongodb.version}</version>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/342a00dd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ba0e5de..35d7bce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,7 @@
         <commons-lang3.version>3.1</commons-lang3.version>
         <commons-compress.version>1.4</commons-compress.version>
         <qpid.version>0.20</qpid.version>
+        <mongodb.version>2.11.4</mongodb.version>
 
         <includedTestGroups />
         <excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/342a00dd/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 4597d0c..8e8ed97 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -14,10 +14,6 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <mongo-java-driver.version>2.11.3</mongo-java-driver.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.brooklyn</groupId>
@@ -40,7 +36,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-            <version>${mongo-java-driver.version}</version>
+            <version>${mongodb.version}</version>
         </dependency>
 
         <!-- for redis testing -->


Mime
View raw message