You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2017/02/21 13:42:07 UTC
arrow git commit: ARROW-570: Determine Java tools JAR location from
project metadata
Repository: arrow
Updated Branches:
refs/heads/master ef6b46557 -> 4598c1a36
ARROW-570: Determine Java tools JAR location from project metadata
Author: Uwe L. Korn <uw...@xhochy.com>
Closes #346 from xhochy/ARROW-570 and squashes the following commits:
32ece28 [Uwe L. Korn] Add missing )
f1071db [Uwe L. Korn] ARROW-570: Determine Java tools JAR location from project metadata
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/4598c1a3
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/4598c1a3
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/4598c1a3
Branch: refs/heads/master
Commit: 4598c1a36c20de1f4d12dee62c79a67197e8a603
Parents: ef6b465
Author: Uwe L. Korn <uw...@xhochy.com>
Authored: Tue Feb 21 14:41:54 2017 +0100
Committer: Uwe L. Korn <uw...@xhochy.com>
Committed: Tue Feb 21 14:41:54 2017 +0100
----------------------------------------------------------------------
ci/travis_script_integration.sh | 3 ---
integration/integration_test.py | 11 +++++++++--
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/4598c1a3/ci/travis_script_integration.sh
----------------------------------------------------------------------
diff --git a/ci/travis_script_integration.sh b/ci/travis_script_integration.sh
index 7bb1dc0..8ddd89b 100755
--- a/ci/travis_script_integration.sh
+++ b/ci/travis_script_integration.sh
@@ -26,9 +26,6 @@ popd
pushd $TRAVIS_BUILD_DIR/integration
-VERSION=0.1.1-SNAPSHOT
-export ARROW_JAVA_INTEGRATION_JAR=$JAVA_DIR/tools/target/arrow-tools-$VERSION-jar-with-dependencies.jar
-
export ARROW_CPP_EXE_PATH=$CPP_BUILD_DIR/debug
source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
http://git-wip-us.apache.org/repos/asf/arrow/blob/4598c1a3/integration/integration_test.py
----------------------------------------------------------------------
diff --git a/integration/integration_test.py b/integration/integration_test.py
index d5a066b..049436a 100644
--- a/integration/integration_test.py
+++ b/integration/integration_test.py
@@ -34,6 +34,12 @@ ARROW_HOME = os.path.abspath(__file__).rsplit("/", 2)[0]
# Control for flakiness
np.random.seed(12345)
+def load_version_from_pom():
+ import xml.etree.ElementTree as ET
+ tree = ET.parse(os.path.join(ARROW_HOME, 'java', 'pom.xml'))
+ version_tag = list(tree.getroot().findall('{http://maven.apache.org/POM/4.0.0}version'))[0]
+ return version_tag.text
+
def guid():
return uuid.uuid4().hex
@@ -638,11 +644,12 @@ class Tester(object):
class JavaTester(Tester):
+ _arrow_version = load_version_from_pom()
ARROW_TOOLS_JAR = os.environ.get(
'ARROW_JAVA_INTEGRATION_JAR',
os.path.join(ARROW_HOME,
- 'java/tools/target/arrow-tools-0.1.1-'
- 'SNAPSHOT-jar-with-dependencies.jar'))
+ 'java/tools/target/arrow-tools-{}-'
+ 'jar-with-dependencies.jar'.format(_arrow_version)))
name = 'Java'