From d4e8df68da66fb7bba769c3f11b47a5da3c382db Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Fri, 13 Sep 2024 00:14:17 +0100 Subject: [PATCH 01/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2c1eae4..97774e0 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Add the following dependency to your pom.xml: You can get your credentials at https://www.convertapi.com/a ```java -Config.setDefaultApiCredentials("your-api-secret"); +Config.setDefaultApiCredentials("your-api-credentials"); ``` ### File conversion @@ -117,7 +117,7 @@ public class SimpleConversion { ``` This is the bare-minimum to convert a file using the ConvertAPI client, but you can do a great deal more with the ConvertAPI Java library. -Take special note that you should replace `your-api-credentials` with the secret you obtained in item two of the pre-requisites. +Take special note that you should replace `your-api-credentials` with the credentials you obtained in item two of the pre-requisites. ### Issues & Comments Please leave all comments, bugs, requests, and issues on the Issues page. We'll respond to your request ASAP! From b4a846f9667b21d140c7dd6994cd03ef53e55583 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Fri, 13 Sep 2024 01:04:19 +0100 Subject: [PATCH 02/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd8e03c..4433ecf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ convertapi jar - 2.11-SNAPSHOT + 2.12-SNAPSHOT ConvertAPI Java Client The ConvertAPI helps converting various file formats. From 925f2170952b198bb5521d380223d5cc710b63b9 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Sat, 14 Sep 2024 01:34:52 +0100 Subject: [PATCH 03/13] Bump dependencies --- pom.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 4433ecf..d2eaed3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,10 +7,10 @@ 2.12-SNAPSHOT ConvertAPI Java Client - The ConvertAPI helps converting various file formats. - Creating PDF and Images from various sources like Word, Excel, Powerpoint, images, web pages or raw HTML codes. + The ConvertAPI helps to convert various file formats. + Creating PDF and Images from various sources like Word, Excel, PowerPoint, images, web pages or raw HTML codes. Merge, Encrypt, Split, Repair and Decrypt PDF files. - And many others files manipulations. + And many others file manipulations. In just few minutes you can integrate it into your application and use it easily. The ConvertAPI client library makes it easier to use the Convert API from your Java 8 projects without having to build your own API calls. @@ -71,12 +71,12 @@ com.google.code.gson gson - 2.8.9 + 2.11.0 com.squareup.okhttp3 okhttp - 4.9.2 + 4.12.0 @@ -95,7 +95,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.1 + 3.4.2 @@ -107,7 +107,7 @@ maven-deploy-plugin - 2.8.2 + 3.1.3 default-deploy @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.1.1 true false @@ -133,7 +133,7 @@ org.apache.maven.scm maven-scm-provider-gitexe - 1.9.5 + 2.1.0 @@ -141,7 +141,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.7.0 true ossrh @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + 3.3.1 attach-sources @@ -167,7 +167,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.10.0 attach-javadocs @@ -198,7 +198,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.2.5 sign-artifacts From 7ff4b27a7eec89b6b46413f5f7088064c817f058 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Sat, 14 Sep 2024 01:53:14 +0100 Subject: [PATCH 04/13] Fix gpg --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index d2eaed3..73f7e79 100644 --- a/pom.xml +++ b/pom.xml @@ -193,6 +193,9 @@ true + + false + From e56fb57367666319c3da6f3a15391483bf75b821 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Sat, 14 Sep 2024 02:03:59 +0100 Subject: [PATCH 05/13] Fix release --- README.md | 2 +- examples/pom.xml | 2 +- maven-release.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 97774e0..68514ba 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Add the following dependency to your pom.xml: com.convertapi.client convertapi - 2.11 + 2.12 ``` diff --git a/examples/pom.xml b/examples/pom.xml index b5401d2..17c7301 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -15,7 +15,7 @@ com.convertapi.client convertapi - 2.11 + 2.12 diff --git a/maven-release.sh b/maven-release.sh index 2fac3bc..06f249c 100644 --- a/maven-release.sh +++ b/maven-release.sh @@ -17,10 +17,10 @@ git fetch git checkout $branch_to_release echo "Preparing release..." -mvn release:prepare -DreleaseVersion=${VERSION} -DdevelopmentVersion=${NEXT_VERSION} -Dtag=v${VERSION} -Dresume=false -Darguments=-Dgpg.passphrase=${GPG_PASSPHRASE} +mvn release:prepare -Prelease-sign-artifacts -DreleaseVersion=${VERSION} -DdevelopmentVersion=${NEXT_VERSION} -Dtag=v${VERSION} -Dresume=false -Darguments=-Dgpg.passphrase=${GPG_PASSPHRASE} echo "Performing release..." -mvn release:perform +mvn release:perform -Prelease-sign-artifacts echo "Push the new release tag..." git push --tags From 8a29f26da475e0514e67e567abf5f29915d7ac72 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Sat, 14 Sep 2024 02:05:29 +0100 Subject: [PATCH 06/13] [maven-release-plugin] prepare release v2.12 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 73f7e79..f87044c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ convertapi jar - 2.12-SNAPSHOT + 2.12 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 - HEAD + v2.12 From 2fbceddb098114531d9fbc8b101f97a8fe3a9661 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Sat, 14 Sep 2024 02:05:29 +0100 Subject: [PATCH 07/13] [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 f87044c..213eb9d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ convertapi jar - 2.12 + 2.13-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.12 + HEAD From 81ca3ebaafa0612c7a4aa597dc4762a134b0f337 Mon Sep 17 00:00:00 2001 From: Jonas Jasas Date: Tue, 3 Jun 2025 10:45:20 +0300 Subject: [PATCH 08/13] Remove all references to Secret and ApiKey #44 --- README.md | 10 +++++----- .../main/java/com/convertapi/examples/Advanced.java | 2 +- .../com/convertapi/examples/ConversionChaining.java | 2 +- .../com/convertapi/examples/ConvertRemoteFile.java | 2 +- .../java/com/convertapi/examples/ConvertStream.java | 2 +- .../java/com/convertapi/examples/ConvertWebToPdf.java | 2 +- .../convertapi/examples/ConvertWordToPdfAndPng.java | 2 +- .../com/convertapi/examples/CreatePdfThumbnail.java | 2 +- .../java/com/convertapi/examples/SimpleConversion.java | 2 +- .../java/com/convertapi/examples/SplitAndMergePdf.java | 2 +- .../java/com/convertapi/examples/UserInformation.java | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 68514ba..fffa0eb 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ And many others files manipulations. In just few minutes you can integrate it into your application and use it easily. The ConvertAPI-Java library makes it easier to use the Convert API from your Java 8 projects without having to build your own API calls. -You can get your free API credentials at https://www.convertapi.com/a +You can get your free API token at https://www.convertapi.com/a/authentication ## Installation @@ -27,10 +27,10 @@ Add the following dependency to your pom.xml: ### Configuration -You can get your credentials at https://www.convertapi.com/a +You can get your token at https://www.convertapi.com/a/authentication ```java -Config.setDefaultApiCredentials("your-api-credentials"); +Config.setDefaultApiCredentials("api-token"); ``` ### File conversion @@ -111,13 +111,13 @@ import com.convertapi.ConvertApi; public class SimpleConversion { public static void main(String[] args) { - ConvertApi.convert("source.docx", "result.pdf", "your-api-credentials"); + ConvertApi.convert("source.docx", "result.pdf", "api-token"); } } ``` This is the bare-minimum to convert a file using the ConvertAPI client, but you can do a great deal more with the ConvertAPI Java library. -Take special note that you should replace `your-api-credentials` with the credentials you obtained in item two of the pre-requisites. +Take special note that you should replace `api-token` with the token you obtained in item two of the pre-requisites. ### Issues & Comments Please leave all comments, bugs, requests, and issues on the Issues page. We'll respond to your request ASAP! diff --git a/examples/src/main/java/com/convertapi/examples/Advanced.java b/examples/src/main/java/com/convertapi/examples/Advanced.java index afeb269..c85477c 100644 --- a/examples/src/main/java/com/convertapi/examples/Advanced.java +++ b/examples/src/main/java/com/convertapi/examples/Advanced.java @@ -21,7 +21,7 @@ public class Advanced { public static void main(String[] args) throws ExecutionException, InterruptedException { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication // Advanced HTTP client setup Config.setDefaultHttpBuilder(builder -> { diff --git a/examples/src/main/java/com/convertapi/examples/ConversionChaining.java b/examples/src/main/java/com/convertapi/examples/ConversionChaining.java index f41e3f4..53ff39c 100644 --- a/examples/src/main/java/com/convertapi/examples/ConversionChaining.java +++ b/examples/src/main/java/com/convertapi/examples/ConversionChaining.java @@ -21,7 +21,7 @@ public class ConversionChaining { public static void main(String[] args) throws IOException, ExecutionException, InterruptedException { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication System.out.println("Converting PDF to JPG and compressing result files with ZIP"); CompletableFuture jpgResult = ConvertApi.convert("docx", "jpg", new Param("file", Paths.get("files/test.docx"))); diff --git a/examples/src/main/java/com/convertapi/examples/ConvertRemoteFile.java b/examples/src/main/java/com/convertapi/examples/ConvertRemoteFile.java index 37c2a38..bcffc08 100644 --- a/examples/src/main/java/com/convertapi/examples/ConvertRemoteFile.java +++ b/examples/src/main/java/com/convertapi/examples/ConvertRemoteFile.java @@ -20,7 +20,7 @@ public class ConvertRemoteFile { public static void main(String[] args) throws ExecutionException, InterruptedException { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication System.out.println("Converting remote PPTX to PDF"); CompletableFuture result = ConvertApi.convert("pptx", "pdf", diff --git a/examples/src/main/java/com/convertapi/examples/ConvertStream.java b/examples/src/main/java/com/convertapi/examples/ConvertStream.java index da392bb..460794d 100644 --- a/examples/src/main/java/com/convertapi/examples/ConvertStream.java +++ b/examples/src/main/java/com/convertapi/examples/ConvertStream.java @@ -22,7 +22,7 @@ public class ConvertStream { public static void main(String[] args) throws ExecutionException, InterruptedException, IOException { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication // Creating file data stream InputStream stream = Files.newInputStream(new File("src/main/resources/test.docx").toPath()); diff --git a/examples/src/main/java/com/convertapi/examples/ConvertWebToPdf.java b/examples/src/main/java/com/convertapi/examples/ConvertWebToPdf.java index ad35ca1..6bdaa81 100644 --- a/examples/src/main/java/com/convertapi/examples/ConvertWebToPdf.java +++ b/examples/src/main/java/com/convertapi/examples/ConvertWebToPdf.java @@ -20,7 +20,7 @@ public class ConvertWebToPdf { public static void main(String[] args) throws ExecutionException, InterruptedException { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication System.out.println("Converting WEB to PDF"); CompletableFuture result = ConvertApi.convert("web", "pdf", diff --git a/examples/src/main/java/com/convertapi/examples/ConvertWordToPdfAndPng.java b/examples/src/main/java/com/convertapi/examples/ConvertWordToPdfAndPng.java index f7c8f14..ff4c656 100644 --- a/examples/src/main/java/com/convertapi/examples/ConvertWordToPdfAndPng.java +++ b/examples/src/main/java/com/convertapi/examples/ConvertWordToPdfAndPng.java @@ -23,7 +23,7 @@ public class ConvertWordToPdfAndPng { public static void main(String[] args) throws IOException, ExecutionException, InterruptedException { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication Path tempDir = Paths.get(System.getProperty("java.io.tmpdir")); System.out.println("Converting DOCX to PDF and JPG in parallel"); diff --git a/examples/src/main/java/com/convertapi/examples/CreatePdfThumbnail.java b/examples/src/main/java/com/convertapi/examples/CreatePdfThumbnail.java index ddca452..65d3ecf 100644 --- a/examples/src/main/java/com/convertapi/examples/CreatePdfThumbnail.java +++ b/examples/src/main/java/com/convertapi/examples/CreatePdfThumbnail.java @@ -21,7 +21,7 @@ public class CreatePdfThumbnail { public static void main(String[] args) throws IOException, ExecutionException, InterruptedException { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication Path tempDir = Paths.get(System.getProperty("java.io.tmpdir")); System.out.println("Creating PDF thumbnail"); diff --git a/examples/src/main/java/com/convertapi/examples/SimpleConversion.java b/examples/src/main/java/com/convertapi/examples/SimpleConversion.java index 97b290d..befbbd1 100644 --- a/examples/src/main/java/com/convertapi/examples/SimpleConversion.java +++ b/examples/src/main/java/com/convertapi/examples/SimpleConversion.java @@ -11,7 +11,7 @@ public class SimpleConversion { public static void main(String[] args) { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication String resourcePath = "files/test.docx"; String tmpDir = System.getProperty("java.io.tmpdir") + "/"; diff --git a/examples/src/main/java/com/convertapi/examples/SplitAndMergePdf.java b/examples/src/main/java/com/convertapi/examples/SplitAndMergePdf.java index 22d0498..7da120c 100644 --- a/examples/src/main/java/com/convertapi/examples/SplitAndMergePdf.java +++ b/examples/src/main/java/com/convertapi/examples/SplitAndMergePdf.java @@ -21,7 +21,7 @@ public class SplitAndMergePdf { public static void main(String[] args) throws IOException, ExecutionException, InterruptedException { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication Path tempDir = Paths.get(System.getProperty("java.io.tmpdir")); System.out.println("Creating PDF with the first and the last pages"); diff --git a/examples/src/main/java/com/convertapi/examples/UserInformation.java b/examples/src/main/java/com/convertapi/examples/UserInformation.java index c09a38e..93e5c01 100644 --- a/examples/src/main/java/com/convertapi/examples/UserInformation.java +++ b/examples/src/main/java/com/convertapi/examples/UserInformation.java @@ -13,7 +13,7 @@ public class UserInformation { public static void main(String[] args) { - Config.setDefaultApiCredentials(getenv("CONVERTAPI_CREDENTIALS")); //Get your api credentials at https://www.convertapi.com/a + Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication User user = ConvertApi.getUser(); System.out.println("API Key: " + user.ApiKey); From 06c51ac174d498d14ff5478ee319a3a129624b0a Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Thu, 12 Jun 2025 00:59:00 +0100 Subject: [PATCH 09/13] Fix error on InputStream conversion --- .../com/convertapi/examples/ConvertStream.java | 16 ++++++++-------- .../com/convertapi/client/RequestBodyStream.java | 9 --------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/examples/src/main/java/com/convertapi/examples/ConvertStream.java b/examples/src/main/java/com/convertapi/examples/ConvertStream.java index 460794d..a261c2d 100644 --- a/examples/src/main/java/com/convertapi/examples/ConvertStream.java +++ b/examples/src/main/java/com/convertapi/examples/ConvertStream.java @@ -25,16 +25,16 @@ public static void main(String[] args) throws ExecutionException, InterruptedExc Config.setDefaultApiCredentials(getenv("API_TOKEN")); // Get your api token at https://www.convertapi.com/a/authentication // Creating file data stream - InputStream stream = Files.newInputStream(new File("src/main/resources/test.docx").toPath()); - - System.out.println("Converting stream of DOCX data to PDF"); - CompletableFuture result = ConvertApi.convert("docx", "pdf", + try (InputStream stream = Files.newInputStream(new File("src/main/resources/test.docx").toPath())) { + System.out.println("Converting stream of DOCX data to PDF"); + CompletableFuture result = ConvertApi.convert("docx", "pdf", new Param("file", stream, "test.docx") - ); + ); - Path pdfFile = Paths.get(System.getProperty("java.io.tmpdir") + "/myfile.pdf"); - result.get().saveFile(pdfFile).get(); + Path pdfFile = Paths.get(System.getProperty("java.io.tmpdir") + "/myfile.pdf"); + result.get().saveFile(pdfFile).get(); - System.out.println("PDF file saved to: " + pdfFile.toString()); + System.out.println("PDF file saved to: " + pdfFile.toString()); + } } } diff --git a/src/main/java/com/convertapi/client/RequestBodyStream.java b/src/main/java/com/convertapi/client/RequestBodyStream.java index 1e617d0..dbf44aa 100644 --- a/src/main/java/com/convertapi/client/RequestBodyStream.java +++ b/src/main/java/com/convertapi/client/RequestBodyStream.java @@ -19,15 +19,6 @@ public MediaType contentType() { return mediaType; } - @Override - public long contentLength() { - try { - return inputStream.available(); - } catch (IOException e) { - return 0; - } - } - @Override public void writeTo(BufferedSink sink) throws IOException { Source source = null; From 61c01247253e8f861d595c4e9ede9ebf39703b62 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Thu, 19 Jun 2025 00:20:26 +0100 Subject: [PATCH 10/13] [maven-release-plugin] prepare release v2.13 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 213eb9d..b36818f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ convertapi jar - 2.13-SNAPSHOT + 2.13 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 - HEAD + v2.13 From c2b3404ab375b616b522d5bdecf04fec43e90638 Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Thu, 19 Jun 2025 00:20:26 +0100 Subject: [PATCH 11/13] [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 12/13] 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 13/13] 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}