hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nspiegelb...@apache.org
Subject svn commit: r1176147 - in /hbase/branches/0.89: pom.xml src/saveVersion.sh
Date Tue, 27 Sep 2011 01:07:23 GMT
Author: nspiegelberg
Date: Tue Sep 27 01:07:22 2011
New Revision: 1176147

URL: http://svn.apache.org/viewvc?rev=1176147&view=rev
Log:
changes related to move from hbase-0.20 to 0.21 (trunk)

Summary:
* added setup/copy-hdfs-jars-to-maven.sh to install our internal HDFS jar to
maven local repo so that HBase builds can see it.

* updated pom.xml to pick up our internal HDFS jars

* updated install-hbase.sh scripts to work with trunk

* Fix for an error in saveVersion.sh (this was happening because our path
contained a ".").

I will update the wiki with build/install instructions shortly.

Test Plan:
* ran cluster tests using HBaseTest
* running unit tests using "mvn test". (Our manual mode tests in "manual" are
getting picked up by org/apache/hadoop/hbase/manual are also getting picked up
by mvn. So these tests are failing. Will separately work on suppressing those).

DiffCamp Revision: 116547
Reviewed By: nspiegelberg
CC: nspiegelberg, kannan, hbase@lists
Revert Plan:
OK

Modified:
    hbase/branches/0.89/pom.xml
    hbase/branches/0.89/src/saveVersion.sh

Modified: hbase/branches/0.89/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/pom.xml?rev=1176147&r1=1176146&r2=1176147&view=diff
==============================================================================
--- hbase/branches/0.89/pom.xml (original)
+++ hbase/branches/0.89/pom.xml Tue Sep 27 01:07:22 2011
@@ -125,6 +125,18 @@
   </developers>
 
   <repositories>
+     <!-- temporary: should replace jgray.la with our internal mirror once that's setup
-->
+     <repository>
+      <id>jgray.la</id>
+      <name>jgray mirror</name>
+      <url>http://jgray.la/maven/repository/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
     <repository>
       <id>ibiblio.org</id>
       <name>ibiblio mirror</name>
@@ -396,7 +408,7 @@
     <compileSource>1.6</compileSource>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <hadoop.version>0.20.2-with-200-826</hadoop.version>
+    <hadoop.version>0.20.1-dev</hadoop.version>
 
     <commons-cli.version>1.2</commons-cli.version>
     <commons-logging.version>1.1.1</commons-logging.version>

Modified: hbase/branches/0.89/src/saveVersion.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/saveVersion.sh?rev=1176147&r1=1176146&r2=1176147&view=diff
==============================================================================
--- hbase/branches/0.89/src/saveVersion.sh (original)
+++ hbase/branches/0.89/src/saveVersion.sh Tue Sep 27 01:07:22 2011
@@ -31,30 +31,24 @@ cwd=`pwd`
 if [ -d .svn ]; then
   revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
   url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
-  # Get canonical branch (branches/X, tags/X, or trunk)
-  branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \
-                             -e 's,.*\(tags/.*\)$,\1,p' \
-                             -e 's,.*trunk$,trunk,p'`
 elif [ -d ../.git ]; then
   revision=`git log -1 --pretty=format:"%H"`
   hostname=`hostname`
-  branch=`git branch | sed -n -e 's/^* //p'`
   url="git://${hostname}${cwd}"
 else
   revision="Unknown"
-  branch="Unknown"
   url="file://$cwd"
 fi
+
 mkdir -p $outputDirectory/org/apache/hadoop/hbase
 cat << EOF | \
   sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
       -e "s|URL|$url|" -e "s/REV/$revision/" \
-      -e "s|BRANCH|$branch|" \
       > $outputDirectory/org/apache/hadoop/hbase/package-info.java
 /*
  * Generated by src/saveVersion.sh
  */
-@VersionAnnotation(version="VERSION", revision="REV", 
+@VersionAnnotation(version="VERSION", revision="REV",
                          user="USER", date="DATE", url="URL")
 package org.apache.hadoop.hbase;
 EOF



Mime
View raw message