Return-Path: X-Original-To: apmail-hive-dev-archive@www.apache.org Delivered-To: apmail-hive-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7DEB110666 for ; Tue, 22 Oct 2013 21:26:03 +0000 (UTC) Received: (qmail 81051 invoked by uid 500); 22 Oct 2013 21:25:59 -0000 Delivered-To: apmail-hive-dev-archive@hive.apache.org Received: (qmail 80960 invoked by uid 500); 22 Oct 2013 21:25:57 -0000 Mailing-List: contact dev-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hive.apache.org Delivered-To: mailing list dev@hive.apache.org Received: (qmail 80902 invoked by uid 500); 22 Oct 2013 21:25:51 -0000 Delivered-To: apmail-hadoop-hive-dev@hadoop.apache.org Received: (qmail 80886 invoked by uid 99); 22 Oct 2013 21:25:50 -0000 Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Oct 2013 21:25:50 +0000 Date: Tue, 22 Oct 2013 21:25:50 +0000 (UTC) From: "Brock Noland (JIRA)" To: hive-dev@hadoop.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (HIVE-5610) Merge maven branch into trunk MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/HIVE-5610?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13802286#comment-13802286 ] Brock Noland commented on HIVE-5610: ------------------------------------ @owen, thanks for looking. These issues are fixed in the patch up on HIVE-5566. > Merge maven branch into trunk > ----------------------------- > > Key: HIVE-5610 > URL: https://issues.apache.org/jira/browse/HIVE-5610 > Project: Hive > Issue Type: Sub-task > Reporter: Brock Noland > Assignee: Brock Noland > > With HIVE-5566 nearing completion we will be nearly ready to merge the maven branch to trunk. The following tasks will be done post-merge: > * HIVE-5611 - Add assembly (i.e.) tar creation to pom > * HIVE-5612 - Add ability to re-generate generated code stored in source control > The merge process will be as follows: > 1) svn merge ^/hive/branches/maven > 2) Commit result > 3) Modify the following line in maven-rollforward.sh: > {noformat} > mv $source $target > {noformat} > to > {noformat} > svn mv $source $target > {noformat} > 4) Execute maven-rollfward.sh > 5) Commit result > 6) Update trunk-mr1.properties and trunk-mr2.properties on the ptesting host, adding the following: > {noformat} > mavenEnvOpts = -Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128 > testCasePropertyName = test > buildTool = maven > unitTests.directories = ./ > {noformat} -- This message was sent by Atlassian JIRA (v6.1#6144)