From c00e02550a1ca93646bfb5d8d25990d184f4a319 Mon Sep 17 00:00:00 2001 From: pendzjo Date: Fri, 4 Jan 2019 16:34:28 -0500 Subject: [PATCH] Update to maven 3.6.0 --- docker/linux/Dockerfile | 2 +- docker/shared/install.maven.sh | 6 +++--- docker/win32/install.maven.ps1 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index 16100e7fc..223abe5f7 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -23,7 +23,7 @@ RUN ./install.jdk.sh COPY ./shared/install.maven.sh /temp/docker/shared RUN ./install.maven.sh -ENV PATH "$PATH:/opt/apache-maven-3.5.0/bin" +ENV PATH "$PATH:/opt/apache-maven-3.6.0/bin" COPY ./shared/install.cmake.sh /temp/docker/shared RUN ./install.cmake.sh diff --git a/docker/shared/install.maven.sh b/docker/shared/install.maven.sh index d3758da2d..fda58d880 100755 --- a/docker/shared/install.maven.sh +++ b/docker/shared/install.maven.sh @@ -1,6 +1,6 @@ echo "Preparing Maven..." -curl http://www-eu.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz -O +curl http://www-eu.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz -O mkdir -p /opt -tar xzvf apache-maven-3.5.0-bin.tar.gz -C /opt/ -chmod -R 777 /opt/apache-maven-3.5.0 +tar xzvf apache-maven-3.6.0-bin.tar.gz -C /opt/ +chmod -R 777 /opt/apache-maven-3.6.0 diff --git a/docker/win32/install.maven.ps1 b/docker/win32/install.maven.ps1 index 289b7143b..187ad8f60 100644 --- a/docker/win32/install.maven.ps1 +++ b/docker/win32/install.maven.ps1 @@ -1,13 +1,13 @@ Write-Host 'Downloading ...'; C:/j2v8/docker/win32/wget.ps1 ` - http://www-eu.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip ` + http://www-eu.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.zip ` C:\maven.zip Write-Host 'Installing Maven ...'; C:/j2v8/docker/win32/unzip.ps1 "C:/maven.zip" "C:/" -$env:PATH = 'C:\apache-maven-3.5.0\bin;'+$env:PATH; +$env:PATH = 'C:\apache-maven-3.6.0\bin;'+$env:PATH; [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); Write-Host 'Verifying install ...';