Skip to content

Commit

Permalink
Merge branch 'release/2.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pvorb committed Sep 14, 2020
2 parents 9c1caab + 4a406b0 commit 5269e1d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 9 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Documentation: https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "maven" # See documentation for possible values
directory: "/"
schedule:
interval: "weekly"
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.6.0

* If the package can't resolve a property an exception is no longer thrown. This behaviour is now logged with a
warning and the packaging mojo continues.

== Version 2.5.1

* Ignore `Set-Cookie` header of responses in the `deploy` goal
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

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

<name>Helm Maven Plugin</name>
<description>A Maven Plugin for Helm Charts</description>
<url>https://github.com/deviceinsight/helm-maven-plugin</url>

<properties>
<kotlin.version>1.3.72</kotlin.version>
<kotlin.version>1.4.10</kotlin.version>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand All @@ -25,13 +25,13 @@
<jackson.version>2.11.2</jackson.version>
<httpclient.version>4.5.12</httpclient.version>

<junit.jupiter.version>5.6.2</junit.jupiter.version>
<assertj-core.version>3.16.1</assertj-core.version>
<junit.jupiter.version>5.7.0</junit.jupiter.version>
<assertj-core.version>3.17.2</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>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<gitflow-maven-plugin.version>1.13.0</gitflow-maven-plugin.version>
<dokka-maven-plugin.version>1.4.0</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>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class PackageMojo : AbstractHelmMojo() {
else -> project.properties.getProperty(property)
}
if (result == null) {
throw IllegalStateException("Could not resolve property: '$property' used in file: '$fileName'")
log.warn("Could not resolve property: '$property' used in file: '$fileName'")
} else {
log.debug("Resolved property: '$property' as: '$result'")
}
Expand Down

0 comments on commit 5269e1d

Please sign in to comment.