incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/2] git commit: Fixing the pom file versions.
Date Sat, 28 Sep 2013 02:32:00 GMT
Updated Branches:
  refs/heads/apache-blur-0.2 6a9343389 -> 42a2d69f0


Fixing the pom file versions.


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

Branch: refs/heads/apache-blur-0.2
Commit: f176aacc44cd447149977236a344d9b21a86369d
Parents: 6a93433
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Fri Sep 27 22:26:43 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Fri Sep 27 22:26:43 2013 -0400

----------------------------------------------------------------------
 contrib/blur-console/blur-agent/pom.xml | 30 +++++-----------------------
 1 file changed, 5 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f176aacc/contrib/blur-console/blur-agent/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-console/blur-agent/pom.xml b/contrib/blur-console/blur-agent/pom.xml
index 21ea899..836056c 100644
--- a/contrib/blur-console/blur-agent/pom.xml
+++ b/contrib/blur-console/blur-agent/pom.xml
@@ -77,20 +77,12 @@ under the License.
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-thrift</artifactId>
-<<<<<<< HEAD
-			<version>0.2.0-incubating</version>
-=======
-			<version>0.3.0-incubating-SNAPSHOT</version>
->>>>>>> master
+			<version>0.2.1-incubating-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-util</artifactId>
-<<<<<<< HEAD
-			<version>0.2.0-incubating</version>
-=======
-			<version>0.3.0-incubating-SNAPSHOT</version>
->>>>>>> master
+			<version>0.2.1-incubating-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -136,21 +128,13 @@ under the License.
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-core</artifactId>
-<<<<<<< HEAD
-			<version>0.2.0-incubating</version>
-=======
-			<version>0.3.0-incubating-SNAPSHOT</version>
->>>>>>> master
+			<version>0.2.1-incubating-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-core</artifactId>
-<<<<<<< HEAD
-			<version>0.2.0-incubating</version>
-=======
-			<version>0.3.0-incubating-SNAPSHOT</version>
->>>>>>> master
+			<version>0.2.1-incubating-SNAPSHOT</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
@@ -163,11 +147,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-store</artifactId>
-<<<<<<< HEAD
-			<version>0.2.0-incubating</version>
-=======
-			<version>0.3.0-incubating-SNAPSHOT</version>
->>>>>>> master
+			<version>0.2.1-incubating-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>


Mime
View raw message