Merge branch 'release/1.5.0'

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>me.bvn13.kafka.health</groupId>
 	<artifactId>kafka-health-check</artifactId>
-	<version>1.6.1</version>
+	<version>1.5.0</version>
 	<packaging>jar</packaging>
 
 	<name>Kafka Health Check</name>
@@ -30,8 +30,9 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Versions -->
+		<nexus.url>https://s01.oss.sonatype.org</nexus.url>
 		<guava.version>30.1.1-jre</guava.version>
-
+		<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
 		<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<gitflow-maven-plugin.version>1.18.0</gitflow-maven-plugin.version>
@@ -113,8 +114,8 @@
 						<gitFlowConfig>
 							<developmentBranch>develop</developmentBranch>
 						</gitFlowConfig>
-						<incrementVersionAtFinish>false</incrementVersionAtFinish>
-						<versionDigitToIncrement>1</versionDigitToIncrement>
+						<incrementVersionAtFinish>true</incrementVersionAtFinish>
+						<versionDigitToIncrement>2</versionDigitToIncrement>
 					</configuration>
 				</plugin>
 			</plugins>
@@ -197,14 +198,31 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<version>${maven-deploy-plugin.version}</version>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
 						<version>${nexus-staging-maven-plugin.version}</version>
 						<extensions>true</extensions>
+						<executions>
+							<execution>
+								<id>default-deploy</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>deploy</goal>
+								</goals>
+							</execution>
+						</executions>
 						<configuration>
 							<serverId>ossrh</serverId>
-							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+							<nexusUrl>${nexus.url}</nexusUrl>
 							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
 					</plugin>
@@ -228,12 +246,12 @@
 			<distributionManagement>
 				<snapshotRepository>
 					<id>ossrh</id>
-					<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+					<url>${nexus.url}/content/repositories/snapshots</url>
 				</snapshotRepository>
-<!--				<repository>-->
-<!--					<id>ossrh</id>-->
-<!--					<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>-->
-<!--				</repository>-->
+				<repository>
+					<id>ossrh</id>
+					<url>${nexus.url}/service/local/staging/deploy/maven2/</url>
+				</repository>
 			</distributionManagement>
 
 			<pluginRepositories>