From f0e5759ebc63a7a5672ee5ce0ebef2f6ace471d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 05:48:53 +0000 Subject: [PATCH 1/3] build(deps): Bump org.apache.maven.plugins:maven-plugin-plugin Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.9.0 to 3.15.1. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.9.0...maven-plugin-tools-3.15.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- maven/plugins/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven/plugins/pom.xml b/maven/plugins/pom.xml index bb2cc311a..1d8e2d3f3 100644 --- a/maven/plugins/pom.xml +++ b/maven/plugins/pom.xml @@ -69,7 +69,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.9.0 + 3.15.1 ${goal.prefix} true From 04967437017875428a86a843c72ab57f12058540 Mon Sep 17 00:00:00 2001 From: Stefan Genov Date: Tue, 3 Dec 2024 13:21:32 +0200 Subject: [PATCH 2/3] fix: replacing `@Component` with `@Paramter` https://maven.apache.org/plugin-tools/maven-plugin-annotations/apidocs/org/apache/maven/plugins/annotations/Component.html Signed-off-by: Stefan Genov --- .../java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/maven/plugins/common/src/main/java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java b/maven/plugins/common/src/main/java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java index b91aa1460..4682036b9 100644 --- a/maven/plugins/common/src/main/java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java +++ b/maven/plugins/common/src/main/java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java @@ -21,7 +21,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.settings.Server; import org.apache.maven.settings.Settings; @@ -36,10 +35,10 @@ public abstract class AbstractIacMojo extends AbstractVroPkgMojo { - @Component + @Parameter(defaultValue = "${settings}", readonly = true) private Settings settings; - @Component + @Parameter(defaultValue = "${settings.decrypter}", readonly = true) private SettingsDecrypter decrypter; @Parameter(required = false, property = "vro", defaultValue = "${vro.*}") From c651200a57c3698b5b1a1d68bd7d857b61190f18 Mon Sep 17 00:00:00 2001 From: Stefan Genov Date: Tue, 3 Dec 2024 14:06:14 +0200 Subject: [PATCH 3/3] revert: Not sure how to inject this, so returning it and checking build Signed-off-by: Stefan Genov --- .../java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven/plugins/common/src/main/java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java b/maven/plugins/common/src/main/java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java index 4682036b9..e939b57fd 100644 --- a/maven/plugins/common/src/main/java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java +++ b/maven/plugins/common/src/main/java/com/vmware/pscoe/maven/plugins/AbstractIacMojo.java @@ -21,6 +21,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.settings.Server; import org.apache.maven.settings.Settings; @@ -38,7 +39,7 @@ public abstract class AbstractIacMojo extends AbstractVroPkgMojo { @Parameter(defaultValue = "${settings}", readonly = true) private Settings settings; - @Parameter(defaultValue = "${settings.decrypter}", readonly = true) + @Component private SettingsDecrypter decrypter; @Parameter(required = false, property = "vro", defaultValue = "${vro.*}")