Commit b40b27b 1 parent 64795d2 commit b40b27b Copy full SHA for b40b27b
File tree 3 files changed +12
-6
lines changed
blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin
versioning/versioning-plugin
src/main/java/org/apache/aries/versioning/mojo
3 files changed +12
-6
lines changed Original file line number Diff line number Diff line change 18
18
*/
19
19
package org .apache .aries .blueprint .plugin ;
20
20
21
+ import javax .inject .Inject ;
21
22
import org .apache .aries .blueprint .plugin .model .Blueprint ;
22
23
import org .apache .aries .blueprint .plugin .model .ConflictDetected ;
23
24
import org .apache .aries .blueprint .plugin .spi .Activation ;
26
27
import org .apache .maven .plugin .AbstractMojo ;
27
28
import org .apache .maven .plugin .MojoExecutionException ;
28
29
import org .apache .maven .plugin .MojoFailureException ;
29
- import org .apache .maven .plugins .annotations .Component ;
30
30
import org .apache .maven .plugins .annotations .LifecyclePhase ;
31
31
import org .apache .maven .plugins .annotations .Mojo ;
32
32
import org .apache .maven .plugins .annotations .Parameter ;
@@ -66,7 +66,7 @@ public class GenerateMojo extends AbstractMojo {
66
66
@ Parameter
67
67
protected Set <String > namespaces ;
68
68
69
- @ Component
69
+ @ Inject
70
70
private BuildContext buildContext ;
71
71
72
72
/**
Original file line number Diff line number Diff line change 41
41
</scm >
42
42
43
43
<properties >
44
+ <javax .inject.version>1</javax .inject.version>
44
45
<maven-artifact-resolver .version>1.0</maven-artifact-resolver .version>
45
46
<maven-common-artifact-filters .version>3.4.0</maven-common-artifact-filters .version>
46
47
<maven .version>3.9.9</maven .version>
54
55
<artifactId >org.apache.aries.versioning.checker</artifactId >
55
56
<version >${org.apache.aries.versioning.checker.version} </version >
56
57
</dependency >
58
+ <dependency >
59
+ <groupId >javax.inject</groupId >
60
+ <artifactId >javax.inject</artifactId >
61
+ <version >${javax.inject.version} </version >
62
+ </dependency >
57
63
<dependency >
58
64
<groupId >org.osgi</groupId >
59
65
<artifactId >org.osgi.core</artifactId >
Original file line number Diff line number Diff line change 25
25
import java .util .List ;
26
26
import java .util .Map ;
27
27
28
+ import javax .inject .Inject ;
28
29
import org .apache .aries .util .manifest .BundleManifest ;
29
30
import org .apache .aries .versioning .check .BundleCompatibility ;
30
31
import org .apache .aries .versioning .check .BundleInfo ;
34
35
import org .apache .maven .execution .MavenSession ;
35
36
import org .apache .maven .plugin .AbstractMojo ;
36
37
import org .apache .maven .plugin .MojoExecutionException ;
37
- import org .apache .maven .plugins .annotations .Component ;
38
38
import org .apache .maven .plugins .annotations .LifecyclePhase ;
39
39
import org .apache .maven .plugins .annotations .Mojo ;
40
40
import org .apache .maven .plugins .annotations .Parameter ;
@@ -81,13 +81,13 @@ public class VersionCheckerMojo extends AbstractMojo {
81
81
@ Parameter
82
82
private List <String > excludes ;
83
83
84
- @ Component
84
+ @ Inject
85
85
private RepositorySystem repository ;
86
86
87
- @ Component
87
+ @ Inject
88
88
protected MavenProject project ;
89
89
90
- @ Component
90
+ @ Inject
91
91
private MavenSession session ;
92
92
93
93
public void execute () throws MojoExecutionException {
You can’t perform that action at this time.
0 commit comments