Repository: avro Updated Branches: refs/heads/branch-1.8 d9017ce76 -> 620b2807e
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/620b2807 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/620b2807 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/620b2807 Branch: refs/heads/branch-1.8 Commit: 620b2807eb2cee03baa146503454a1cb0054c7f0 Parents: d9017ce Author: Ryan Blue <[email protected]> Authored: Sat Nov 5 13:54:44 2016 -0700 Committer: Ryan Blue <[email protected]> Committed: Sat Nov 5 13:56:21 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/620b2807/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8985842..8953f9b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -37,6 +37,9 @@ Avro 1.8.2 (5 November 2016) 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/620b2807/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/620b2807/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/620b2807/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/620b2807/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 @@ <property name="ivy.jar" value="${basedir}/lib/ivy-${ivy.version}.jar"/> <!-- Load shared properties --> - <loadfile srcFile="${share.dir}/VERSION.txt" property="avro.version" /> + <loadfile srcFile="${share.dir}/VERSION.txt" property="avro.version"> + <filterchain> + <striplinebreaks/> + </filterchain> + </loadfile> <loadfile srcFile="${share.schema.dir}/org/apache/avro/ipc/HandshakeRequest.avsc" property="handshake.request.json"/> <loadfile srcFile="${share.schema.dir}/org/apache/avro/ipc/HandshakeResponse.avsc" property="handshake.response.json"/>
