From 3e2cd87eb5f02727c4c78ad42a818e4f49ad12be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 15:56:49 +0000 Subject: [PATCH 1/8] Bump maven.version from 3.6.2 to 3.8.1 Bumps `maven.version` from 3.6.2 to 3.8.1. Updates `maven-plugin-api` from 3.6.2 to 3.8.1 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.6.2...maven-3.8.1) Updates `maven-plugin-annotations` from 3.6.2 to 3.8.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.2...maven-plugin-tools-3.8.1) Updates `maven-artifact` from 3.6.2 to 3.8.1 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.6.2...maven-3.8.1) Updates `maven-core` from 3.6.2 to 3.8.1 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.6.2...maven-3.8.1) Updates `maven-plugin-plugin` from 3.6.2 to 3.8.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.2...maven-plugin-tools-3.8.1) --- updated-dependencies: - dependency-name: org.apache.maven:maven-plugin-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven:maven-artifact dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven:maven-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2f38cd..6ebe79c 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8 UTF-8 - 3.6.2 + 3.8.1 2.2.1 4.5.14 From aaf069f9a957ad08de76e897ccb7a86024d8fdf0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 15:56:57 +0000 Subject: [PATCH 2/8] Bump dokka-maven-plugin from 1.7.20 to 1.8.10 Bumps [dokka-maven-plugin](https://github.com/Kotlin/dokka) from 1.7.20 to 1.8.10. - [Release notes](https://github.com/Kotlin/dokka/releases) - [Commits](https://github.com/Kotlin/dokka/compare/v1.7.20...v1.8.10) --- updated-dependencies: - dependency-name: org.jetbrains.dokka:dokka-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2f38cd..8982597 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 5.9.2 3.24.2 - 1.7.20 + 1.8.10 3.11.0 3.2.1 1.19.0 From 3cb1da79488dedc8683344c3bbd48f744b97c2f8 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Tue, 7 Mar 2023 12:48:27 +0100 Subject: [PATCH 3/8] Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24e08b8..6947f45 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.12.0 + 2.13.0-SNAPSHOT maven-plugin Helm Maven Plugin From c6e9f52cb982ee748be1c2060ab03783d1f3e34e Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Wed, 8 Mar 2023 09:13:40 +0100 Subject: [PATCH 4/8] Amend new release version in changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a907289..eeb2615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## Version 2.12.0 + * Converted README and CHANGELOG to Markdown * Add option to provide additional values files From e1529e99da7666ea24452e19cc822994dec0e52b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:59:29 +0000 Subject: [PATCH 5/8] Bump kotlin.version from 1.8.10 to 1.8.20 Bumps `kotlin.version` from 1.8.10 to 1.8.20. Updates `kotlin-bom` from 1.8.10 to 1.8.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.10...v1.8.20) Updates `kotlin-test-junit` from 1.8.10 to 1.8.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.10...v1.8.20) Updates `kotlin-maven-plugin` from 1.8.10 to 1.8.20 --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6947f45..059a95b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ https://github.com/deviceinsight/helm-maven-plugin - 1.8.10 + 1.8.20 1.8 1.8 1.8 From 544b8389f52091c4173517dd897147a1d6f90948 Mon Sep 17 00:00:00 2001 From: Dirk Wilden Date: Thu, 20 Apr 2023 10:25:56 +0200 Subject: [PATCH 6/8] add support escaping placeholders with backslash --- CHANGELOG.md | 2 ++ .../kotlin/com/deviceinsight/helm/PackageMojo.kt | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eeb2615..b3cfa7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +* Support escaping placeholders with backslash e.g. `\${MY_ENV_VAR}` will no longer be expanded + ## Version 2.12.0 * Converted README and CHANGELOG to Markdown diff --git a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt index 8d63167..f38363c 100644 --- a/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt +++ b/src/main/kotlin/com/deviceinsight/helm/PackageMojo.kt @@ -39,7 +39,7 @@ import java.io.IOException class PackageMojo : ResolveHelmMojo(), ServerAuthentication { companion object { - private val PLACEHOLDER_REGEX = Regex("""\$\{(.*?)}""") + private val PLACEHOLDER_REGEX = Regex("""(\\?)\$\{(.*?)}""") private val SUBSTITUTED_EXTENSIONS = setOf("json", "tpl", "yml", "yaml") } @@ -173,11 +173,17 @@ class PackageMojo : ResolveHelmMojo(), ServerAuthentication { file.useLines { lines -> lines.map { line -> PLACEHOLDER_REGEX.replace(line) { matchResult -> - val property = matchResult.groupValues[1] - when (val propertyValue = findPropertyValue(property, targetFile.absolutePath)) { - null -> matchResult.groupValues[0] - else -> propertyValue + val isEscaped = matchResult.groupValues[1] == "\\" + val property = matchResult.groupValues[2] + + if (isEscaped) { + matchResult.groupValues[0].substring(1) + } else { + when (val propertyValue = findPropertyValue(property, targetFile.absolutePath)) { + null -> matchResult.groupValues[0] + else -> propertyValue + } } } }.forEach { From 6917876b9628453de5b7bf694207fb2498701ff6 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Fri, 21 Apr 2023 15:39:28 +0200 Subject: [PATCH 7/8] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a053e0..4072fc6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.deviceinsight.helm helm-maven-plugin - 2.13.0-SNAPSHOT + 2.13.0 maven-plugin Helm Maven Plugin From 4ece0fca1b12670d8a8df3d5636d2d9b4bfdb9c3 Mon Sep 17 00:00:00 2001 From: Paul Vorbach Date: Fri, 21 Apr 2023 15:40:05 +0200 Subject: [PATCH 8/8] Prepare changelog for release --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3cfa7f..b05ead7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## Version 2.13.0 * Support escaping placeholders with backslash e.g. `\${MY_ENV_VAR}` will no longer be expanded