Skip to content

Commit

Permalink
Merge branch 'hotfix/2.5.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
pvorb committed Aug 11, 2020
2 parents fa48373 + d081059 commit 9c1caab
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
= Changelog

== Version 2.5.1

* Ignore `Set-Cookie` header of responses in the `deploy` goal
* Update dependency versions

== Version 2.5.0

* Make `chartRepoUrl` optional
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.deviceinsight.helm</groupId>
<artifactId>helm-maven-plugin</artifactId>
<version>2.5.0</version>
<version>2.5.1</version>
<packaging>maven-plugin</packaging>

<name>Helm Maven Plugin</name>
Expand All @@ -20,13 +20,13 @@

<maven.version>3.6.0</maven.version>
<maven-project.version>2.2.1</maven-project.version>
<maven-artifact-transfer.version>0.10.1</maven-artifact-transfer.version>
<maven-artifact-transfer.version>0.12.0</maven-artifact-transfer.version>

<jackson.version>2.10.2</jackson.version>
<httpclient.version>4.5.6</httpclient.version>
<jackson.version>2.11.2</jackson.version>
<httpclient.version>4.5.12</httpclient.version>

<junit.jupiter.version>5.5.2</junit.jupiter.version>
<assertj-core.version>3.11.1</assertj-core.version>
<junit.jupiter.version>5.6.2</junit.jupiter.version>
<assertj-core.version>3.16.1</assertj-core.version>

<dokka-maven-plugin.version>0.9.17</dokka-maven-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
Expand Down
3 changes: 3 additions & 0 deletions src/main/kotlin/com/deviceinsight/helm/DeployMojo.kt
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ class DeployMojo : AbstractMojo() {

private fun createChartRepoClient(chartDeploymentRequest: ChartDeploymentRequest): CloseableHttpClient {
val clientBuilder = HttpClientBuilder.create()
// cookie management is disabled to avoid parsing errors of the Set-Cookie header
// see https://github.com/deviceinsight/helm-maven-plugin/issues/45
.disableCookieManagement()

if (chartDeploymentRequest.chartRepoUsername != null && chartDeploymentRequest.chartRepoPassword != null) {
clientBuilder.setDefaultCredentialsProvider(BasicCredentialsProvider().apply {
Expand Down

0 comments on commit 9c1caab

Please sign in to comment.