diff --git a/git-changelist-maven-extension/pom.xml b/git-changelist-maven-extension/pom.xml index ef972bb..65efa33 100644 --- a/git-changelist-maven-extension/pom.xml +++ b/git-changelist-maven-extension/pom.xml @@ -12,13 +12,14 @@ - org.codehaus.plexus - plexus-component-metadata - 2.1.1 + org.eclipse.sisu + sisu-maven-plugin + 0.3.5 + generate-index - generate-metadata + main-index diff --git a/git-changelist-maven-extension/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java b/git-changelist-maven-extension/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java index e01b2de..106b330 100644 --- a/git-changelist-maven-extension/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java +++ b/git-changelist-maven-extension/src/main/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/Main.java @@ -36,12 +36,13 @@ import java.util.Properties; import java.util.Set; import java.util.TreeSet; +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; import org.apache.maven.AbstractMavenLifecycleParticipant; import org.apache.maven.MavenExecutionException; import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.Logger; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Status; @@ -59,13 +60,14 @@ * @see Maven CI Friendly Versions * @see Core Extensions */ -@Component(role=AbstractMavenLifecycleParticipant.class, hint="git-changelist-maven-extension") +@Named("git-changelist-maven-extension") +@Singleton public class Main extends AbstractMavenLifecycleParticipant { private static final String IGNORE_DIRT = "ignore.dirt"; private static final int ABBREV_LENGTH = 12; - @Requirement + @Inject private Logger log; @Override