Skip to content

Commit 6cb5e3f

Browse files
committed
Build Javadoc in docker-compose job
1 parent d9c3900 commit 6cb5e3f

File tree

5 files changed

+10
-35
lines changed

5 files changed

+10
-35
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ matrix:
206206
- if [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
207207
- docker-compose pull java-all-jdks
208208
script:
209-
- docker-compose run java-all-jdk
209+
- docker-compose run java-all-jdks
210210
- name: "Integration w/ OpenJDK 8, conda-forge toolchain"
211211
language: java
212212
os: linux

ci/docker_build_java.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,9 @@ popd
3131

3232
pushd $arrow_src/java
3333
mvn -B -DskipTests -Drat.skip=true install
34+
35+
if [ "$ARROW_JAVADOC" == "1" ]; then
36+
export MAVEN_OPTS="$MAVEN_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=warn"
37+
mvn -B site
38+
fi
3439
popd

ci/docker_build_java_all.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ set -e
2121
SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
2222

2323
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
24+
export ARROW_JAVADOC=1
2425
bash $SOURCE_DIR/docker_build_java.sh
2526

2627
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
28+
export ARROW_JAVADOC=0
2729
bash $SOURCE_DIR/docker_build_java.sh

ci/travis_script_javadoc.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

java/Dockerfile.all-jdks

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
3030
rsync \
3131
tzdata \
3232
openjdk-8-jdk \
33-
openjdk-11-jdk
34-
35-
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
33+
openjdk-11-jdk && \
34+
apt-get clean && rm -rf /var/lib/apt/lists/*
3635

3736
# Test all supported JDKs
3837
CMD ["arrow/ci/docker_build_java_all.sh"]

0 commit comments

Comments
 (0)