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 0DEDE200BBA for ; Sat, 5 Nov 2016 21:56:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0C78E160AEF; Sat, 5 Nov 2016 20:56:51 +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 50E1D160AE9 for ; Sat, 5 Nov 2016 21:56:50 +0100 (CET) Received: (qmail 70715 invoked by uid 500); 5 Nov 2016 20:56:49 -0000 Mailing-List: contact commits-help@avro.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@avro.apache.org Delivered-To: mailing list commits@avro.apache.org Received: (qmail 70706 invoked by uid 99); 5 Nov 2016 20:56:49 -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, 05 Nov 2016 20:56:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2DA2FE040E; Sat, 5 Nov 2016 20:56:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blue@apache.org To: commits@avro.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: avro git commit: AVRO-1897: Fix build issues due to VERSION.txt newline, avro-tools. Contributed by Suraj Acharya. Date: Sat, 5 Nov 2016 20:56:49 +0000 (UTC) archived-at: Sat, 05 Nov 2016 20:56:51 -0000 Repository: avro Updated Branches: refs/heads/master ecc2adb31 -> 23de4d013 AVRO-1897: Fix build issues due to VERSION.txt newline, avro-tools. Contributed by Suraj Acharya. Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/23de4d01 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/23de4d01 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/23de4d01 Branch: refs/heads/master Commit: 23de4d0133f04fd9d33b54a7c304f92b6802049e Parents: ecc2adb Author: Ryan Blue Authored: Sat Nov 5 13:54:44 2016 -0700 Committer: Ryan Blue Committed: Sat Nov 5 13:56:40 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ build.sh | 3 ++- lang/c++/CMakeLists.txt | 1 + lang/perl/Makefile.PL | 1 + lang/py/build.xml | 6 +++++- 5 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/23de4d01/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b05a138..8affdc8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -37,6 +37,9 @@ Trunk (not yet released) AVRO-1907: Java: Add debug logging for invalid logical types. (Gabor Szadovszky via blue) + AVRO-1897: Fix build issues due to VERSION.txt newline, avro-tools. + (Suraj Acharya via blue) + BUG FIXES AVRO-1741: Python3: Fix error when codec is not in the header. http://git-wip-us.apache.org/repos/asf/avro/blob/23de4d01/build.sh ---------------------------------------------------------------------- diff --git a/build.sh b/build.sh index 67f11a4..14f3149 100755 --- a/build.sh +++ b/build.sh @@ -40,6 +40,7 @@ do test) # run lang-specific tests (cd lang/java; ./build.sh test) + (cd lang/java; ./build.sh test; mvn install -pl tools -am -DskipTests) (cd lang/py; ./build.sh test) (cd lang/py3; ./build.sh test) (cd lang/c; ./build.sh test) @@ -105,7 +106,7 @@ do # build lang-specific artifacts - (cd lang/java;./build.sh dist) + (cd lang/java;./build.sh dist; mvn install -pl tools -am -DskipTests) (cd lang/java/trevni/doc; mvn site) (mvn -N -P copy-artifacts antrun:run) http://git-wip-us.apache.org/repos/asf/avro/blob/23de4d01/lang/c++/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt index 9927ca7..e8efe86 100644 --- a/lang/c++/CMakeLists.txt +++ b/lang/c++/CMakeLists.txt @@ -31,6 +31,7 @@ else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt) AVRO_VERSION) endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt) +string(REPLACE "\n" "" AVRO_VERSION ${AVRO_VERSION}) set (AVRO_VERSION_MAJOR ${AVRO_VERSION}) set (AVRO_VERSION_MINOR "0") http://git-wip-us.apache.org/repos/asf/avro/blob/23de4d01/lang/perl/Makefile.PL ---------------------------------------------------------------------- diff --git a/lang/perl/Makefile.PL b/lang/perl/Makefile.PL index 33c61b3..0bb2a7c 100644 --- a/lang/perl/Makefile.PL +++ b/lang/perl/Makefile.PL @@ -19,6 +19,7 @@ use Config; use inc::Module::Install; my $version = `cat ../../share/VERSION.txt`; +chomp $version; license 'apache'; version $version; http://git-wip-us.apache.org/repos/asf/avro/blob/23de4d01/lang/py/build.xml ---------------------------------------------------------------------- diff --git a/lang/py/build.xml b/lang/py/build.xml index 5ef5214..0a549fd 100644 --- a/lang/py/build.xml +++ b/lang/py/build.xml @@ -40,7 +40,11 @@ - + + + + +