You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/11/08 20:28:05 UTC

[1/2] git commit: [HELIX-295] Remove xstream dependency

Updated Branches:
  refs/heads/master ba2521406 -> 0bbd04548


[HELIX-295] Remove xstream dependency


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

Branch: refs/heads/master
Commit: 2f1f1476515e33803c0efc54640712605c8f8adf
Parents: ba25214
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Fri Nov 8 09:51:17 2013 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Fri Nov 8 11:18:58 2013 -0800

----------------------------------------------------------------------
 helix-admin-webapp/pom.xml | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/2f1f1476/helix-admin-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml
index 4bda29f..a6266ec 100644
--- a/helix-admin-webapp/pom.xml
+++ b/helix-admin-webapp/pom.xml
@@ -51,11 +51,6 @@ under the License.
       <artifactId>org.restlet</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.3.1</version>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
       <version>1.8.5</version>


[2/2] git commit: Revert "[HELIX-291] Update master POM files to say current version is 0.7.0"

Posted by ka...@apache.org.
Revert "[HELIX-291] Update master POM files to say current version is 0.7.0"

This reverts commit ba252140695edfc393c95dad98b633f6b27ebc76.


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

Branch: refs/heads/master
Commit: 0bbd04548ec746baec3ed26a3e8826e68364fa87
Parents: 2f1f147
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Fri Nov 8 11:27:29 2013 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Fri Nov 8 11:27:29 2013 -0800

----------------------------------------------------------------------
 helix-admin-webapp/pom.xml                   | 2 +-
 helix-agent/pom.xml                          | 2 +-
 helix-core/pom.xml                           | 2 +-
 helix-examples/pom.xml                       | 2 +-
 pom.xml                                      | 2 +-
 recipes/distributed-lock-manager/pom.xml     | 2 +-
 recipes/pom.xml                              | 2 +-
 recipes/rabbitmq-consumer-group/pom.xml      | 2 +-
 recipes/rsync-replicated-file-system/pom.xml | 2 +-
 recipes/service-discovery/pom.xml            | 2 +-
 recipes/task-execution/pom.xml               | 2 +-
 recipes/user-defined-rebalancer/pom.xml      | 2 +-
 site-releases/0.6.1-incubating/pom.xml       | 2 +-
 site-releases/pom.xml                        | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/helix-admin-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml
index a6266ec..bd1deda 100644
--- a/helix-admin-webapp/pom.xml
+++ b/helix-admin-webapp/pom.xml
@@ -21,7 +21,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>helix</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/helix-agent/pom.xml
----------------------------------------------------------------------
diff --git a/helix-agent/pom.xml b/helix-agent/pom.xml
index e2d38d9..73dd5fc 100644
--- a/helix-agent/pom.xml
+++ b/helix-agent/pom.xml
@@ -22,7 +22,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>helix</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
   <artifactId>helix-agent</artifactId>
   <packaging>bundle</packaging>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/helix-core/pom.xml
----------------------------------------------------------------------
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 24391c1..12d3c9f 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -21,7 +21,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>helix</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/helix-examples/pom.xml
----------------------------------------------------------------------
diff --git a/helix-examples/pom.xml b/helix-examples/pom.xml
index 3a9b574..fca2d97 100644
--- a/helix-examples/pom.xml
+++ b/helix-examples/pom.xml
@@ -21,7 +21,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>helix</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 16ded25..9abf7fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
   <groupId>org.apache.helix</groupId>
   <artifactId>helix</artifactId>
-  <version>0.7.0-incubating-SNAPSHOT</version>
+  <version>0.6.2-incubating-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Helix</name>
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/recipes/distributed-lock-manager/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/distributed-lock-manager/pom.xml b/recipes/distributed-lock-manager/pom.xml
index cb4fe7d..0b5d1e4 100644
--- a/recipes/distributed-lock-manager/pom.xml
+++ b/recipes/distributed-lock-manager/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix.recipes</groupId>
     <artifactId>recipes</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>distributed-lock-manager</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/recipes/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/pom.xml b/recipes/pom.xml
index 574cff5..3667650 100644
--- a/recipes/pom.xml
+++ b/recipes/pom.xml
@@ -22,7 +22,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>helix</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.helix.recipes</groupId>
   <artifactId>recipes</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/recipes/rabbitmq-consumer-group/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/rabbitmq-consumer-group/pom.xml b/recipes/rabbitmq-consumer-group/pom.xml
index 7ff7be3..111c3ca 100644
--- a/recipes/rabbitmq-consumer-group/pom.xml
+++ b/recipes/rabbitmq-consumer-group/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix.recipes</groupId>
     <artifactId>recipes</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>rabbitmq-consumer-group</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/recipes/rsync-replicated-file-system/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/rsync-replicated-file-system/pom.xml b/recipes/rsync-replicated-file-system/pom.xml
index 304113b..3e7e08b 100644
--- a/recipes/rsync-replicated-file-system/pom.xml
+++ b/recipes/rsync-replicated-file-system/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix.recipes</groupId>
     <artifactId>recipes</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>rsync-replicated-file-system</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/recipes/service-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/service-discovery/pom.xml b/recipes/service-discovery/pom.xml
index d9e2742..e1c45e8 100644
--- a/recipes/service-discovery/pom.xml
+++ b/recipes/service-discovery/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix.recipes</groupId>
     <artifactId>recipes</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>service-discovery</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/recipes/task-execution/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/task-execution/pom.xml b/recipes/task-execution/pom.xml
index 1ec08fd..8f8683c 100644
--- a/recipes/task-execution/pom.xml
+++ b/recipes/task-execution/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix.recipes</groupId>
     <artifactId>recipes</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>task-execution</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/recipes/user-defined-rebalancer/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/user-defined-rebalancer/pom.xml b/recipes/user-defined-rebalancer/pom.xml
index 8b99fb6..ebd972c 100644
--- a/recipes/user-defined-rebalancer/pom.xml
+++ b/recipes/user-defined-rebalancer/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix.recipes</groupId>
     <artifactId>recipes</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>user-defined-rebalancer</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/site-releases/0.6.1-incubating/pom.xml
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/pom.xml b/site-releases/0.6.1-incubating/pom.xml
index 04ddc9f..2b4f7f5 100644
--- a/site-releases/0.6.1-incubating/pom.xml
+++ b/site-releases/0.6.1-incubating/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>site-releases</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>0.6.1-incubating-site</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0bbd0454/site-releases/pom.xml
----------------------------------------------------------------------
diff --git a/site-releases/pom.xml b/site-releases/pom.xml
index bb3417a..13b86be 100644
--- a/site-releases/pom.xml
+++ b/site-releases/pom.xml
@@ -21,7 +21,7 @@ under the License.
   <parent>
     <groupId>org.apache.helix</groupId>
     <artifactId>helix</artifactId>
-    <version>0.7.0-incubating-SNAPSHOT</version>
+    <version>0.6.2-incubating-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>