Return-Path: <commits-return-30275-archive-asf-public=cust-asf.ponee.io@hive.apache.org>
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 ED182200D31
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sat,  4 Nov 2017 20:58:18 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id EB9DA160BE9; Sat,  4 Nov 2017 19:58:18 +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 3CAE01609EE
	for <archive-asf-public@cust-asf.ponee.io>; Sat,  4 Nov 2017 20:58:18 +0100 (CET)
Received: (qmail 88117 invoked by uid 500); 4 Nov 2017 19:58:17 -0000
Mailing-List: contact commits-help@hive.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hive.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hive.apache.org>
List-Post: <mailto:commits@hive.apache.org>
List-Id: <commits.hive.apache.org>
Reply-To: hive-dev@hive.apache.org
Delivered-To: mailing list commits@hive.apache.org
Received: (qmail 88106 invoked by uid 99); 4 Nov 2017 19:58:17 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Nov 2017 19:58:17 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 79D85DFC27; Sat,  4 Nov 2017 19:58:14 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: hashutosh@apache.org
To: commits@hive.apache.org
Message-Id: <e829ba505b424323927ac51595158db6@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hive git commit: HIVE-17933 : make antlr output directory to use a
 top-level sourceset (Zoltan Haindrich via Alan Gates)
Date: Sat,  4 Nov 2017 19:58:14 +0000 (UTC)
archived-at: Sat, 04 Nov 2017 19:58:19 -0000

Repository: hive
Updated Branches:
  refs/heads/master 0b4a04b93 -> 806bd14de


HIVE-17933 : make antlr output directory to use a top-level sourceset (Zoltan Haindrich via Alan Gates)

Signed-off-by: Ashutosh Chauhan <hashutosh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/806bd14d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/806bd14d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/806bd14d

Branch: refs/heads/master
Commit: 806bd14de688ccf25cc9092cb546ee799570ff5d
Parents: 0b4a04b
Author: Zoltan Haindrich <kirk@rxd.hu>
Authored: Sat Nov 4 12:55:33 2017 -0700
Committer: Ashutosh Chauhan <hashutosh@apache.org>
Committed: Sat Nov 4 12:55:33 2017 -0700

----------------------------------------------------------------------
 .gitignore                                             | 2 +-
 standalone-metastore/pom.xml                           | 3 ++-
 standalone-metastore/src/main/resources/saveVersion.sh | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/806bd14d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index d56f31f..eb7235c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,4 @@ conf/hive-default.xml.template
 itests/hive-blobstore/src/test/resources/blobstore-conf.xml
 .DS_Store
 patchprocess
-standalone-metastore/src/gen/org/apache/hadoop/hive/metastore/annotation/package-info.java
+standalone-metastore/src/gen/version

http://git-wip-us.apache.org/repos/asf/hive/blob/806bd14d/standalone-metastore/pom.xml
----------------------------------------------------------------------
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index a2a34a5..924286f 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -494,7 +494,7 @@
               <sources>
                 <source>src/gen/thrift/gen-javabean</source>
                 <source>${project.build.directory}/generated-sources</source>
-                <source>src/gen/org</source>
+                <source>src/gen/version</source>
               </sources>
             </configuration>
           </execution>
@@ -530,6 +530,7 @@
           </execution>
         </executions>
         <configuration>
+          <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
           <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         </configuration>
       </plugin>

http://git-wip-us.apache.org/repos/asf/hive/blob/806bd14d/standalone-metastore/src/main/resources/saveVersion.sh
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/resources/saveVersion.sh b/standalone-metastore/src/main/resources/saveVersion.sh
index c9bde68..0d1a463 100755
--- a/standalone-metastore/src/main/resources/saveVersion.sh
+++ b/standalone-metastore/src/main/resources/saveVersion.sh
@@ -65,7 +65,7 @@ fi
 
 srcChecksum=`find ../ -name '*.java' | grep -v generated-sources | LC_ALL=C sort | xargs $md5 | $md5 | cut -d ' ' -f 1`
 
-mkdir -p $src_dir/gen/org/apache/hadoop/hive/metastore/annotation
+mkdir -p $src_dir/gen/version/org/apache/hadoop/hive/metastore/annotation
 
 # In Windows, all the following string ends with \r, need to get rid of them
 branch=`echo $branch | tr -d '\r'`
@@ -79,7 +79,7 @@ cat << EOF | \
       -e "s/USER/$user/" -e "s/DATE/$date/" \
       -e "s|URL|$url|" -e "s/REV/$revision/" \
       -e "s|BRANCH|$branch|" -e "s/SRCCHECKSUM/$srcChecksum/" \
-      > $src_dir/gen/org/apache/hadoop/hive/metastore/annotation/package-info.java
+      > $src_dir/gen/version/org/apache/hadoop/hive/metastore/annotation/package-info.java
 /*
  * Generated by saveVersion.sh
  */