From 7c85cb34abf2e8b88062809756e19e3a053b9650 Mon Sep 17 00:00:00 2001 From: Linus Karlsson Date: Thu, 19 Sep 2024 10:26:01 +0200 Subject: [PATCH] Upgrade maven and gradle --- build/docker/alpine.Dockerfile | 4 ++-- build/docker/debian.Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile index 77a55043..dae8a7da 100644 --- a/build/docker/alpine.Dockerfile +++ b/build/docker/alpine.Dockerfile @@ -23,7 +23,7 @@ FROM cli AS scan CMD [ "debricked", "scan" ] FROM cli-base AS resolution -ENV MAVEN_VERSION 3.9.6 +ENV MAVEN_VERSION 3.9.9 ENV MAVEN_HOME /usr/lib/mvn ENV PATH $MAVEN_HOME/bin:$PATH RUN wget http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz && \ @@ -31,7 +31,7 @@ RUN wget http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap rm apache-maven-$MAVEN_VERSION-bin.tar.gz && \ mv apache-maven-$MAVEN_VERSION $MAVEN_HOME -ENV GRADLE_VERSION 8.7 +ENV GRADLE_VERSION 8.10.1 ENV GRADLE_HOME /usr/lib/gradle ENV PATH $GRADLE_HOME/gradle-$GRADLE_VERSION/bin:$PATH RUN wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip && \ diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index b88e8bca..87ba2cec 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -50,7 +50,7 @@ RUN apt -y update && apt -y upgrade && apt -y install curl gnupg unzip && \ RUN mkdir -p /etc/apt/keyrings -ENV MAVEN_VERSION 3.9.6 +ENV MAVEN_VERSION 3.9.9 ENV MAVEN_HOME /usr/lib/mvn ENV PATH $MAVEN_HOME/bin:$PATH RUN curl -fsSLO http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz && \ @@ -58,7 +58,7 @@ RUN curl -fsSLO http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/bina rm apache-maven-$MAVEN_VERSION-bin.tar.gz && \ mv apache-maven-$MAVEN_VERSION $MAVEN_HOME -ENV GRADLE_VERSION 8.7 +ENV GRADLE_VERSION 8.10.1 ENV GRADLE_HOME /usr/lib/gradle ENV PATH $GRADLE_HOME/gradle-$GRADLE_VERSION/bin:$PATH RUN curl -fsSLO https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip && \