Merge remote-tracking branch 'origin/master' into develop

Author: kmozsi

Dockerfile

@@ -0,0 +1,35 @@
+FROM openjdk:8-jdk-alpine
+
+ENV VERSION=
+ENV NEXT_VERSION=
+ENV GPG_PASSPHRASE=
+ARG GIT_EMAIL=
+ARG FULL_NAME=
+
+ARG MAVEN_VERSION=3.3.9
+ARG USER_HOME_DIR="/root"
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+# speed up Maven JVM a bit
+ENV MAVEN_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+
+VOLUME /gpg
+VOLUME /maven
+VOLUME /ssh
+
+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 && \
+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}
+
+# Configure gpg
+RUN export GPG_TTY=/dev/console
+RUN export GPG_OPTS='--pinentry-mode loopback'
+
+RUN ["chmod", "+x", "/maven-release.sh"]
+ENTRYPOINT /maven-release.sh

GETTING-STARTED.md

@@ -1,8 +1,17 @@
 #### 1. Install the ConvertAPI library
 
-Go to [ConvertAPI Java client](https://github.com/ConvertAPI/convertapi-java) page and download JAR file.
-Place JAR in to your project library directory.
-
+Go to the [ConvertAPI Java client](https://github.com/ConvertAPI/convertapi-java) page and download the JAR file. 
+Place JAR into your project library directory.
+
+The library is also available in Maven. 
+Add the following dependency to your pom.xml:
+```xml
+<dependency>
+    <groupId>com.convertapi.client</groupId>
+    <artifactId>convertapi</artifactId>
+    <version>2.2</version>
+</dependency>
+```
 
 #### 2.a. Simple conversion methods
 
@@ -22,7 +31,7 @@ ConvertApi.convertRemoteFile("https://cdn.convertapi.com/cara/testfiles/document
 ```
 
 
-#### 2.b. Convert local file
+#### 2.b. Convert a local file
 
 ```java
 import com.convertapi.*;
@@ -37,7 +46,7 @@ ConvertApi.convert("docx", "pdf",
 ```
 
 
-#### 2.c. Convert remote file and set additional parameters
+#### 2.c. Convert a remote file and set additional parameters
 
 ```java
 import com.convertapi.*;
@@ -149,4 +158,4 @@ https://www.convertapi.com/doc/supported-formats
 
 #### 6. GitHub 
 
-https://github.com/ConvertAPI/convertapi-java
+https://github.com/ConvertAPI/convertapi-java

README.md

@@ -91,7 +91,7 @@ int secondsLeft = user.SecondsLeft;
 
 ### More examples
 
-You can find more advanced examples in the [examples](https://github.com/ConvertAPI/convertapi-java/tree/master/src/main/java/com/convertapi/examples) folder.
+You can find more advanced examples in the [examples](https://github.com/ConvertAPI/convertapi-java/tree/master/examples/src/main/java/com/convertapi/examples) folder.
 
 #### Converting your first file, full example:
 

convertapi.iml

@@ -19,6 +19,7 @@
  * https://www.convertapi.com/docx-to-pdf
  * https://www.convertapi.com/docx-to-png
  */
+
 public class AlternativeConverter {
 
     public static void main(String[] args) throws IOException, ExecutionException, InterruptedException {
@@ -33,4 +34,4 @@ public static void main(String[] args) throws IOException, ExecutionException, I
 
         System.out.println("PDF file saved to: " + pdfResult.get().saveFile(tempDir).get());
     }
-}
+}

examples/src/main/java/com/convertapi/examples/AlternativeConverter.java

@@ -1,38 +1,25 @@
 #!/bin/sh
 
-# Usage: ./maven-release.sh v2.0 2.1-SNAPSHOT 2.0
-
 branch_to_release="master"
+set -e
+
+echo "Set private key..."
+cp -vr /gpg ~/.gnupg
+echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
+cp -vpr /maven ~/.m2
+cp -vr /ssh ~/.ssh
+
+echo "Cloning convertapi-java..."
+ssh-keyscan github.com >> ~/.ssh/known_hosts
+git clone git@github.com:ConvertAPI/convertapi-java.git
+cd convertapi-java
 
 echo "Switching to the release branch..."
 git fetch
 git checkout $branch_to_release
 
-echo "Pulling changes..."
-git pull --ff-only
-
-echo "Push commits..."
-git push
-
-echo "Revert uncommitted changes..."
-git checkout .
-
-echo "Cleaning..."
-mvn clean
-
 echo "Preparing release..."
-if [ $# -eq 1 ]
-then
-	echo "\n\n" | mvn release:prepare -Dtag=$1 -Dresume=false
-elif [ $# -eq 2 ] 
-then
-	echo "\n" | mvn release:prepare -DdevelopmentVersion=$2 -Dtag=$1 -Dresume=false
-elif [ $# -eq 3 ] 
-then
-	mvn release:prepare -DreleaseVersion=$3 -DdevelopmentVersion=$2 -Dtag=$1 -Dresume=false
-else
-	echo "\n\n\n" | mvn release:prepare -Dresume=false
-fi
+mvn release:prepare -DreleaseVersion=${VERSION} -DdevelopmentVersion=${NEXT_VERSION} -Dtag=v${VERSION} -Dresume=false -Darguments=-Dgpg.passphrase=${GPG_PASSPHRASE}
 
 echo "Performing release..."
 mvn release:perform
@@ -42,3 +29,7 @@ git push --tags
 
 echo "Push release commits..."
 git push
+
+echo "-------------------------------------------------------------"
+echo "SUCCESSFULLY released ${VERSION} to Maven Central repository."
+echo "-------------------------------------------------------------"

maven-release-snapshot.sh

@@ -4,7 +4,7 @@
     <artifactId>convertapi</artifactId>
     <packaging>jar</packaging>
 
-    <version>2.2-SNAPSHOT </version>
+    <version>2.4-SNAPSHOT </version>
     <name>ConvertAPI Java Client</name>
     <description>
         The ConvertAPI helps converting various file formats.
@@ -133,7 +133,7 @@
                 <configuration>
                     <serverId>ossrh</serverId>
                     <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
                 </configuration>
             </plugin>