Skip to content

Commit 2706936

Browse files
HannesWellHannesWell
committed
Replace readonly @parameter annotations for components with @Inject
And migrate some plain @component annotations by @Inject.
1 parent ffcd130 commit 2706936

49 files changed

Lines changed: 305 additions & 268 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎target-platform-configuration/src/main/java/org/eclipse/tycho/target/MirrorTargetPlatformMojo.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
import java.util.UUID;
2020
import java.util.stream.Collectors;
2121

22+
import javax.inject.Inject;
23+
2224
import org.apache.maven.plugin.AbstractMojo;
2325
import org.apache.maven.plugin.MojoExecutionException;
2426
import org.apache.maven.plugin.MojoFailureException;
25-
import org.apache.maven.plugins.annotations.Component;
2627
import org.apache.maven.plugins.annotations.LifecyclePhase;
2728
import org.apache.maven.plugins.annotations.Mojo;
2829
import org.apache.maven.plugins.annotations.Parameter;
@@ -63,7 +64,7 @@ public class MirrorTargetPlatformMojo extends AbstractMojo {
6364

6465
private static final SiteXMLAction CATEGORY_FACTORY = new SiteXMLAction((URI) null, (String) null);
6566

66-
@Parameter(property = "project", readonly = true)
67+
@Inject
6768
private MavenProject project;
6869

6970
@Parameter(defaultValue = "${project.build.directory}/target-platform-repository")
@@ -104,19 +105,19 @@ public class MirrorTargetPlatformMojo extends AbstractMojo {
104105
@Parameter
105106
private SlicingOptions options;
106107

107-
@Component
108+
@Inject
108109
private TargetPlatformService platformService;
109110

110-
@Component
111+
@Inject
111112
private MirrorApplicationService mirrorService;
112113

113-
@Component
114+
@Inject
114115
private ReactorRepositoryManager repositoryManager;
115116

116-
@Component
117+
@Inject
117118
private IProvisioningAgent agent;
118119

119-
@Component
120+
@Inject
120121
private InstallableUnitSlicer installableUnitSlicer;
121122

122123
@Override

‎target-platform-configuration/src/main/java/org/eclipse/tycho/target/TargetPlatformMojo.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
*******************************************************************************/
1414
package org.eclipse.tycho.target;
1515

16+
import javax.inject.Inject;
17+
1618
import org.apache.maven.plugin.AbstractMojo;
1719
import org.apache.maven.plugin.MojoExecutionException;
1820
import org.apache.maven.plugin.MojoFailureException;
19-
import org.apache.maven.plugins.annotations.Component;
2021
import org.apache.maven.plugins.annotations.Mojo;
21-
import org.apache.maven.plugins.annotations.Parameter;
2222
import org.apache.maven.project.MavenProject;
2323
import org.eclipse.tycho.ReactorProject;
2424
import org.eclipse.tycho.TargetPlatformService;
@@ -30,10 +30,10 @@ public class TargetPlatformMojo extends AbstractMojo {
3030
private static final String TARGET_PLATFORM_MOJO_EXECUTED = "TargetPlatformMojo.executed";
3131

3232
// TODO site doc (including steps & parameters handled in afterProjectsRead?)
33-
@Parameter(property = "project", readonly = true)
33+
@Inject
3434
private MavenProject project;
3535

36-
@Component
36+
@Inject
3737
private TargetPlatformService platformService;
3838

3939
@Override

‎tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiAnalysisMojo.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,16 @@
2727
import java.util.function.Function;
2828
import java.util.stream.Collectors;
2929

30+
import javax.inject.Inject;
3031
import javax.xml.parsers.ParserConfigurationException;
3132
import javax.xml.transform.TransformerException;
3233

3334
import org.apache.maven.artifact.Artifact;
34-
import org.apache.maven.execution.MavenSession;
3535
import org.apache.maven.model.Repository;
3636
import org.apache.maven.plugin.AbstractMojo;
3737
import org.apache.maven.plugin.MojoExecutionException;
3838
import org.apache.maven.plugin.MojoFailureException;
3939
import org.apache.maven.plugin.logging.Log;
40-
import org.apache.maven.plugins.annotations.Component;
4140
import org.apache.maven.plugins.annotations.LifecyclePhase;
4241
import org.apache.maven.plugins.annotations.Mojo;
4342
import org.apache.maven.plugins.annotations.Parameter;
@@ -79,7 +78,7 @@ public class ApiAnalysisMojo extends AbstractMojo {
7978
@Parameter(property = "plugin.artifacts")
8079
protected List<Artifact> pluginArtifacts;
8180

82-
@Parameter(property = "project", readonly = true)
81+
@Inject
8382
private MavenProject project;
8483

8584
@Parameter(defaultValue = "eclipse-plugin")
@@ -100,9 +99,6 @@ public class ApiAnalysisMojo extends AbstractMojo {
10099
@Parameter()
101100
private Repository apiToolsRepository;
102101

103-
@Parameter(property = "session", readonly = true, required = true)
104-
private MavenSession session;
105-
106102
@Parameter
107103
private Map<String, String> properties;
108104

@@ -159,13 +155,13 @@ public class ApiAnalysisMojo extends AbstractMojo {
159155
@Parameter(defaultValue = "true", property = "tycho.apitools.runAsJob")
160156
private boolean runAsJob;
161157

162-
@Component
158+
@Inject
163159
private EclipseWorkspaceManager workspaceManager;
164160

165-
@Component
161+
@Inject
166162
private TychoProjectManager projectManager;
167163

168-
@Component
164+
@Inject
169165
private ApiApplicationResolver applicationResolver;
170166

171167
@Override

‎tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiFileGenerationMojo.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.util.jar.JarFile;
2222
import java.util.stream.Collectors;
2323

24+
import javax.inject.Inject;
25+
2426
import org.apache.maven.plugin.AbstractMojo;
2527
import org.apache.maven.plugin.MojoExecutionException;
2628
import org.apache.maven.plugin.MojoFailureException;
@@ -41,7 +43,7 @@
4143
@Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_CLASSES, threadSafe = true)
4244
public class ApiFileGenerationMojo extends AbstractMojo {
4345

44-
@Parameter(property = "project", readonly = true)
46+
@Inject
4547
protected MavenProject project;
4648

4749
@Parameter(defaultValue = "${project.build.directory}")

‎tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/BaselineMojo.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
import java.util.Optional;
2020
import java.util.stream.Collectors;
2121

22+
import javax.inject.Inject;
23+
2224
import org.apache.maven.artifact.Artifact;
23-
import org.apache.maven.execution.MavenSession;
2425
import org.apache.maven.model.Repository;
2526
import org.apache.maven.plugin.AbstractMojo;
2627
import org.apache.maven.plugin.MojoExecutionException;
@@ -59,13 +60,10 @@ public class BaselineMojo extends AbstractMojo implements BaselineContext {
5960
@Parameter(property = "baselines", name = "baselines")
6061
private List<Repository> baselines;
6162

62-
@Component
63+
@Inject
6364
private P2RepositoryManager repositoryManager;
6465

65-
@Parameter(property = "session", readonly = true)
66-
private MavenSession session;
67-
68-
@Parameter(property = "project", readonly = true)
66+
@Inject
6967
protected MavenProject project;
7068

7169
/**

‎tycho-baseline-plugin/src/main/java/org/eclipse/tycho/baseline/DependencyCheckMojo.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import java.util.function.Function;
2828
import java.util.stream.Collectors;
2929

30+
import javax.inject.Inject;
31+
3032
import org.apache.maven.execution.MavenSession;
3133
import org.apache.maven.plugin.AbstractMojo;
3234
import org.apache.maven.plugin.MojoExecutionException;
@@ -83,10 +85,10 @@
8385
@Mojo(defaultPhase = LifecyclePhase.VERIFY, name = "check-dependencies", threadSafe = true, requiresProject = true)
8486
public class DependencyCheckMojo extends AbstractMojo {
8587

86-
@Parameter(property = "project", readonly = true)
88+
@Inject
8789
private MavenProject project;
8890

89-
@Parameter(property = "session", readonly = true)
91+
@Inject
9092
private MavenSession session;
9193

9294
@Parameter(defaultValue = "${project.build.directory}/versionProblems.md", property = "tycho.dependency.check.report")

‎tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/AbstractBndMojo.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
import java.util.List;
1616
import java.util.stream.Collectors;
1717

18-
import org.apache.maven.execution.MavenSession;
18+
import javax.inject.Inject;
19+
1920
import org.apache.maven.plugin.AbstractMojo;
2021
import org.apache.maven.plugin.MojoFailureException;
21-
import org.apache.maven.plugins.annotations.Component;
22-
import org.apache.maven.plugins.annotations.Parameter;
2322
import org.apache.maven.project.MavenProject;
2423
import org.eclipse.tycho.bnd.MavenReactorRepository;
2524

@@ -28,13 +27,10 @@
2827

2928
public abstract class AbstractBndMojo extends AbstractMojo {
3029

31-
@Parameter(property = "project", readonly = true)
30+
@Inject
3231
protected MavenProject mavenProject;
3332

34-
@Parameter(property = "session", readonly = true)
35-
protected MavenSession session;
36-
37-
@Component
33+
@Inject
3834
protected MavenReactorRepository mavenReactorRepository;
3935

4036
protected Workspace getWorkspace() throws MojoFailureException {

‎tycho-bnd-plugin/src/main/java/org/eclipse/tycho/bnd/mojos/GenerateManifestMojo.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
import java.util.regex.Matcher;
2424
import java.util.stream.Collectors;
2525

26+
import javax.inject.Inject;
27+
2628
import org.apache.maven.artifact.Artifact;
2729
import org.apache.maven.execution.MavenSession;
2830
import org.apache.maven.plugin.AbstractMojo;
2931
import org.apache.maven.plugin.MojoExecutionException;
3032
import org.apache.maven.plugin.MojoFailureException;
3133
import org.apache.maven.plugin.logging.Log;
32-
import org.apache.maven.plugins.annotations.Component;
3334
import org.apache.maven.plugins.annotations.LifecyclePhase;
3435
import org.apache.maven.plugins.annotations.Mojo;
35-
import org.apache.maven.plugins.annotations.Parameter;
3636
import org.apache.maven.plugins.annotations.ResolutionScope;
3737
import org.apache.maven.project.MavenProject;
3838
import org.eclipse.tycho.ArtifactKey;
@@ -72,18 +72,18 @@ public class GenerateManifestMojo extends AbstractMojo {
7272
return true;
7373
};
7474

75-
@Component
75+
@Inject
7676
private BndPluginManager bndPluginManager;
7777

78-
@Parameter(property = "project", readonly = true)
78+
@Inject
7979
protected MavenProject mavenProject;
8080

81-
@Parameter(property = "session", readonly = true)
81+
@Inject
8282
protected MavenSession session;
8383

84-
@Component
84+
@Inject
8585
private PluginRealmHelper pluginRealmHelper;
86-
@Component
86+
@Inject
8787
private TychoProjectManager projectManager;
8888

8989
@Override

‎tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
import java.util.stream.Collectors;
4040
import java.util.stream.Stream;
4141

42+
import javax.inject.Inject;
43+
4244
import org.apache.maven.artifact.Artifact;
4345
import org.apache.maven.artifact.handler.ArtifactHandler;
4446
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -116,7 +118,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
116118

117119
private static final String PREFS_FILE_PATH = ".settings" + File.separator + "org.eclipse.jdt.core.prefs";
118120

119-
@Parameter(property = "project", readonly = true)
121+
@Inject
120122
protected MavenProject project;
121123

122124
/**
@@ -131,7 +133,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
131133
@Parameter
132134
private Dependency[] extraClasspathElements;
133135

134-
@Parameter(property = "session", readonly = true)
136+
@Inject
135137
private MavenSession session;
136138

137139
/**
@@ -185,7 +187,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
185187
@Parameter(defaultValue = "SYSTEM")
186188
private JDKUsage useJDK;
187189

188-
@Component
190+
@Inject
189191
private ToolchainManagerPrivate toolChainManager;
190192

191193
/**
@@ -264,7 +266,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
264266
@Component(role = TychoProject.class)
265267
private Map<String, TychoProject> projectTypes;
266268

267-
@Component
269+
@Inject
268270
private BundleReader bundleReader;
269271

270272
/**
@@ -326,19 +328,19 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
326328
@Parameter
327329
private String log;
328330

329-
@Component
331+
@Inject
330332
ToolchainProvider toolchainProvider;
331333

332-
@Component
334+
@Inject
333335
private ToolchainManager toolchainManager;
334336

335-
@Component
337+
@Inject
336338
private PluginRealmHelper pluginRealmHelper;
337339

338-
@Component
340+
@Inject
339341
private Logger logger;
340342

341-
@Component
343+
@Inject
342344
private MavenDependenciesResolver dependenciesResolver;
343345

344346
private ExecutionEnvironment[] manifestBREEs;
@@ -349,7 +351,7 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo impl
349351

350352
private List<String> currentExcludes;
351353

352-
@Component
354+
@Inject
353355
private TychoProjectManager tychoProjectManager;
354356

355357
private Integer currentRelease;

‎tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/ValidateClassPathMojo.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414

1515
import java.util.Map;
1616

17+
import javax.inject.Inject;
18+
1719
import org.apache.maven.plugin.AbstractMojo;
1820
import org.apache.maven.plugin.MojoExecutionException;
1921
import org.apache.maven.plugin.MojoFailureException;
2022
import org.apache.maven.plugins.annotations.Component;
2123
import org.apache.maven.plugins.annotations.LifecyclePhase;
2224
import org.apache.maven.plugins.annotations.Mojo;
23-
import org.apache.maven.plugins.annotations.Parameter;
2425
import org.apache.maven.plugins.annotations.ResolutionScope;
2526
import org.apache.maven.project.MavenProject;
2627
import org.eclipse.tycho.ReactorProject;
@@ -36,7 +37,7 @@
3637
@Mojo(name = "validate-classpath", defaultPhase = LifecyclePhase.VALIDATE, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
3738
public class ValidateClassPathMojo extends AbstractMojo {
3839

39-
@Parameter(property = "project", readonly = true)
40+
@Inject
4041
private MavenProject project;
4142

4243
@Component(role = TychoProject.class)

0 commit comments

Comments
 (0)