diff --git a/target-platform-configuration/src/main/java/org/eclipse/tycho/target/MirrorTargetPlatformMojo.java b/target-platform-configuration/src/main/java/org/eclipse/tycho/target/MirrorTargetPlatformMojo.java
index 3e85d86a02..cf3df7e95b 100644
--- a/target-platform-configuration/src/main/java/org/eclipse/tycho/target/MirrorTargetPlatformMojo.java
+++ b/target-platform-configuration/src/main/java/org/eclipse/tycho/target/MirrorTargetPlatformMojo.java
@@ -19,10 +19,11 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 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.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -63,7 +64,7 @@ public class MirrorTargetPlatformMojo extends AbstractMojo {
 
     private static final SiteXMLAction CATEGORY_FACTORY = new SiteXMLAction((URI) null, (String) null);
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     private MavenProject project;
 
     @Parameter(defaultValue = "${project.build.directory}/target-platform-repository")
@@ -104,19 +105,19 @@ public class MirrorTargetPlatformMojo extends AbstractMojo {
     @Parameter
     private SlicingOptions options;
 
-    @Component
+    @Inject
     private TargetPlatformService platformService;
 
-    @Component
+    @Inject
     private MirrorApplicationService mirrorService;
 
-    @Component
+    @Inject
     private ReactorRepositoryManager repositoryManager;
 
-    @Component
+    @Inject
     private IProvisioningAgent agent;
 
-    @Component
+    @Inject
     private InstallableUnitSlicer installableUnitSlicer;
 
     @Override
diff --git a/target-platform-configuration/src/main/java/org/eclipse/tycho/target/TargetPlatformMojo.java b/target-platform-configuration/src/main/java/org/eclipse/tycho/target/TargetPlatformMojo.java
index a21ad6f99a..00a14873ca 100644
--- a/target-platform-configuration/src/main/java/org/eclipse/tycho/target/TargetPlatformMojo.java
+++ b/target-platform-configuration/src/main/java/org/eclipse/tycho/target/TargetPlatformMojo.java
@@ -13,12 +13,12 @@
  *******************************************************************************/
 package org.eclipse.tycho.target;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 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;
 import org.eclipse.tycho.ReactorProject;
 import org.eclipse.tycho.TargetPlatformService;
@@ -30,10 +30,10 @@ public class TargetPlatformMojo extends AbstractMojo {
     private static final String TARGET_PLATFORM_MOJO_EXECUTED = "TargetPlatformMojo.executed";
 
     // TODO site doc (including steps & parameters handled in afterProjectsRead?)
-    @Parameter(property = "project", readonly = true)
+    @Inject
     private MavenProject project;
 
-    @Component
+    @Inject
     private TargetPlatformService platformService;
 
     @Override
diff --git a/tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiAnalysisMojo.java b/tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiAnalysisMojo.java
index c143154c00..77a517b4d5 100644
--- a/tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiAnalysisMojo.java
+++ b/tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiAnalysisMojo.java
@@ -27,17 +27,16 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Repository;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -79,7 +78,7 @@ public class ApiAnalysisMojo extends AbstractMojo {
 	@Parameter(property = "plugin.artifacts")
 	protected List<Artifact> pluginArtifacts;
 
-	@Parameter(property = "project", readonly = true)
+	@Inject
 	private MavenProject project;
 
 	@Parameter(defaultValue = "eclipse-plugin")
@@ -100,9 +99,6 @@ public class ApiAnalysisMojo extends AbstractMojo {
 	@Parameter()
 	private Repository apiToolsRepository;
 
-	@Parameter(property = "session", readonly = true, required = true)
-	private MavenSession session;
-
 	@Parameter
 	private Map<String, String> properties;
 
@@ -159,13 +155,13 @@ public class ApiAnalysisMojo extends AbstractMojo {
 	@Parameter(defaultValue = "true", property = "tycho.apitools.runAsJob")
 	private boolean runAsJob;
 
-	@Component
+	@Inject
 	private EclipseWorkspaceManager workspaceManager;
 
-	@Component
+	@Inject
 	private TychoProjectManager projectManager;
 
-	@Component
+	@Inject
 	private ApiApplicationResolver applicationResolver;
 
 	@Override
diff --git a/tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiFileGenerationMojo.java b/tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiFileGenerationMojo.java
index 90dbaba52a..f40b01b97b 100644
--- a/tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiFileGenerationMojo.java
+++ b/tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiFileGenerationMojo.java
@@ -21,6 +21,8 @@
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -41,7 +43,7 @@
 @Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_CLASSES, threadSafe = true)
 public class ApiFileGenerationMojo extends AbstractMojo {
 
-	@Parameter(property = "project", readonly = true)
+	@Inject
 	protected MavenProject project;
 
 	@Parameter(defaultValue = "${project.build.directory}")
diff --git a/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/BaselineMojo.java b/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/BaselineMojo.java
index 24241ba7b0..cdb0747bec 100644
--- a/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/BaselineMojo.java
+++ b/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/BaselineMojo.java
@@ -19,8 +19,9 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Repository;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -59,13 +60,10 @@ public class BaselineMojo extends AbstractMojo implements BaselineContext {
 	@Parameter(property = "baselines", name = "baselines")
 	private List<Repository> baselines;
 
-	@Component
+	@Inject
 	private P2RepositoryManager repositoryManager;
 
-	@Parameter(property = "session", readonly = true)
-	private MavenSession session;
-
-	@Parameter(property = "project", readonly = true)
+	@Inject
 	protected MavenProject project;
 
 	/**
diff --git a/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/DependencyCheckMojo.java b/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/DependencyCheckMojo.java
index 2f3f226b4e..3083dd1fe3 100644
--- a/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/DependencyCheckMojo.java
+++ b/tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/DependencyCheckMojo.java
@@ -27,6 +27,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -83,10 +85,10 @@
 @Mojo(defaultPhase = LifecyclePhase.VERIFY, name = "check-dependencies", threadSafe = true, requiresProject = true)
 public class DependencyCheckMojo extends AbstractMojo {
 
-	@Parameter(property = "project", readonly = true)
+	@Inject
 	private MavenProject project;
 
-	@Parameter(property = "session", readonly = true)
+	@Inject
 	private MavenSession session;
 
 	@Parameter(defaultValue = "${project.build.directory}/versionProblems.md", property = "tycho.dependency.check.report")
diff --git a/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/AbstractBndMojo.java b/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/AbstractBndMojo.java
index d5b5c738e1..ccb6a9755d 100644
--- a/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/AbstractBndMojo.java
+++ b/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/AbstractBndMojo.java
@@ -15,11 +15,10 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.maven.execution.MavenSession;
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.eclipse.tycho.bnd.MavenReactorRepository;
 
@@ -28,13 +27,10 @@
 
 public abstract class AbstractBndMojo extends AbstractMojo {
 
-	@Parameter(property = "project", readonly = true)
+	@Inject
 	protected MavenProject mavenProject;
 
-	@Parameter(property = "session", readonly = true)
-	protected MavenSession session;
-
-	@Component
+	@Inject
 	protected MavenReactorRepository mavenReactorRepository;
 
 	protected Workspace getWorkspace() throws MojoFailureException {
diff --git a/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/GenerateManifestMojo.java b/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/GenerateManifestMojo.java
index 0d44b72ff0..b1001feecc 100644
--- a/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/GenerateManifestMojo.java
+++ b/tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/GenerateManifestMojo.java
@@ -23,16 +23,16 @@
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.eclipse.tycho.ArtifactKey;
@@ -72,18 +72,18 @@ public class GenerateManifestMojo extends AbstractMojo {
 		return true;
 	};
 
-	@Component
+	@Inject
 	private BndPluginManager bndPluginManager;
 
-	@Parameter(property = "project", readonly = true)
+	@Inject
 	protected MavenProject mavenProject;
 
-	@Parameter(property = "session", readonly = true)
+	@Inject
 	protected MavenSession session;
 
-	@Component
+	@Inject
 	private PluginRealmHelper pluginRealmHelper;
-	@Component
+	@Inject
 	private TychoProjectManager projectManager;
 
 	@Override
diff --git a/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java b/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java
index 8dc043cb6a..4aad5b0979 100644
--- a/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java
+++ b/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java
@@ -39,6 +39,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -116,7 +118,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
 
     private static final String PREFS_FILE_PATH = ".settings" + File.separator + "org.eclipse.jdt.core.prefs";
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     protected MavenProject project;
 
     /**
@@ -131,7 +133,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
     @Parameter
     private Dependency[] extraClasspathElements;
 
-    @Parameter(property = "session", readonly = true)
+    @Inject
     private MavenSession session;
 
     /**
@@ -185,7 +187,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
     @Parameter(defaultValue = "SYSTEM")
     private JDKUsage useJDK;
 
-    @Component
+    @Inject
     private ToolchainManagerPrivate toolChainManager;
 
     /**
@@ -264,7 +266,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
     @Component(role = TychoProject.class)
     private Map<String, TychoProject> projectTypes;
 
-    @Component
+    @Inject
     private BundleReader bundleReader;
 
     /**
@@ -326,19 +328,19 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
     @Parameter
     private String log;
 
-    @Component
+    @Inject
     ToolchainProvider toolchainProvider;
 
-    @Component
+    @Inject
     private ToolchainManager toolchainManager;
 
-    @Component
+    @Inject
     private PluginRealmHelper pluginRealmHelper;
 
-    @Component
+    @Inject
     private Logger logger;
 
-    @Component
+    @Inject
     private MavenDependenciesResolver dependenciesResolver;
 
     private ExecutionEnvironment[] manifestBREEs;
@@ -349,7 +351,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
 
     private List<String> currentExcludes;
 
-    @Component
+    @Inject
     private TychoProjectManager tychoProjectManager;
 
     private Integer currentRelease;
diff --git a/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/ValidateClassPathMojo.java b/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/ValidateClassPathMojo.java
index 10046f3cf5..1324f4a5d3 100644
--- a/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/ValidateClassPathMojo.java
+++ b/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/ValidateClassPathMojo.java
@@ -14,13 +14,14 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 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.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.eclipse.tycho.ReactorProject;
@@ -36,7 +37,7 @@
 @Mojo(name = "validate-classpath", defaultPhase = LifecyclePhase.VALIDATE, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
 public class ValidateClassPathMojo extends AbstractMojo {
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     private MavenProject project;
 
     @Component(role = TychoProject.class)
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/AbstractP2Mojo.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/AbstractP2Mojo.java
index 46f774b247..35f821c6bd 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/AbstractP2Mojo.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/AbstractP2Mojo.java
@@ -14,6 +14,8 @@
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugins.annotations.Component;
@@ -31,10 +33,10 @@
 
 public abstract class AbstractP2Mojo extends AbstractMojo {
 
-    @Parameter(property = "session", readonly = true)
+    @Inject
     private MavenSession session;
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     private MavenProject project;
 
     @Parameter(property = TychoProperties.BUILD_QUALIFIER)
diff --git a/tycho-ds-plugin/src/main/java/org/eclipse/tycho/ds/DeclarativeServicesMojo.java b/tycho-ds-plugin/src/main/java/org/eclipse/tycho/ds/DeclarativeServicesMojo.java
index b8962100cc..2801fd3bbc 100644
--- a/tycho-ds-plugin/src/main/java/org/eclipse/tycho/ds/DeclarativeServicesMojo.java
+++ b/tycho-ds-plugin/src/main/java/org/eclipse/tycho/ds/DeclarativeServicesMojo.java
@@ -17,6 +17,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.apache.commons.io.FilenameUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
@@ -24,7 +26,6 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -116,19 +117,19 @@ public class DeclarativeServicesMojo extends AbstractMojo {
 	@Parameter(property = "tycho.ds.header", defaultValue = "auto")
 	private HeaderConfiguration header = HeaderConfiguration.auto;
 
-	@Parameter(property = "project", readonly = true)
+	@Inject
 	protected MavenProject project;
 
-	@Component
+	@Inject
 	private TychoProjectManager manager;
 
-	@Component
+	@Inject
 	private DeclarativeServiceConfigurationReader configurationReader;
 
-	@Component
+	@Inject
 	private PluginRealmHelper pluginRealmHelper;
 
-	@Parameter(property = "session", readonly = true)
+	@Inject
 	private MavenSession session;
 
 	@Override
diff --git a/tycho-eclipse-plugin/src/main/java/org/eclipse/tycho/eclipsebuild/AbstractEclipseBuildMojo.java b/tycho-eclipse-plugin/src/main/java/org/eclipse/tycho/eclipsebuild/AbstractEclipseBuildMojo.java
index 8d1b354039..dd02901187 100644
--- a/tycho-eclipse-plugin/src/main/java/org/eclipse/tycho/eclipsebuild/AbstractEclipseBuildMojo.java
+++ b/tycho-eclipse-plugin/src/main/java/org/eclipse/tycho/eclipsebuild/AbstractEclipseBuildMojo.java
@@ -27,13 +27,14 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Repository;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.toolchain.Toolchain;
@@ -104,25 +105,25 @@ public abstract class AbstractEclipseBuildMojo<Result extends EclipseBuildResult
 	@Parameter
 	private List<String> features;
 
-	@Parameter(property = "project", readonly = true)
+	@Inject
 	protected MavenProject project;
 
-	@Component
+	@Inject
 	protected MavenSession mavenSession;
 
-	@Component
+	@Inject
 	private EclipseWorkspaceManager workspaceManager;
 
-	@Component
+	@Inject
 	private EclipseApplicationManager eclipseApplicationManager;
 
-	@Component
+	@Inject
 	private EclipseApplicationFactory applicationFactory;
 
-	@Component
+	@Inject
 	private TychoProjectManager projectManager;
 
-	@Component
+	@Inject
 	ToolchainManager toolchainManager;
 
 
diff --git a/tycho-eclipse-plugin/src/main/java/org/eclipse/tycho/eclipserun/EclipseRunMojo.java b/tycho-eclipse-plugin/src/main/java/org/eclipse/tycho/eclipserun/EclipseRunMojo.java
index e9d3429522..ee519415fb 100644
--- a/tycho-eclipse-plugin/src/main/java/org/eclipse/tycho/eclipserun/EclipseRunMojo.java
+++ b/tycho-eclipse-plugin/src/main/java/org/eclipse/tycho/eclipserun/EclipseRunMojo.java
@@ -24,13 +24,14 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
-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;
@@ -105,7 +106,7 @@ public class EclipseRunMojo extends AbstractMojo {
 	@Parameter(defaultValue = "true")
 	private boolean clearWorkspaceBeforeLaunch;
 
-	@Parameter(property = "project")
+	@Inject
 	private MavenProject project;
 
 	/**
@@ -153,7 +154,7 @@ public class EclipseRunMojo extends AbstractMojo {
 	@Parameter
 	private List<Repository> repositories;
 
-	@Parameter(property = "session", readonly = true, required = true)
+	@Inject
 	private MavenSession session;
 
 	/**
@@ -259,25 +260,25 @@ public class EclipseRunMojo extends AbstractMojo {
 	@Parameter
 	private BundleStartLevel defaultStartLevel;
 
-	@Component
+	@Inject
 	private EquinoxInstallationFactory installationFactory;
 
-	@Component
+	@Inject
 	private EquinoxLauncher launcher;
 
-	@Component
+	@Inject
 	private ToolchainProvider toolchainProvider;
 
-	@Component()
+	@Inject()
 	P2ResolverFactory resolverFactory;
 
-	@Component
+	@Inject
 	private Logger logger;
 
-	@Component
+	@Inject
 	private ToolchainManager toolchainManager;
 
-	@Component
+	@Inject
 	private TargetPlatformFactory platformFactory;
 
 	public EclipseRunMojo() {
diff --git a/tycho-extras/target-platform-validation-plugin/src/main/java/org/eclipse/tycho/extras/tpvalidator/TPValidationMojo.java b/tycho-extras/target-platform-validation-plugin/src/main/java/org/eclipse/tycho/extras/tpvalidator/TPValidationMojo.java
index 21b6baff1a..8708c0fabc 100644
--- a/tycho-extras/target-platform-validation-plugin/src/main/java/org/eclipse/tycho/extras/tpvalidator/TPValidationMojo.java
+++ b/tycho-extras/target-platform-validation-plugin/src/main/java/org/eclipse/tycho/extras/tpvalidator/TPValidationMojo.java
@@ -23,10 +23,11 @@
 import java.util.Optional;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 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.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -59,10 +60,10 @@
 @Mojo(name = "validate-target-platform", defaultPhase = LifecyclePhase.VALIDATE)
 public class TPValidationMojo extends AbstractMojo {
 
-    @Parameter(property = "session", readonly = true)
+    @Inject
     private MavenSession session;
 
-    @Parameter(property = "project")
+    @Inject
     private MavenProject project;
 
     /**
@@ -107,19 +108,19 @@ public class TPValidationMojo extends AbstractMojo {
     @Parameter
     private String executionEnvironment;
 
-    @Component
+    @Inject
     DirectorRuntime director;
 
-    @Component
+    @Inject
     private Logger logger;
 
-    @Component
+    @Inject
     private ToolchainManager toolchainManager;
 
-    @Component
+    @Inject
     private P2ResolverFactory factory;
 
-    @Component
+    @Inject
     private TargetDefinitionVariableResolver varResolver;
 
     public void execute() throws MojoExecutionException {
diff --git a/tycho-extras/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java b/tycho-extras/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java
index 557851ac9a..a8091a0939 100644
--- a/tycho-extras/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java
+++ b/tycho-extras/tycho-custom-bundle-plugin/src/main/java/org/eclipse/tycho/extras/custombundle/CustomBundleMojo.java
@@ -23,6 +23,8 @@
 import java.util.jar.Attributes.Name;
 import java.util.jar.Manifest;
 
+import javax.inject.Inject;
+
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.execution.MavenSession;
@@ -77,10 +79,10 @@ public class CustomBundleMojo extends AbstractMojo {
 	@Parameter(required = true)
 	private List<DefaultFileSet> fileSets;
 
-	@Parameter(property = "project")
+	@Inject
 	private MavenProject project;
 
-	@Parameter(property = "session", readonly = true)
+	@Inject
 	private MavenSession session;
 
 	@Parameter
@@ -99,7 +101,7 @@ public class CustomBundleMojo extends AbstractMojo {
 	@Component(role = Archiver.class, hint = "jar")
 	private JarArchiver jarArchiver;
 
-	@Component
+	@Inject
 	private MavenProjectHelper projectHelper;
 
 	@Override
diff --git a/tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/ListDependenciesMojo.java b/tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/ListDependenciesMojo.java
index c254de7185..61f34422b1 100644
--- a/tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/ListDependenciesMojo.java
+++ b/tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/ListDependenciesMojo.java
@@ -19,6 +19,8 @@
 import java.util.Optional;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
@@ -48,7 +50,7 @@
 @Mojo(name = "list-dependencies", defaultPhase = LifecyclePhase.GENERATE_TEST_RESOURCES, requiresProject = true, threadSafe = true, requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
 public class ListDependenciesMojo extends AbstractMojo {
 
-    @Parameter(property = "project")
+    @Inject
     private MavenProject project;
 
     @Parameter(property = "skip")
@@ -57,13 +59,13 @@ public class ListDependenciesMojo extends AbstractMojo {
     @Component(role = TychoProject.class)
     private Map<String, TychoProject> projectTypes;
 
-    @Component
+    @Inject
     private PluginRealmHelper pluginRealmHelper;
 
-    @Parameter(property = "session", readonly = true)
+    @Inject
     private MavenSession session;
 
-    @Component
+    @Inject
     private TychoProjectManager projectManager;
 
     @Override
diff --git a/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/ConvertSchemaToHtmlMojo.java b/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/ConvertSchemaToHtmlMojo.java
index b2d382c414..84c6dabc81 100644
--- a/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/ConvertSchemaToHtmlMojo.java
+++ b/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/ConvertSchemaToHtmlMojo.java
@@ -23,12 +23,13 @@
 import java.util.stream.Stream;
 import java.util.stream.Stream.Builder;
 
+import javax.inject.Inject;
+
 import org.apache.maven.model.Repository;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -69,15 +70,15 @@ public class ConvertSchemaToHtmlMojo extends AbstractMojo {
 	@Parameter()
 	private String additionalSearchPaths;
 
-	@Parameter(property = "project")
+	@Inject
 	private MavenProject project;
 
 	@Parameter(property = "reactorProjects", required = true, readonly = true)
 	protected List<MavenProject> reactorProjects;
 
-	@Component
+	@Inject
 	private EclipseWorkspaceManager workspaceManager;
-	@Component
+	@Inject
 	private EclipseApplicationManager applicationManager;
 
 	@Override
diff --git a/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/JavadocMojo.java b/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/JavadocMojo.java
index f22361df23..5250a55173 100644
--- a/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/JavadocMojo.java
+++ b/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/JavadocMojo.java
@@ -21,6 +21,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.AbstractMojo;
@@ -51,8 +53,8 @@
  * <p>
  * The javadoc executable path is determined in this order:
  * <ul>
- * <li><code>executable</code> argument of the <code>javadocOptions</code> configuration
- * element, if available</li>
+ * <li><code>executable</code> argument of the <code>javadocOptions</code>
+ * configuration element, if available</li>
  * <li>active Maven toolchain</li>
  * <li><code>java.home</code> system property</li>
  * <li><code>JAVA_HOME</code> environment setting</li>
@@ -91,10 +93,10 @@ public class JavadocMojo extends AbstractMojo {
 	@Parameter(property = "cleanFirst", defaultValue = "true")
 	private boolean cleanFirst;
 
-	@Component
+	@Inject
 	private ToolchainManager toolchainManager;
 
-	@Parameter(property = "session", required = true, readonly = true)
+	@Inject
 	private MavenSession session;
 
 	@Parameter(property = "reactorProjects", required = true, readonly = true)
@@ -121,13 +123,13 @@ public class JavadocMojo extends AbstractMojo {
 	 * <li><code>doclet</code>, used as javadoc <code>-doclet</code> parameter</li>
 	 * <li><code>docletArtifacts</code>, dependencies will be resovled and added as
 	 * <code>-docletpath</code> parameter</li>
-	 * <li><code>encoding</code>, used as javadoc <code>-encoding</code> parameter (default:
-	 * <code>${project.build.sourceEncoding}</code></li>
-	 * <li><code>additionalArguments</code>, a list of additional arguments passed to
-	 * javadoc</li>
-	 * <li><code>includes</code>/<code>excludes</code>, the list of names of packages to be
-	 * included in or excluded from JavaDoc processing; use '<code>*</code>' character
-	 * as wildcard</li>
+	 * <li><code>encoding</code>, used as javadoc <code>-encoding</code> parameter
+	 * (default: <code>${project.build.sourceEncoding}</code></li>
+	 * <li><code>additionalArguments</code>, a list of additional arguments passed
+	 * to javadoc</li>
+	 * <li><code>includes</code>/<code>excludes</code>, the list of names of
+	 * packages to be included in or excluded from JavaDoc processing; use
+	 * '<code>*</code>' character as wildcard</li>
 	 * <li><code>executable</code>, the javadoc executable path to be used (see mojo
 	 * description for the default path calculation)</li>
 	 * </ul>
@@ -168,10 +170,10 @@ public class JavadocMojo extends AbstractMojo {
 	/**
 	 * Options for creating the toc files.
 	 * <ul>
-	 * <li><code>mainLabel</code>, specifies the main label of the toc file (default:
-	 * "API Reference")</li>
-	 * <li><code>mainFilename</code>, specifies the filename of the TOC file (default:
-	 * "overview-summary.html")
+	 * <li><code>mainLabel</code>, specifies the main label of the toc file
+	 * (default: "API Reference")</li>
+	 * <li><code>mainFilename</code>, specifies the filename of the TOC file
+	 * (default: "overview-summary.html")
 	 * </ul>
 	 * Example configuration:
 	 *
@@ -203,10 +205,10 @@ public class JavadocMojo extends AbstractMojo {
 	@Parameter(property = "project.build.sourceEncoding", readonly = true)
 	private String projectBuildSourceEncoding;
 
-	@Component
+	@Inject
 	private BundleReader bundleReader;
 
-	@Component
+	@Inject
 	private DocletArtifactsResolver docletArtifactsResolver;
 
 	@Component(role = TychoProject.class)
diff --git a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java
index b228af6e27..2649858cfc 100644
--- a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java
+++ b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/CompareWithBaselineMojo.java
@@ -19,6 +19,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -28,7 +30,6 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.tycho.ExecutionEnvironmentConfiguration;
 import org.eclipse.tycho.IDependencyMetadata.DependencyMetadataType;
@@ -72,10 +73,10 @@ public static enum ReportBehavior {
         fail, warn
     }
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     private MavenProject project;
 
-    @Parameter(property = "mojoExecution", readonly = true)
+    @Inject
     protected MojoExecution execution;
 
     /**
@@ -106,16 +107,13 @@ public static enum ReportBehavior {
     @Parameter(property = "onIllegalVersion", defaultValue = "fail", alias = "tycho.p2.baseline.onIllegalVersion")
     private ReportBehavior onIllegalVersion;
 
-    @Component()
+    @Inject
     P2ResolverFactory resolverFactory;
 
-    @Component
-    private Logger plexusLogger;
-
-    @Component
+    @Inject
     private TychoProjectManager projectManager;
 
-    @Component
+    @Inject
     private TargetPlatformFactory platformFactory;
 
     /**
diff --git a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java
index aceeaa8542..90cda5517d 100644
--- a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java
+++ b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/MirrorMojo.java
@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -49,16 +51,16 @@
 @Mojo(name = "mirror", threadSafe = true)
 public class MirrorMojo extends AbstractMojo {
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     private MavenProject project;
 
-    @Parameter(property = "session", readonly = true)
+    @Inject
     private MavenSession session;
 
-    @Component
+    @Inject
     MirrorApplicationService mirrorService;
 
-    @Component
+    @Inject
     private RepositoryReferenceTool repositoryReferenceTool;
 
     @Component(role = TychoProject.class)
diff --git a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java
index bc95245a7c..4e6cac562e 100644
--- a/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java
+++ b/tycho-extras/tycho-p2-extras-plugin/src/main/java/org/eclipse/tycho/plugins/p2/extras/PublishFeaturesAndBundlesMojo.java
@@ -17,13 +17,13 @@
 import java.util.Arrays;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 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;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
@@ -32,7 +32,9 @@
 /**
  * This goal invokes the feature and bundle publisher on a folder.
  *
- * @see <a href="https://wiki.eclipse.org/Equinox/p2/Publisher#Features_And_Bundles_Publisher_Application">Eclipse Wiki</a>
+ * @see <a href=
+ *      "https://wiki.eclipse.org/Equinox/p2/Publisher#Features_And_Bundles_Publisher_Application">Eclipse
+ *      Wiki</a>
  */
 @Mojo(name = "publish-features-and-bundles", threadSafe = true)
 public class PublishFeaturesAndBundlesMojo extends AbstractMojo {
@@ -85,10 +87,7 @@ public class PublishFeaturesAndBundlesMojo extends AbstractMojo {
     @Parameter(defaultValue = "")
     private String additionalArgs;
 
-    @Parameter(property = "project")
-    private MavenProject project;
-
-    @Component
+    @Inject
     private IProvisioningAgent agent;
 
     @Override
diff --git a/tycho-extras/tycho-version-bump-plugin/src/main/java/org/eclipse/tycho/versionbump/AbstractUpdateMojo.java b/tycho-extras/tycho-version-bump-plugin/src/main/java/org/eclipse/tycho/versionbump/AbstractUpdateMojo.java
index a15a98115f..5a8580f6e8 100644
--- a/tycho-extras/tycho-version-bump-plugin/src/main/java/org/eclipse/tycho/versionbump/AbstractUpdateMojo.java
+++ b/tycho-extras/tycho-version-bump-plugin/src/main/java/org/eclipse/tycho/versionbump/AbstractUpdateMojo.java
@@ -15,26 +15,18 @@
 
 import java.io.File;
 
-import org.apache.maven.execution.MavenSession;
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 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.project.MavenProject;
 
 public abstract class AbstractUpdateMojo extends AbstractMojo {
 
-    @Parameter(property = "project")
+    @Inject
     private MavenProject project;
 
-    @Component
-    private MavenSession mavenSession;
-
-    MavenSession getMavenSession() {
-        return mavenSession;
-    }
-
     public void execute() throws MojoExecutionException, MojoFailureException {
         File file = getFileToBeUpdated();
         if (file != null && file.exists()) {
diff --git a/tycho-extras/tycho-version-bump-plugin/src/main/java/org/eclipse/tycho/versionbump/UpdateTargetMojo.java b/tycho-extras/tycho-version-bump-plugin/src/main/java/org/eclipse/tycho/versionbump/UpdateTargetMojo.java
index c66836c0c0..6688db8c90 100644
--- a/tycho-extras/tycho-version-bump-plugin/src/main/java/org/eclipse/tycho/versionbump/UpdateTargetMojo.java
+++ b/tycho-extras/tycho-version-bump-plugin/src/main/java/org/eclipse/tycho/versionbump/UpdateTargetMojo.java
@@ -34,7 +34,6 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecution;
 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.mojo.versions.api.Segment;
@@ -161,10 +160,10 @@ public class UpdateTargetMojo extends AbstractUpdateMojo {
     @Parameter(defaultValue = "true", property = "tycho.updatetarget.updateEmptyVersion")
     private boolean updateEmptyVersion;
 
-    @Component
+    @Inject
     private MavenSession mavenSession;
 
-    @Parameter(defaultValue = "${mojoExecution}", required = true, readonly = true)
+    @Inject
     private MojoExecution mojoExecution;
 
     @Inject
diff --git a/tycho-gpg-plugin/src/main/java/org/eclipse/tycho/gpg/SignRepositoryArtifactsMojo.java b/tycho-gpg-plugin/src/main/java/org/eclipse/tycho/gpg/SignRepositoryArtifactsMojo.java
index f9d7851d59..cb14faeb38 100644
--- a/tycho-gpg-plugin/src/main/java/org/eclipse/tycho/gpg/SignRepositoryArtifactsMojo.java
+++ b/tycho-gpg-plugin/src/main/java/org/eclipse/tycho/gpg/SignRepositoryArtifactsMojo.java
@@ -15,10 +15,12 @@
 import java.util.Arrays;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import org.apache.maven.archiver.MavenArchiver;
 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.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -26,8 +28,6 @@
 import org.apache.maven.plugins.gpg.ProxySignerWithPublicKeyAccess;
 import org.apache.maven.project.MavenProject;
 import org.bouncycastle.openpgp.PGPSignature;
-import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.xz.XZArchiver;
 import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
 import org.eclipse.equinox.internal.p2.artifact.processors.pgp.PGPSignatureVerifier;
@@ -64,7 +64,7 @@ enum PGPKeyBehavior {
     /**
      * The maven project.
      */
-    @Parameter(defaultValue = "${project}", readonly = true, required = true)
+    @Inject
     protected MavenProject project;
 
     /**
@@ -148,16 +148,18 @@ enum PGPKeyBehavior {
     @Parameter(defaultValue = "${project.build.outputTimestamp}")
     private String outputTimestamp;
 
-    @Component(role = UnArchiver.class, hint = "zip")
+    @Inject
+    @Named("zip")
     private ZipUnArchiver zipUnArchiver;
 
-    @Component(role = Archiver.class, hint = "xz")
+    @Inject
+    @Named("xz")
     private XZArchiver xzArchiver;
 
-    @Component
+    @Inject
     private SignedContentFactory signedContentFactory;
 
-    @Component
+    @Inject
     private P2RepositoryManager repositoryManager;
 
     @Override
diff --git a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java
index 5b012d0976..c9ceaa3879 100644
--- a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java
+++ b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java
@@ -15,10 +15,11 @@
 import java.io.File;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.eclipse.tycho.BuildDirectory;
@@ -29,10 +30,10 @@
 
 abstract class AbstractProductMojo extends AbstractMojo {
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     private MavenProject project;
 
-    @Parameter(property = "session", readonly = true)
+    @Inject
     private MavenSession session;
 
     /**
@@ -42,8 +43,8 @@ abstract class AbstractProductMojo extends AbstractMojo {
      * <p>
      * If the project contains more than one product file, you need to choose for which ones you
      * want to create distribution archives. If you choose to install more than one product, you
-     * need to specify the <code>attachId</code> (which becomes a part of the classifier) to make the
-     * classifiers unique. Example:
+     * need to specify the <code>attachId</code> (which becomes a part of the classifier) to make
+     * the classifiers unique. Example:
      * 
      * <pre>
      * &lt;plugin&gt;
@@ -101,9 +102,9 @@ abstract class AbstractProductMojo extends AbstractMojo {
      * <li><code>rootFolder</code> - The path where the installed product shall be stored in the
      * archive, e.g. "eclipse". By default, the product is stored in the archive root.</li>
      * <li><code>rootFolders</code> - OS-specific installation root folders, overriding
-     * <code>rootFolder</code>. Allowed children are <code>&lt;macosx&gt;</code>, <code>&lt;win32&gt;</code>,
-     * <code>&lt;linux&gt;</code> and <code>&lt;freebsd&gt;</code> or any other OS supported by p2. Since
-     * 0.18.0</li>
+     * <code>rootFolder</code>. Allowed children are <code>&lt;macosx&gt;</code>,
+     * <code>&lt;win32&gt;</code>, <code>&lt;linux&gt;</code> and <code>&lt;freebsd&gt;</code> or
+     * any other OS supported by p2. Since 0.18.0</li>
      * </ul>
      * 
      */
@@ -117,7 +118,7 @@ abstract class AbstractProductMojo extends AbstractMojo {
     @Parameter(property = "p2.timeout", defaultValue = "0")
     private int forkedProcessTimeoutInSeconds;
 
-    @Component
+    @Inject
     private TychoProjectManager projectManager;
 
     int getForkedProcessTimeoutInSeconds() {
diff --git a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/AbstractP2MetadataMojo.java b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/AbstractP2MetadataMojo.java
index 0d4b98853d..542d423d6b 100644
--- a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/AbstractP2MetadataMojo.java
+++ b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/AbstractP2MetadataMojo.java
@@ -18,6 +18,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -30,7 +32,7 @@
 
 public abstract class AbstractP2MetadataMojo extends AbstractMojo {
 
-    @Parameter(property = "project", required = true, readonly = true)
+    @Inject
     protected MavenProject project;
 
     /**
diff --git a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/DependenciesTreeMojo.java b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/DependenciesTreeMojo.java
index a12ce7ed0b..d77b24d456 100644
--- a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/DependenciesTreeMojo.java
+++ b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/DependenciesTreeMojo.java
@@ -19,12 +19,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 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.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.eclipse.core.runtime.CoreException;
@@ -43,13 +43,13 @@
  */
 @Mojo(name = "dependency-tree", requiresProject = true, threadSafe = true, requiresDependencyCollection = ResolutionScope.TEST)
 public class DependenciesTreeMojo extends AbstractMojo {
-    @Parameter(property = "project")
+    @Inject
     private MavenProject project;
 
-    @Component
+    @Inject
     private P2DependencyTreeGenerator generator;
 
-    @Component
+    @Inject
     private TychoProjectManager projectManager;
 
     @Override
diff --git a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/P2MetadataMojo.java b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/P2MetadataMojo.java
index 66639bf382..e4fb67a33c 100644
--- a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/P2MetadataMojo.java
+++ b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/P2MetadataMojo.java
@@ -20,6 +20,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -45,16 +47,16 @@
 public class P2MetadataMojo extends AbstractMojo {
     private static final Object LOCK = new Object();
 
-    @Parameter(property = "project")
+    @Inject
     protected MavenProject project;
 
     @Parameter(defaultValue = "true")
     protected boolean attachP2Metadata;
 
-    @Component
+    @Inject
     protected MavenProjectHelper projectHelper;
 
-    @Component
+    @Inject
     P2Generator p2generator;
 
     /**
diff --git a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/UpdateLocalIndexMojo.java b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/UpdateLocalIndexMojo.java
index fe1c4e3bf5..21dc04d49d 100644
--- a/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/UpdateLocalIndexMojo.java
+++ b/tycho-p2-plugin/src/main/java/org/eclipse/tycho/plugins/p2/UpdateLocalIndexMojo.java
@@ -14,12 +14,12 @@
 
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 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;
 import org.eclipse.tycho.p2.repository.GAV;
 import org.eclipse.tycho.p2.repository.LocalRepositoryP2Indices;
@@ -27,10 +27,10 @@
 @Mojo(name = "update-local-index", threadSafe = true)
 public class UpdateLocalIndexMojo extends AbstractMojo {
 
-    @Parameter(property = "project", readonly = true, required = true)
+    @Inject
     private MavenProject project;
 
-    @Component
+    @Inject
     private LocalRepositoryP2Indices p2index;
 
     @Override
diff --git a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/MavenP2SiteMojo.java b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/MavenP2SiteMojo.java
index 603c26fb72..54561f38e7 100644
--- a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/MavenP2SiteMojo.java
+++ b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/MavenP2SiteMojo.java
@@ -34,6 +34,8 @@
 import java.util.stream.Stream;
 import java.util.stream.Stream.Builder;
 
+import javax.inject.Inject;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
@@ -47,7 +49,6 @@
 import org.apache.maven.plugin.MojoExecution;
 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.plugins.annotations.ResolutionScope;
@@ -125,10 +126,10 @@ public class MavenP2SiteMojo extends AbstractMojo {
     private static final List<String> DEFAULT_KEY_SERVER = List.of(PGPService.UBUNTU_KEY_SERVER,
             PGPService.MAVEN_CENTRAL_KEY_SERVER);
 
-    @Parameter(defaultValue = "${project}", readonly = true, required = true)
+    @Inject
     private MavenProject project;
 
-    @Parameter(defaultValue = "${session}", readonly = true, required = true)
+    @Inject
     private MavenSession session;
 
     /**
@@ -190,18 +191,18 @@ public class MavenP2SiteMojo extends AbstractMojo {
     @Parameter(defaultValue = "${project.build.outputTimestamp}")
     private String outputTimestamp;
 
-    @Component
+    @Inject
     private Logger logger;
-    @Component
+    @Inject
     private RepositorySystem repositorySystem;
 
-    @Component
+    @Inject
     private MavenProjectHelper projectHelper;
 
-    @Component
+    @Inject
     private IProvisioningAgent agent;
 
-    @Component
+    @Inject
     private PGPService pgpService;
 
     /**
@@ -234,7 +235,7 @@ public class MavenP2SiteMojo extends AbstractMojo {
     @Parameter(defaultValue = INCLUDE_PGP_DEFAULT + "")
     private boolean includePGPSignature = INCLUDE_PGP_DEFAULT;
 
-    @Parameter(property = "mojoExecution", readonly = true)
+    @Inject
     MojoExecution execution;
 
     @Override
diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/AbstractVersionMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/AbstractVersionMojo.java
index d395de3e7f..8b88193135 100644
--- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/AbstractVersionMojo.java
+++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/AbstractVersionMojo.java
@@ -15,6 +15,8 @@
 import java.io.File;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -28,7 +30,7 @@
 
 public abstract class AbstractVersionMojo extends AbstractMojo {
 
-    @Parameter(property = "project", required = true, readonly = true)
+	@Inject
     protected MavenProject project;
 
     @Parameter(property = "project.packaging", required = true, readonly = true)
@@ -37,7 +39,7 @@ public abstract class AbstractVersionMojo extends AbstractMojo {
     @Component(role = TychoProject.class)
     protected Map<String, TychoProject> projectTypes;
 
-	@Component
+	@Inject
 	BuildContext buildContext;
 
     protected String getOSGiVersion() {
diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/BuildQualifierMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/BuildQualifierMojo.java
index 899b237e5a..6c5b791f9d 100644
--- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/BuildQualifierMojo.java
+++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/BuildQualifierMojo.java
@@ -22,6 +22,8 @@
 import java.util.Map;
 import java.util.TimeZone;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
@@ -96,7 +98,7 @@ public class BuildQualifierMojo extends AbstractVersionMojo {
 
 	static final String DEFAULT_DATE_FORMAT = "yyyyMMddHHmm";
 
-	@Parameter(property = "session", readonly = true)
+	@Inject
     protected MavenSession session;
 
     /**
@@ -120,13 +122,13 @@ public class BuildQualifierMojo extends AbstractVersionMojo {
 	@Parameter(property = "tycho.buildqualifier.provider")
     protected String timestampProvider;
 
-    @Parameter(property = "mojoExecution", readonly = true)
+	@Inject
     protected MojoExecution execution;
 
 	@Component(role = BuildTimestampProvider.class)
 	protected Map<String, BuildTimestampProvider> timestampProviders;
 
-	@Component
+	@Inject
 	private BuildPropertiesParser buildPropertiesParser;
 
 	/**
diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java
index a7cbccba4f..84255d5e40 100644
--- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java
+++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java
@@ -20,6 +20,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -47,10 +49,10 @@ public abstract class AbstractTychoPackagingMojo extends AbstractMojo {
 	@Parameter(property = "project.build.directory", required = true)
 	protected File buildDirectory;
 
-    @Parameter(property = "session", readonly = true)
+	@Inject
     protected MavenSession session;
 
-    @Parameter(property = "project", readonly = true)
+	@Inject
     protected MavenProject project;
 
     @Parameter(defaultValue = "true")
@@ -97,16 +99,16 @@ public abstract class AbstractTychoPackagingMojo extends AbstractMojo {
     @Parameter(defaultValue = "false")
     protected boolean skip;
 
-    @Component
+	@Inject
     protected PlexusContainer plexus;
 
-    @Component
+	@Inject
     protected MavenProjectHelper projectHelper;
 
     @Component(role = TychoProject.class)
     private Map<String, TychoProject> projectTypes;
 
-    @Component
+	@Inject
     private IncludeValidationHelper includeValidationHelper;
 
     /**
diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackageTargetDefinitionMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackageTargetDefinitionMojo.java
index f5f2172c7c..d572f454b8 100644
--- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackageTargetDefinitionMojo.java
+++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackageTargetDefinitionMojo.java
@@ -15,14 +15,14 @@
 
 import java.io.File;
 
+import javax.inject.Inject;
+
 import org.apache.commons.io.FilenameUtils;
 import org.apache.maven.plugin.AbstractMojo;
 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.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
 import org.eclipse.tycho.core.resolver.DefaultTargetPlatformConfigurationReader;
@@ -35,10 +35,10 @@
 @Mojo(name = "package-target-definition", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true)
 public class PackageTargetDefinitionMojo extends AbstractMojo {
 
-    @Parameter(property = "project", required = true, readonly = true)
+	@Inject
     private MavenProject project;
 
-    @Component
+	@Inject
     MavenProjectHelper projectHelper;
 
     @Override
diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/UpdateConsumerPomMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/UpdateConsumerPomMojo.java
index f1c0b9b6ac..632f2c7203 100644
--- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/UpdateConsumerPomMojo.java
+++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/UpdateConsumerPomMojo.java
@@ -27,6 +27,8 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
@@ -41,7 +43,6 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -67,22 +68,22 @@ public class UpdateConsumerPomMojo extends AbstractMojo {
 
 	private static final String POLYGLOT_POM_TYCHO = ".polyglot.pom.tycho";
 
-	@Parameter(property = "project", readonly = true, required = true)
+	@Inject
 	protected MavenProject project;
 
-	@Parameter(defaultValue = "${session}", readonly = true, required = true)
+	@Inject
 	private MavenSession session;
 
-	@Component(role = ModelWriter.class)
+	@Inject
 	protected ModelWriter modelWriter;
 
-	@Component(role = ModelReader.class)
+	@Inject
 	protected ModelReader modelReader;
 
-	@Component
+	@Inject
 	private Map<String, ArtifactCoordinateResolver> artifactCoordinateResolvers;
 
-	@Component
+	@Inject
 	ArtifactHandlerManager artifactHandlerManager;
 
 	/**
diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/VerifyPomMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/VerifyPomMojo.java
index dd949ecba1..cdb03b7c1d 100644
--- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/VerifyPomMojo.java
+++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/VerifyPomMojo.java
@@ -24,6 +24,8 @@
 import java.util.Set;
 import java.util.UUID;
 
+import javax.inject.Inject;
+
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
@@ -37,7 +39,6 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
-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;
@@ -62,10 +63,10 @@
 public class VerifyPomMojo extends AbstractMojo {
 	static final String NAME = "verify-osgi-pom";
 
-	@Parameter(defaultValue = "${session}", readonly = true, required = true)
+	@Inject
 	private MavenSession session;
 
-	@Parameter(defaultValue = "${project}", readonly = true, required = true)
+	@Inject
 	private MavenProject project;
 
 	@Parameter(property = "tycho.verify.pom")
@@ -74,10 +75,10 @@ public class VerifyPomMojo extends AbstractMojo {
 	@Parameter(property = "tycho.verify.failOnError")
 	private boolean failOnError;
 
-	@Component
+	@Inject
 	private RepositorySystem repositorySystem;
 
-	@Component
+	@Inject
 	private ModelReader modelReader;
 
 	@Override
diff --git a/tycho-repository-plugin/src/main/java/org/eclipse/tycho/repository/plugin/PackageRepositoryMojo.java b/tycho-repository-plugin/src/main/java/org/eclipse/tycho/repository/plugin/PackageRepositoryMojo.java
index dde6df9824..e040d8d504 100644
--- a/tycho-repository-plugin/src/main/java/org/eclipse/tycho/repository/plugin/PackageRepositoryMojo.java
+++ b/tycho-repository-plugin/src/main/java/org/eclipse/tycho/repository/plugin/PackageRepositoryMojo.java
@@ -19,6 +19,9 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import org.apache.commons.io.FilenameUtils;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
@@ -34,7 +37,6 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
-import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
@@ -55,7 +57,7 @@ public class PackageRepositoryMojo extends AbstractMojo implements RepositoryCon
 
 	static final String PARAMETER_REPOSITORY_TYPE = "repositoryType";
 
-	@Parameter(property = "session", readonly = true)
+	@Inject
 	protected MavenSession session;
 
 	/**
@@ -69,7 +71,7 @@ public class PackageRepositoryMojo extends AbstractMojo implements RepositoryCon
 	@Parameter(defaultValue = "${project.build.directory}")
 	private File destination;
 
-	@Parameter(property = "project", readonly = true)
+	@Inject
 	private MavenProject project;
 
 	/**
@@ -91,7 +93,7 @@ public class PackageRepositoryMojo extends AbstractMojo implements RepositoryCon
 	@Parameter(defaultValue = DEFAULT_REPOSITORY_TYPE, name = PARAMETER_REPOSITORY_TYPE)
 	private String repositoryType;
 
-	@Parameter(property = "mojoExecution", readonly = true)
+	@Inject
 	MojoExecution execution;
 
 	/**
@@ -110,13 +112,14 @@ public class PackageRepositoryMojo extends AbstractMojo implements RepositoryCon
 	@Parameter(defaultValue = "${project.build.outputTimestamp}")
 	private String outputTimestamp;
 
-	@Component(role = Archiver.class, hint = "zip")
+	@Inject
+	@Named("zip")
 	private ZipArchiver zipArchiver;
 
 	@Component(role = RepositoryGenerator.class)
 	private Map<String, RepositoryGenerator> generators;
 
-	@Component
+	@Inject
 	private MavenProjectHelper mavenProjectHelper;
 
 	@Override
diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/AbstractSourceJarMojo.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/AbstractSourceJarMojo.java
index 4c5209c273..8225ccd3b5 100644
--- a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/AbstractSourceJarMojo.java
+++ b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/AbstractSourceJarMojo.java
@@ -26,6 +26,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
@@ -91,19 +94,20 @@ public abstract class AbstractSourceJarMojo extends AbstractMojo {
     /**
      * The Maven Project Object
      */
-    @Parameter(property = "project", readonly = true, required = true)
+    @Inject
     protected MavenProject project;
 
     /**
      * The Maven Session Object
      */
-    @Parameter(property = "session", readonly = true)
+    @Inject
     protected MavenSession session;
 
     /**
      * The Jar archiver.
      */
-    @Component(role = Archiver.class, hint = "jar")
+    @Inject
+    @Named("jar")
     private JarArchiver jarArchiver;
 
     /**
diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/PDESourceBundleMojo.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/PDESourceBundleMojo.java
index 6f088841d7..58fe9eb8b3 100644
--- a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/PDESourceBundleMojo.java
+++ b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/PDESourceBundleMojo.java
@@ -28,6 +28,8 @@
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 
+import javax.inject.Inject;
+
 import org.apache.commons.io.FilenameUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Resource;
@@ -54,7 +56,7 @@
 @Mojo(name = "generate-pde-source-header", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true)
 public class PDESourceBundleMojo extends AbstractMojo {
 
-    @Parameter(property = "project", readonly = true, required = true)
+    @Inject
     protected MavenProject project;
 
     @Parameter(property = "sourceBundleSuffix", defaultValue = ".source")
diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
index 201d6d42b1..49178f9093 100644
--- a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
+++ b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
@@ -26,6 +26,8 @@
 import java.util.Properties;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.execution.MavenSession;
@@ -114,7 +116,7 @@ public enum MissingSourcesAction {
 
     private static final String GEN_DIR = "sources-feature";
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     private MavenProject project;
 
     /**
@@ -188,7 +190,7 @@ public enum MissingSourcesAction {
     @Parameter(defaultValue = "true")
     protected boolean useDefaultExcludes;
 
-    @Parameter(property = "session", readonly = true)
+    @Inject
     private MavenSession session;
 
     /**
@@ -209,7 +211,7 @@ public enum MissingSourcesAction {
     @Parameter
     private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
 
-    @Component
+    @Inject
     private BuildPropertiesParser buildPropertiesParser;
 
     /**
@@ -222,19 +224,19 @@ public enum MissingSourcesAction {
     @Component(role = Archiver.class, hint = "jar")
     private JarArchiver jarArchiver;
 
-    @Component
+    @Inject
     private MavenProjectHelper projectHelper;
 
-    @Component
+    @Inject
     private LicenseFeatureHelper licenseFeatureHelper;
 
-    @Component()
+    @Inject()
     P2ResolverFactory factory;
 
-    @Component
+    @Inject
     private Logger logger;
 
-    @Component
+    @Inject
     private TychoProjectManager projectManager;
 
     @Override
diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/AbstractTestMojo.java b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/AbstractTestMojo.java
index 4b55b7666d..5e654380f0 100644
--- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/AbstractTestMojo.java
+++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/AbstractTestMojo.java
@@ -31,6 +31,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import javax.inject.Inject;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.maven.artifact.Artifact;
@@ -87,7 +89,7 @@ public abstract class AbstractTestMojo extends AbstractMojo {
     @Parameter(property = "tycho.surefire.deleteWorkDir")
     private boolean deleteWorkDirAfterTest;
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     protected MavenProject project;
 
     /**
@@ -197,16 +199,16 @@ public abstract class AbstractTestMojo extends AbstractMojo {
     @Parameter(property = "tycho.printBundles", defaultValue = "false")
     protected boolean printBundles;
 
-    @Parameter(property = "session", readonly = true, required = true)
+    @Inject
     protected MavenSession session;
 
-    @Component
+    @Inject
     protected TychoProjectManager projectManager;
 
-    @Component
+    @Inject
     protected ToolchainProvider toolchainProvider;
 
-    @Component
+    @Inject
     protected BuildPropertiesParser buildPropertiesParser;
 
     @Component(role = TychoProject.class, hint = "eclipse-plugin")
diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/BndTestMojo.java b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/BndTestMojo.java
index 89fc8fd40f..6bdea89907 100644
--- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/BndTestMojo.java
+++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/BndTestMojo.java
@@ -24,11 +24,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.failsafe.util.FailsafeSummaryXmlUtils;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -191,23 +192,23 @@ public class BndTestMojo extends AbstractTestMojo {
     @Parameter(defaultValue = ENGINES_DEFAULT, required = true)
     private String testEngines;
 
-    @Component
+    @Inject
     private BundleReader bundleReader;
 
-    @Component
+    @Inject
     private ProjectDependenciesResolver resolver;
 
-    @Component
+    @Inject
     @SuppressWarnings("deprecation")
     private org.apache.maven.artifact.factory.ArtifactFactory artifactFactory;
 
     @Parameter(defaultValue = "${repositorySystemSession}", readonly = true, required = true)
     private RepositorySystemSession repositorySession;
 
-    @Component
+    @Inject
     private RepositorySystem repositorySystem;
 
-    @Component
+    @Inject
     private MavenBundleResolver mavenBundleResolver;
 
     @Override
diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TychoIntegrationTestMojo.java b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TychoIntegrationTestMojo.java
index 60f1755c2a..72f52c4b2c 100644
--- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TychoIntegrationTestMojo.java
+++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TychoIntegrationTestMojo.java
@@ -20,6 +20,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
@@ -97,7 +99,7 @@ public class TychoIntegrationTestMojo extends AbstractEclipseTestMojo {
     @Parameter(defaultValue = "${project.build.directory}/failsafe-reports", required = true)
     private File reportDirectory;
 
-    @Parameter(defaultValue = "${plugin}", readonly = true, required = true)
+    @Inject
     private PluginDescriptor pluginDescriptor;
 
     @Parameter(defaultValue = "${project.pluginArtifactRepositories}", readonly = true, required = true)
diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TychoVerifyMojo.java b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TychoVerifyMojo.java
index cf06f5a250..03ba00b8a4 100644
--- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TychoVerifyMojo.java
+++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TychoVerifyMojo.java
@@ -12,6 +12,8 @@
  ******************************************************************************/
 package org.eclipse.tycho.surefire;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.failsafe.VerifyMojo;
@@ -27,7 +29,7 @@
 @Mojo(name = "verify", defaultPhase = LifecyclePhase.VERIFY, threadSafe = true)
 public class TychoVerifyMojo extends VerifyMojo {
 
-    @Parameter(property = "project", readonly = true)
+    @Inject
     protected MavenProject project;
 
     @Parameter(property = "tycho.verify-test.packaging", defaultValue = PackagingType.TYPE_ECLIPSE_PLUGIN)
diff --git a/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/AbstractChangeMojo.java b/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/AbstractChangeMojo.java
index 1d11df5e86..aacf0936c3 100644
--- a/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/AbstractChangeMojo.java
+++ b/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/AbstractChangeMojo.java
@@ -19,11 +19,12 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 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.eclipse.tycho.versions.engine.ProjectMetadataReader;
 import org.eclipse.tycho.versions.engine.VersionsEngine;
@@ -48,13 +49,13 @@ public abstract class AbstractChangeMojo extends AbstractMojo {
     @Parameter(property = "modules")
     private String modules;
 
-    @Component
+    @Inject
     private VersionsEngine engine;
 
-    @Parameter(property = "session", readonly = true)
+    @Inject
     protected MavenSession session;
 
-    @Component
+    @Inject
     private ProjectMetadataReader metadataReader;
 
     @Override
diff --git a/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/UpdateEclipseMetadataMojo.java b/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/UpdateEclipseMetadataMojo.java
index 23d1c452d3..ff503e6163 100644
--- a/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/UpdateEclipseMetadataMojo.java
+++ b/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/UpdateEclipseMetadataMojo.java
@@ -14,13 +14,13 @@
 
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 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.eclipse.tycho.versions.engine.EclipseVersionUpdater;
 import org.eclipse.tycho.versions.engine.ProjectMetadataReader;
 
@@ -32,13 +32,13 @@
 public class UpdateEclipseMetadataMojo extends AbstractMojo {
     private static final Object LOCK = new Object();
 
-    @Parameter(property = "session", readonly = true)
+    @Inject
     private MavenSession session;
 
-    @Component
+    @Inject
     private ProjectMetadataReader pomReader;
 
-    @Component
+    @Inject
     private EclipseVersionUpdater metadataUpdater;
 
     @Override
diff --git a/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/UpdatePomMojo.java b/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/UpdatePomMojo.java
index 8cb3806e5d..91fea85314 100644
--- a/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/UpdatePomMojo.java
+++ b/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/UpdatePomMojo.java
@@ -15,12 +15,12 @@
 import java.io.IOException;
 import java.util.Objects;
 
+import javax.inject.Inject;
+
 import org.apache.maven.plugin.AbstractMojo;
 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;
 import org.eclipse.tycho.versions.engine.PomVersionUpdater;
 import org.eclipse.tycho.versions.engine.ProjectMetadataReader;
@@ -34,13 +34,13 @@
 public class UpdatePomMojo extends AbstractMojo {
     private static final Object LOCK = new Object();
 
-    @Parameter(defaultValue = "${project}", required = true, readonly = true)
+    @Inject
     private MavenProject project;
 
-    @Component
+    @Inject
     protected ProjectMetadataReader pomReader;
 
-    @Component
+    @Inject
     private PomVersionUpdater pomUpdater;
 
     @Override
diff --git a/tycho-wrap-plugin/src/main/java/org/eclipse/tycho/wrap/WrapMojo.java b/tycho-wrap-plugin/src/main/java/org/eclipse/tycho/wrap/WrapMojo.java
index bde6c8d374..5204240f6e 100644
--- a/tycho-wrap-plugin/src/main/java/org/eclipse/tycho/wrap/WrapMojo.java
+++ b/tycho-wrap-plugin/src/main/java/org/eclipse/tycho/wrap/WrapMojo.java
@@ -19,12 +19,13 @@
 import java.util.jar.Manifest;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecution;
 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.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -46,16 +47,16 @@ public class WrapMojo extends AbstractMojo {
 
 	private static final String[] HEADERS = { Constants.BUNDLE_SYMBOLICNAME, Constants.BUNDLE_VERSION };
 
-	@Component
+	@Inject
 	private MavenProject project;
 
-	@Parameter(defaultValue = "${settings}", readonly = true)
+	@Inject
 	Settings settings;
 
-	@Component
+	@Inject
 	private MojoExecution mojoExecution;
 
-	@Component
+	@Inject
 	private MavenProjectHelper helper;
 
 	/**