File tree Expand file tree Collapse file tree 5 files changed +75
-31
lines changed Expand file tree Collapse file tree 5 files changed +75
-31
lines changed Original file line number Diff line number Diff line change @@ -199,32 +199,14 @@ matrix:
199199 - if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then docker-compose pull python-manylinux1; fi
200200 script :
201201 - if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then $TRAVIS_BUILD_DIR/ci/travis_script_manylinux.sh; fi
202- - name : " Java w/ OpenJDK 8"
203- language : java
204- os : linux
205- jdk : openjdk8
206- before_script :
207- - if [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
208- - $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
209- script :
210- - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
211- - $TRAVIS_BUILD_DIR/ci/travis_script_javadoc.sh
212- - name : " Java w/ OpenJDK 9"
213- language : java
214- os : linux
215- jdk : openjdk9
216- before_script :
217- - if [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
218- script :
219- - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
220- - name : " Java w/ OpenJDK 11"
221- language : java
202+ - name : " Java OpenJDK8 and OpenJDK11"
203+ language : cpp
222204 os : linux
223- jdk : openjdk11
224205 before_script :
225206 - if [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
207+ - docker-compose pull java-all-jdks
226208 script :
227- - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh
209+ - docker-compose run java-all-jdks
228210 - name : " Integration w/ OpenJDK 8, conda-forge toolchain"
229211 language : java
230212 os : linux
Original file line number Diff line number Diff line change @@ -25,10 +25,23 @@ mkdir -p /build/java
2525
2626arrow_src=/build/java/arrow
2727
28+ # Remove any pre-existing artifacts
29+ rm -rf $arrow_src
30+
2831pushd /arrow
29- rsync -a header java format integration $arrow_src
32+ rsync -a header java format integration $arrow_src
3033popd
3134
35+ JAVA_ARGS=
36+ if [ " $ARROW_JAVA_RUN_TESTS " != " 1" ]; then
37+ JAVA_ARGS=-DskipTests
38+ fi
39+
3240pushd $arrow_src /java
33- mvn -B -DskipTests -Drat.skip=true install
41+ mvn -B $JAVA_ARGS -Drat.skip=true install
42+
43+ if [ " $ARROW_JAVADOC " == " 1" ]; then
44+ export MAVEN_OPTS=" $MAVEN_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=warn"
45+ mvn -B site
46+ fi
3447popd
Original file line number Diff line number Diff line change 11#! /usr/bin/env bash
2-
32# Licensed to the Apache Software Foundation (ASF) under one
43# or more contributor license agreements. See the NOTICE file
54# distributed with this work for additional information
1918
2019set -e
2120
22- source $TRAVIS_BUILD_DIR /ci/travis_env_common.sh
21+ SOURCE_DIR= " $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
2322
24- JAVA_DIR= ${TRAVIS_BUILD_DIR} /java
23+ export ARROW_TEST_DATA=/arrow/testing/data
2524
26- pushd $JAVA_DIR
25+ export ARROW_JAVA_RUN_TESTS=1
2726
28- export MAVEN_OPTS=" $MAVEN_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=warn"
29- $TRAVIS_MVN -B site
27+ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
28+ export ARROW_JAVADOC=1
29+ bash $SOURCE_DIR /docker_build_java.sh
3030
31- popd
31+ export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
32+ export ARROW_JAVADOC=0
33+ bash $SOURCE_DIR /docker_build_java.sh
Original file line number Diff line number Diff line change @@ -292,6 +292,18 @@ services:
292292 - .:/arrow:ro # ensures that docker won't contaminate the host directory
293293 - maven-cache:/root/.m2:delegated
294294
295+ java-all-jdks :
296+ # Usage:
297+ # docker-compose build java-all-jdks
298+ # docker-compose run java-all-jdks
299+ image : ursalab/arrow-ci-java-all-jdks:latest
300+ build :
301+ context : .
302+ dockerfile : java/Dockerfile.all-jdks
303+ volumes :
304+ - .:/arrow:ro # ensures that docker won't contaminate the host directory
305+ - maven-cache:/root/.m2:delegated
306+
295307 js :
296308 image : arrow:js
297309 build :
Original file line number Diff line number Diff line change 1+ # Licensed to the Apache Software Foundation (ASF) under one
2+ # or more contributor license agreements. See the NOTICE file
3+ # distributed with this work for additional information
4+ # regarding copyright ownership. The ASF licenses this file
5+ # to you under the Apache License, Version 2.0 (the
6+ # "License"); you may not use this file except in compliance
7+ # with the License. You may obtain a copy of the License at
8+ #
9+ # http://www.apache.org/licenses/LICENSE-2.0
10+ #
11+ # Unless required by applicable law or agreed to in writing,
12+ # software distributed under the License is distributed on an
13+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+ # KIND, either express or implied. See the License for the
15+ # specific language governing permissions and limitations
16+ # under the License.
17+
18+ FROM ubuntu:18.04
19+
20+ # install build essentials
21+ RUN export DEBIAN_FRONTEND=noninteractive && \
22+ apt-get update -y -q && \
23+ apt-get install -y -q --no-install-recommends \
24+ wget \
25+ software-properties-common \
26+ ca-certificates \
27+ maven \
28+ rsync \
29+ tzdata \
30+ openjdk-8-jdk \
31+ openjdk-11-jdk && \
32+ apt-get clean && rm -rf /var/lib/apt/lists/*
33+
34+ # Test all supported JDKs
35+ CMD ["arrow/ci/docker_java_test_all.sh"]
You can’t perform that action at this time.
0 commit comments