CONGA AEM Maven Plugin: Switch to JSR-330 annotations (#177)

stefanseifert · web-flow · commit 4415799c3d8f · 2025-06-16T15:23:27.000+02:00
diff --git a/changes.xml b/changes.xml
@@ -24,6 +24,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
   <body>
 
+    <release version="2.20.4" date="not released">
+      <action type="update" dev="sseifert">
+        CONGA AEM Maven Plugin: Switch to JSR-330 annotations.
+      </action>
+    </release>
+
     <release version="2.20.2" date="2025-04-02">
       <action type="update" dev="sseifert" issue="99">
         Switch to Johnzon 2.x and jakarta.json.
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/AbstractContentPackageMojo.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/AbstractContentPackageMojo.java
@@ -24,11 +24,12 @@
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.settings.crypto.SettingsDecrypter;
 
@@ -217,7 +218,7 @@ abstract class AbstractContentPackageMojo extends AbstractMojo {
   @Parameter(property = "session", defaultValue = "${session}", readonly = true)
   private MavenSession session;
 
-  @Component(role = SettingsDecrypter.class)
+  @Inject
   private SettingsDecrypter decrypter;
 
   protected final boolean isSkip() {
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerAllPackageMojo.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerAllPackageMojo.java
@@ -29,9 +29,10 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import javax.inject.Inject;
+
 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.project.MavenProject;
@@ -162,7 +163,7 @@ public final class CloudManagerAllPackageMojo extends AbstractCloudManagerMojo {
 
   @Parameter(readonly = true, defaultValue = "${project}")
   private MavenProject project;
-  @Component
+  @Inject
   private MavenProjectHelper projectHelper;
 
   private static final String CLOUDMANAGER_TARGET_NONE = "none";
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerDispatcherConfigMojo.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerDispatcherConfigMojo.java
@@ -27,16 +27,18 @@
 import java.util.List;
 import java.util.Set;
 
+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.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
 
+import com.google.inject.name.Named;
+
 import io.wcm.devops.conga.generator.util.FileUtil;
 import io.wcm.devops.conga.plugins.aem.maven.model.ModelParser;
 
@@ -56,7 +58,8 @@ public final class CloudManagerDispatcherConfigMojo extends AbstractCloudManager
   @Parameter(property = "conga.cloudManager.dispatcherConfig.skip", defaultValue = "false")
   private boolean skip;
 
-  @Component(role = Archiver.class, hint = "zip")
+  @Inject
+  @Named("zip")
   private ZipArchiver zipArchiver;
 
   @Parameter(defaultValue = "${project.build.outputTimestamp}")
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/InstallPackagesMojo.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/InstallPackagesMojo.java
@@ -24,6 +24,8 @@
 import java.io.File;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.BuildPluginManager;
@@ -33,7 +35,6 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-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.project.MavenProject;
@@ -106,9 +107,9 @@ public final class InstallPackagesMojo extends AbstractContentPackageMojo {
   private MavenProject project;
   @Parameter(defaultValue = "${session}", readonly = true)
   private MavenSession session;
-  @Component(role = MavenPluginManager.class)
+  @Inject
   private MavenPluginManager pluginManager;
-  @Component(role = BuildPluginManager.class)
+  @Inject
   private BuildPluginManager buildPluginManager;
 
   @Override
