Merge branch 'release/2.7.0'

CHANGELOG.adoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== Version 2.7.0
+
+* Accept any 2xx HTTP status code when deploying Helm charts
+* Use new incubator repository hosted at https://charts.helm.sh/incubator
+
 == Version 2.6.0
 
 * If the package can't resolve a property an exception is no longer thrown. This behaviour is now logged with a

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.deviceinsight.helm</groupId>
 	<artifactId>helm-maven-plugin</artifactId>
-	<version>2.6.0</version>
+	<version>2.7.0</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>Helm Maven Plugin</name>
@@ -22,13 +22,13 @@
 		<maven-project.version>2.2.1</maven-project.version>
 		<maven-artifact-transfer.version>0.12.0</maven-artifact-transfer.version>
 
-		<jackson.version>2.11.2</jackson.version>
-		<httpclient.version>4.5.12</httpclient.version>
+		<jackson.version>2.11.3</jackson.version>
+		<httpclient.version>4.5.13</httpclient.version>
 
 		<junit.jupiter.version>5.7.0</junit.jupiter.version>
-		<assertj-core.version>3.17.2</assertj-core.version>
+		<assertj-core.version>3.18.0</assertj-core.version>
 
-		<dokka-maven-plugin.version>1.4.0</dokka-maven-plugin.version>
+		<dokka-maven-plugin.version>1.4.10.2</dokka-maven-plugin.version>
 		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
 		<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
 		<gitflow-maven-plugin.version>1.14.0</gitflow-maven-plugin.version>

src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt

@@ -167,7 +167,7 @@ class DeployMojo : AbstractMojo() {
 
 			httpClient.execute(request).use { response ->
 				val statusCode = response.statusLine.statusCode
-				if (statusCode != 201) {
+				if ( (statusCode >= 200) && (statusCode < 300) ) {
 					throw RuntimeException("Unexpected status code when executing $chartPublishMethod request to " +
 						"chart repo ${chartDeploymentRequest.chartPublishUrl()}: $statusCode")
 				}

src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt

@@ -45,6 +45,8 @@ class PackageMojo : AbstractHelmMojo() {
 	@Parameter(property = "chartRepoPassword", required = false)
 	private var chartRepoPassword: String? = null
 
+	private val incubatorRepository = "https://charts.helm.sh/incubator"
+
 	@Throws(MojoExecutionException::class)
 	override fun execute() {
 
@@ -77,7 +79,7 @@ class PackageMojo : AbstractHelmMojo() {
 				executeCmd("$helm init --client-only")
 			}
 
-			executeCmd("$helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com")
+			executeCmd("$helm repo add incubator $incubatorRepository")
 			if (chartRepoUrl != null) {
 				val authParams = if (chartRepoUsername != null && chartRepoPassword != null) {
 					" --username $chartRepoUsername --password $chartRepoPassword"