From c2b3404ab375b616b522d5bdecf04fec43e90638 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Thu, 19 Jun 2025 00:20:26 +0100 Subject: [PATCH 1/3] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b36818f..57699e8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ convertapi jar - 2.13 + 2.14-SNAPSHOT ConvertAPI Java Client The ConvertAPI helps to convert various file formats. @@ -48,7 +48,7 @@ scm:git:git://github.com/ConvertAPI/convertapi-java.git scm:git:git@github.com:ConvertAPI/convertapi-java.git https://github.com/ConvertAPI/convertapi-java - v2.13 + HEAD From 2f833ec17346248363d7368bb2754c939e0efaf4 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Thu, 19 Jun 2025 00:23:50 +0100 Subject: [PATCH 2/3] Bump version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fffa0eb..b9c465d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Add the following dependency to your pom.xml: com.convertapi.client convertapi - 2.12 + 2.13 ``` From cc1a2f70f0966e6e867ee238c377abf8e0879344 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Thu, 19 Jun 2025 00:29:54 +0100 Subject: [PATCH 3/3] Upgrade maven dependency in release Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index add5885..9a301fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV GPG_PASSPHRASE= ARG GIT_EMAIL= ARG FULL_NAME= -ARG MAVEN_VERSION=3.9.6 +ARG MAVEN_VERSION=3.9.10 ARG USER_HOME_DIR="/root" ENV MAVEN_HOME /usr/share/maven ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2" @@ -22,7 +22,7 @@ COPY maven-release.sh /maven-release.sh # Install Maven, Git and gpg RUN apk add --no-cache curl tar bash git gnupg openssh RUN mkdir -p /usr/share/maven && \ - curl -fsSL http://apache.osuosl.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar -xzC /usr/share/maven --strip-components=1 && \ + curl -fsSL https://downloads.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar -xzC /usr/share/maven --strip-components=1 && \ ln -s /usr/share/maven/bin/mvn /usr/bin/mvn RUN git config --global user.email ${GIT_EMAIL} && \ git config --global user.name ${FULL_NAME}