From c41c91919823c489a08d5cce0df7663f397df5ae Mon Sep 17 00:00:00 2001 From: Cole Markham Date: Mon, 9 Dec 2019 14:48:10 -0600 Subject: [PATCH 1/3] Update maven to 3.6.3 --- images/linux/scripts/installers/java-tools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index c1c254745..2e96bde18 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -34,11 +34,11 @@ apt-fast install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven -curl -sL https://www-eu.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.zip -o maven.zip +curl -sL https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip unzip -d /usr/share maven.zip rm maven.zip -ln -s /usr/share/apache-maven-3.6.2/bin/mvn /usr/bin/mvn -echo "M2_HOME=/usr/share/apache-maven-3.6.2" | tee -a /etc/environment +ln -s /usr/share/apache-maven-3.6.3/bin/mvn /usr/bin/mvn +echo "M2_HOME=/usr/share/apache-maven-3.6.3" | tee -a /etc/environment # Install Gradle # This script downloads the latest HTML list of releases at https://gradle.org/releases/. From f7878458695424858a4f12a5515a4f29a9d8dacb Mon Sep 17 00:00:00 2001 From: Cole Markham Date: Mon, 9 Dec 2019 14:54:30 -0600 Subject: [PATCH 2/3] Update Ubuntu1804-README.md --- images/linux/Ubuntu1804-README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 43ad1a004..7329cecda 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -116,7 +116,7 @@ compiled using version 3.0.0.0 of the Cabal library ) - Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16) - Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019) - Gradle 5.6.2 -- Maven (Apache Maven 3.6.1 (d66c9c0b3152b2e69ee9bac180bb8fcc8e6af555; 2019-04-04T19:00:29Z)) +- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - kubectl (Client Version: v1.16.0) - helm (Client: v2.14.3+g0e7f3b6) - Leiningen (Leiningen 2.9.1 on Java 1.8.0_222 OpenJDK 64-Bit Server VM) From 15404a70567fa9742107760ccffe2e645a61557a Mon Sep 17 00:00:00 2001 From: Cole Markham Date: Thu, 12 Dec 2019 09:15:52 -0600 Subject: [PATCH 3/3] Remove change to readme --- images/linux/Ubuntu1804-README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 7329cecda..43ad1a004 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -116,7 +116,7 @@ compiled using version 3.0.0.0 of the Cabal library ) - Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16) - Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019) - Gradle 5.6.2 -- Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) +- Maven (Apache Maven 3.6.1 (d66c9c0b3152b2e69ee9bac180bb8fcc8e6af555; 2019-04-04T19:00:29Z)) - kubectl (Client Version: v1.16.0) - helm (Client: v2.14.3+g0e7f3b6) - Leiningen (Leiningen 2.9.1 on Java 1.8.0_222 OpenJDK 64-Bit Server VM)