You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ol...@apache.org on 2012/12/08 02:05:08 UTC

[3/5] git commit: move some dependencies version to dependencyMngt in top pom

move some dependencies version to dependencyMngt in top pom


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

Branch: refs/heads/master
Commit: a2c1f8d8025820914eb642cf3253b799d5f82dd2
Parents: a8329b1
Author: olivier lamy <ol...@apache.org>
Authored: Sat Dec 8 01:41:17 2012 +0100
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Dec 8 01:41:17 2012 +0100

----------------------------------------------------------------------
 pom.xml                                      |   20 ++++++++++++++++++--
 recipes/rabbitmq-consumer-group/pom.xml      |    3 ---
 recipes/rsync-replicated-file-system/pom.xml |    4 ----
 3 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/a2c1f8d8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6cc26fb..abe48e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,11 +112,11 @@ under the License.
     <maven-scm-provider-svnjava.version>2.0.5</maven-scm-provider-svnjava.version>
     <svnkit.version>1.7.5-v1</svnkit.version>
 
-    <helix.siteFilePath>${user.home}/helix-site-deploy</helix.siteFilePath>
+    <helix.siteFilePath>${user.home}/helix-site/helix-site-deploy</helix.siteFilePath>
     <!-- you can use javasvn too -->
     <svnImpl>svn</svnImpl>
     <helix.siteUrlDeployment>file://${helix.siteFilePath}</helix.siteUrlDeployment>
-    <helix.scmPubCheckoutDirectory>${user.home}/helix-site-content</helix.scmPubCheckoutDirectory>
+    <helix.scmPubCheckoutDirectory>${user.home}/helix-site/helix-site-content</helix.scmPubCheckoutDirectory>
     <scmSkipDeletedFiles>false</scmSkipDeletedFiles>
     <!-- fix issue with current apache parent pom -->
     <arguments></arguments>
@@ -143,6 +143,17 @@ under the License.
         <artifactId>helix-core</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.15</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.11</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -167,6 +178,11 @@ under the License.
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>appassembler-maven-plugin</artifactId>
           <version>1.1.1</version>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/a2c1f8d8/recipes/rabbitmq-consumer-group/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/rabbitmq-consumer-group/pom.xml b/recipes/rabbitmq-consumer-group/pom.xml
index 2643bea..ad04e62 100644
--- a/recipes/rabbitmq-consumer-group/pom.xml
+++ b/recipes/rabbitmq-consumer-group/pom.xml
@@ -30,14 +30,12 @@ under the License.
 
   <artifactId>rabbitmq-consumer-group</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
   <name>Helix :: Recipes :: Rabbitmq Consumer Group</name>
 
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -53,7 +51,6 @@ under the License.
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.15</version>
       <exclusions>
         <exclusion>
           <groupId>javax.mail</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/a2c1f8d8/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 3e13818..165b21d 100644
--- a/recipes/rsync-replicated-file-system/pom.xml
+++ b/recipes/rsync-replicated-file-system/pom.xml
@@ -36,7 +36,6 @@ under the License.
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -47,7 +46,6 @@ under the License.
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.15</version>
       <exclusions>
         <exclusion>
           <groupId>javax.mail</groupId>
@@ -84,7 +82,6 @@ under the License.
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>appassembler-maven-plugin</artifactId>
-          <version>1.1.1</version>
           <configuration>
             <!-- Set the target configuration directory to be used in the bin scripts -->
             <!-- <configurationDirectory>conf</configurationDirectory> -->
@@ -115,7 +112,6 @@ under the License.
       </plugins>
     </pluginManagement>
     <plugins>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>