Skip to content

Commit 27ecc21

Browse files
jonas-jasasjonas-jasas
committed
Merge remote-tracking branch 'origin/feature/maven' into feature/maven
2 parents 3d693d1 + 462f772 commit 27ecc21

File tree

11 files changed

+95
-38
lines changed

11 files changed

+95
-38
lines changed

‎maven-release.sh‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/bin/sh
2+
branch_to_release="feature/maven"
3+
4+
echo "Switching to the release branch..."
5+
git fetch
6+
git checkout $branch_to_release
7+
8+
echo "Pulling changes..."
9+
git pull --ff-only
10+
11+
echo "Push commits..."
12+
git push
13+
14+
echo "Revert uncommitted changes..."
15+
git checkout .
16+
17+
echo "Cleaning..."
18+
mvn clean
19+
20+
echo "Preparing release..."
21+
if [ $# -eq 1 ]
22+
then
23+
echo -en "\n\n" | mvn release:prepare -Dtag=$1
24+
elif [ $# -eq 2 ]
25+
then
26+
echo -en "\n" | mvn release:prepare -DdevelopmentVersion=$2 -Dtag=$1
27+
elif [ $# -eq 3 ]
28+
then
29+
mvn release:prepare -DreleaseVersion=$3 -DdevelopmentVersion=$2 -Dtag=$1
30+
else
31+
echo -en "\n\n\n" | mvn release:prepare
32+
fi
33+
34+
echo "Performing release..."
35+
mvn release:perform
36+
37+
echo "Push the new release tag..."
38+
git push --tags
39+
40+
echo "Push release commits..."
41+
git push

‎pom.xml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<plugin>
141141
<groupId>org.apache.maven.plugins</groupId>
142142
<artifactId>maven-source-plugin</artifactId>
143-
<version>3.0.1</version>
143+
<version>3.1.0</version>
144144
<executions>
145145
<execution>
146146
<id>attach-sources</id>
@@ -150,6 +150,20 @@
150150
</execution>
151151
</executions>
152152
</plugin>
153+
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-javadoc-plugin</artifactId>
157+
<version>3.1.1</version>
158+
<executions>
159+
<execution>
160+
<id>attach-javadocs</id>
161+
<goals>
162+
<goal>jar</goal>
163+
</goals>
164+
</execution>
165+
</executions>
166+
</plugin>
153167

154168
</plugins>
155169

@@ -187,4 +201,4 @@
187201
</profile>
188202
</profiles>
189203

190-
</project>
204+
</project>

‎src/main/resources/examples/Advanced.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.convertapi.client.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

88
import java.io.IOException;
99
import java.net.InetSocketAddress;

‎src/main/resources/examples/ConversionChaining.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.convertapi.examples;
1+
package com.convertapi.client.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

88
import java.io.IOException;
99
import java.nio.file.Path;

‎src/main/resources/examples/ConvertRemoteFile.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.convertapi.examples;
1+
package com.convertapi.client.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

88
import java.io.IOException;
99
import java.nio.file.Path;

‎src/main/resources/examples/ConvertWebToPdf.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.convertapi.client.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

88
import java.io.IOException;
99
import java.nio.file.Path;

‎src/main/resources/examples/ConvertWordToPdfAndPng.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.convertapi.examples;
1+
package com.convertapi.client.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

88
import java.io.IOException;
99
import java.nio.file.Path;

‎src/main/resources/examples/CreatePdfThumbnail.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.convertapi.client.examples;
22

3-
import com.convertapi.Config;
4-
import com.convertapi.ConversionResult;
5-
import com.convertapi.ConvertApi;
6-
import com.convertapi.Param;
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
77

88
import java.io.IOException;
99
import java.nio.file.Path;

‎src/main/resources/examples/SimpleConversion.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.convertapi.examples;
1+
package com.convertapi.client.examples;
22

3-
import com.convertapi.ConvertApi;
3+
import com.convertapi.client.ConvertApi;
44

55
import static java.lang.System.getenv;
66

‎src/main/resources/examples/SplitAndMergePdf.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import com.convertapi.Config;
2-
import com.convertapi.ConversionResult;
3-
import com.convertapi.ConvertApi;
4-
import com.convertapi.Param;
1+
package com.convertapi.client.examples;
2+
3+
import com.convertapi.client.Config;
4+
import com.convertapi.client.ConversionResult;
5+
import com.convertapi.client.ConvertApi;
6+
import com.convertapi.client.Param;
57

68
import java.io.IOException;
79
import java.nio.file.Path;

0 commit comments

Comments
 (0)