You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2024/02/08 02:40:18 UTC

(arrow) branch main updated: GH-39992: [CI][Docs][Java] ubuntu-docs uses Maven version in .env (#39993)

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new c38b0f33f3 GH-39992: [CI][Docs][Java] ubuntu-docs uses Maven version in .env (#39993)
c38b0f33f3 is described below

commit c38b0f33f3361350dd1321a93b53716e64489a69
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Thu Feb 8 11:40:12 2024 +0900

    GH-39992: [CI][Docs][Java] ubuntu-docs uses Maven version in .env (#39993)
    
    ### Rationale for this change
    
    GH-39696 updated Maven version but `ubuntu-docs` haven't used it yet.
    
    ### What changes are included in this PR?
    
    Use `MAVEN` in `.env` in `ubuntu-docs`.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    No.
    * Closes: #39992
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 ci/docker/linux-apt-docs.dockerfile | 2 +-
 docker-compose.yml                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile
index c51600a1e5..3d102796b8 100644
--- a/ci/docker/linux-apt-docs.dockerfile
+++ b/ci/docker/linux-apt-docs.dockerfile
@@ -60,7 +60,7 @@ RUN apt-get update -y && \
 
 ENV JAVA_HOME=/usr/lib/jvm/java-${jdk}-openjdk-amd64
 
-ARG maven=3.5.4
+ARG maven=3.6.3
 COPY ci/scripts/util_download_apache.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/util_download_apache.sh \
     "maven/maven-3/${maven}/binaries/apache-maven-${maven}-bin.tar.gz" /opt
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a7223b576..a31fa0d9aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1740,6 +1740,7 @@ services:
       args:
         r: ${R}
         jdk: ${JDK}
+        maven: ${MAVEN}
         node: ${NODE}
         base: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-3
     environment: