From d4e8df68da66fb7bba769c3f11b47a5da3c382db Mon Sep 17 00:00:00 2001 From: Krisztian Mozsi Date: Fri, 13 Sep 2024 00:14:17 +0100 Subject: [PATCH 1/6] 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 2/6] [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 3/6] 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 4/6] 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 5/6] 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 6/6] [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