Merge pull request #491 from axonivy/dependabot/maven/org.apache.mave…

…n.plugin-tools-maven-plugin-annotations-3.15.0 Bump org.apache.maven.plugin-tools:maven-plugin-annotations from 3.14.0 to 3.15.0
axonivy · Aug 28, 2024 · f912bbf · f912bbf
2 parents 8f0dbfc + d6056a3
commit f912bbf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.14.0</version>
+      <version>3.15.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/src/main/java/ch/ivyteam/ivy/maven/InstallEngineMojo.java b/src/main/java/ch/ivyteam/ivy/maven/InstallEngineMojo.java
@@ -24,12 +24,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.wagon.proxy.ProxyInfoProvider;
@@ -98,7 +99,7 @@ public class InstallEngineMojo extends AbstractEngineMojo {
   @Parameter(defaultValue = "${project.remotePluginRepositories}", readonly = true)
   List<RemoteRepository> pluginRepositories;
 
-  @Component
+  @Inject
   private RepositorySystem repositorySystem;
 
   /**
@@ -143,7 +144,7 @@ public class InstallEngineMojo extends AbstractEngineMojo {
   @Parameter(property = "ivy.engine.auto.install", defaultValue = "true")
   boolean autoInstallEngine;
 
-  @Component
+  @Inject
   @SuppressWarnings("deprecation")
   org.apache.maven.artifact.manager.WagonManager wagonManager;
 

diff --git a/src/main/java/ch/ivyteam/ivy/maven/deploy/AbstractDeployMojo.java b/src/main/java/ch/ivyteam/ivy/maven/deploy/AbstractDeployMojo.java
@@ -22,10 +22,11 @@
 import java.nio.file.Path;
 import java.nio.file.ReadOnlyFileSystemException;
 
+import javax.inject.Inject;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.filtering.MavenFileFilter;
@@ -188,7 +189,7 @@ public abstract class AbstractDeployMojo extends AbstractIntegrationTestMojo {
   @Parameter(property = "ivy.deploy.options.file", required = false)
   protected Path deployOptionsFile;
 
-  @Component
+  @Inject
   private MavenFileFilter fileFilter;
   @Parameter(property = "project", required = false, readonly = true)
   protected MavenProject project;

diff --git a/src/main/java/ch/ivyteam/ivy/maven/deploy/DeployToEngineMojo.java b/src/main/java/ch/ivyteam/ivy/maven/deploy/DeployToEngineMojo.java
@@ -20,10 +20,11 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import javax.inject.Inject;
+
 import org.apache.commons.lang3.StringUtils;
 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.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.settings.Server;
@@ -124,7 +125,7 @@ public class DeployToEngineMojo extends AbstractDeployMojo {
   @Parameter(property = "ivy.deploy.engine.url", defaultValue = HTTP_ENGINE_URL_DEFAULT)
   String deployEngineUrl;
 
-  @Component(role = org.sonatype.plexus.components.sec.dispatcher.SecDispatcher.class, hint = "default")
+  @Inject
   private SecDispatcher secDispatcher;
 
   @Override