Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 90E2F200BFE for ; Mon, 16 Jan 2017 12:45:32 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8F6E4160B30; Mon, 16 Jan 2017 11:45:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D9E0A160B22 for ; Mon, 16 Jan 2017 12:45:31 +0100 (CET) Received: (qmail 12786 invoked by uid 500); 16 Jan 2017 11:45:30 -0000 Mailing-List: contact dev-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list dev@zookeeper.apache.org Received: (qmail 12774 invoked by uid 99); 16 Jan 2017 11:45:30 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jan 2017 11:45:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 539561A0676 for ; Mon, 16 Jan 2017 11:45:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.998 X-Spam-Level: X-Spam-Status: No, score=-1.998 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id evtV8KZPvHow for ; Mon, 16 Jan 2017 11:45:29 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id D8EAE5FB46 for ; Mon, 16 Jan 2017 11:45:28 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 03A21E587C for ; Mon, 16 Jan 2017 11:45:28 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id 7D96825286 for ; Mon, 16 Jan 2017 11:45:26 +0000 (UTC) Date: Mon, 16 Jan 2017 11:45:26 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: dev@zookeeper.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (ZOOKEEPER-2573) Modify Info.REVISION to adapt git repo MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 archived-at: Mon, 16 Jan 2017 11:45:32 -0000 [ https://issues.apache.org/jira/browse/ZOOKEEPER-2573?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15823820#comment-15823820 ] ASF GitHub Bot commented on ZOOKEEPER-2573: ------------------------------------------- Github user rakeshadr commented on a diff in the pull request: https://github.com/apache/zookeeper/pull/137#discussion_r96212537 --- Diff: src/lastRevision.sh --- @@ -16,6 +16,6 @@ # Find the current revision, store it in a file FILE=$1 -LASTREV=`svn info | grep '^Revision' | sed -e 's/Revision: *//'` +LASTREV=`git rev-parse HEAD | cut -c1-8` --- End diff -- Thanks @eribeiro for the patch. Any specific reason to use only the first 8 characters of the git SHA-1. Will this be helpful in analyzing whether a particular fix included in the release? How about keeping the complete SHA-1? > Modify Info.REVISION to adapt git repo > -------------------------------------- > > Key: ZOOKEEPER-2573 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-2573 > Project: ZooKeeper > Issue Type: Bug > Components: build, server > Affects Versions: 3.4.9, 3.5.2 > Reporter: Arshad Mohammad > Assignee: Edward Ribeiro > Fix For: 3.4.10, 3.5.3, 3.6.0 > > > Modify {{org.apache.zookeeper.version.Info.REVISION}} to store git repo revision > Currently {{org.apache.zookeeper.version.Info.REVISION}} stores the svn repo revision which is of type int > But after migrating to git repo the git repo's revision(commit 63f5132716c08b3d8f18993bf98eb46eb42f80fb) can not be stored in this variable. > So either we should modify this variable to string to introduce new variable to store the git revision and leave the svn revision variable unchanged. > build.xml, and org.apache.zookeeper.version.util.VerGen also need to be modified. -- This message was sent by Atlassian JIRA (v6.3.4#6332)