Skip to content

Commit b40b27b

Browse files
authored
[MAINTENANCE] Replace deprecated @component with @Inject in maven plugins (#436)
1 parent 64795d2 commit b40b27b

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.apache.aries.blueprint.plugin;
2020

21+
import javax.inject.Inject;
2122
import org.apache.aries.blueprint.plugin.model.Blueprint;
2223
import org.apache.aries.blueprint.plugin.model.ConflictDetected;
2324
import org.apache.aries.blueprint.plugin.spi.Activation;
@@ -26,7 +27,6 @@
2627
import org.apache.maven.plugin.AbstractMojo;
2728
import org.apache.maven.plugin.MojoExecutionException;
2829
import org.apache.maven.plugin.MojoFailureException;
29-
import org.apache.maven.plugins.annotations.Component;
3030
import org.apache.maven.plugins.annotations.LifecyclePhase;
3131
import org.apache.maven.plugins.annotations.Mojo;
3232
import org.apache.maven.plugins.annotations.Parameter;
@@ -66,7 +66,7 @@ public class GenerateMojo extends AbstractMojo {
6666
@Parameter
6767
protected Set<String> namespaces;
6868

69-
@Component
69+
@Inject
7070
private BuildContext buildContext;
7171

7272
/**

versioning/versioning-plugin/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
</scm>
4242

4343
<properties>
44+
<javax.inject.version>1</javax.inject.version>
4445
<maven-artifact-resolver.version>1.0</maven-artifact-resolver.version>
4546
<maven-common-artifact-filters.version>3.4.0</maven-common-artifact-filters.version>
4647
<maven.version>3.9.9</maven.version>
@@ -54,6 +55,11 @@
5455
<artifactId>org.apache.aries.versioning.checker</artifactId>
5556
<version>${org.apache.aries.versioning.checker.version}</version>
5657
</dependency>
58+
<dependency>
59+
<groupId>javax.inject</groupId>
60+
<artifactId>javax.inject</artifactId>
61+
<version>${javax.inject.version}</version>
62+
</dependency>
5763
<dependency>
5864
<groupId>org.osgi</groupId>
5965
<artifactId>org.osgi.core</artifactId>

versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.List;
2626
import java.util.Map;
2727

28+
import javax.inject.Inject;
2829
import org.apache.aries.util.manifest.BundleManifest;
2930
import org.apache.aries.versioning.check.BundleCompatibility;
3031
import org.apache.aries.versioning.check.BundleInfo;
@@ -34,7 +35,6 @@
3435
import org.apache.maven.execution.MavenSession;
3536
import org.apache.maven.plugin.AbstractMojo;
3637
import org.apache.maven.plugin.MojoExecutionException;
37-
import org.apache.maven.plugins.annotations.Component;
3838
import org.apache.maven.plugins.annotations.LifecyclePhase;
3939
import org.apache.maven.plugins.annotations.Mojo;
4040
import org.apache.maven.plugins.annotations.Parameter;
@@ -81,13 +81,13 @@ public class VersionCheckerMojo extends AbstractMojo {
8181
@Parameter
8282
private List<String> excludes;
8383

84-
@Component
84+
@Inject
8585
private RepositorySystem repository;
8686

87-
@Component
87+
@Inject
8888
protected MavenProject project;
8989

90-
@Component
90+
@Inject
9191
private MavenSession session;
9292

9393
public void execute() throws MojoExecutionException {

0 commit comments

Comments
 (0)