Skip to content

Commit a504863

Browse files
michael-omichael-o
committed
[MPLUGIN-495] WARNINGs based on usage of @component for MavenSession/MavenProject instead of @parameter
This closes #253
1 parent 7dd3a25 commit a504863

File tree

9 files changed

+76
-344
lines changed

9 files changed

+76
-344
lines changed

‎maven-plugin-plugin/src/it/java-basic-annotations-jdk8/verify.groovy‎

Lines changed: 15 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,28 @@ assert mojo.configuration.touchFile[0].text() == '${first.touchFile}'
5353
assert mojo.configuration.touchFile[0].'@implementation' == 'java.io.File'
5454
assert mojo.configuration.touchFile[0].'@default-value' == '${project.build.directory}/touch.txt'
5555

56-
assert mojo.configuration.session[0].text() == ''
57-
assert mojo.configuration.session[0].'@implementation' == 'org.apache.maven.execution.MavenSession'
58-
assert mojo.configuration.session[0].'@default-value' == '${session}'
56+
assert mojo.requirements.requirement.size() == 6
5957

60-
assert mojo.configuration.project[0].text() == ''
61-
assert mojo.configuration.project[0].'@implementation' == 'org.apache.maven.project.MavenProject'
62-
assert mojo.configuration.project[0].'@default-value' == '${project}'
58+
assert mojo.requirements.requirement[0].role.text() == 'org.apache.maven.plugin.MojoExecution'
59+
assert mojo.requirements.requirement[0].'field-name'.text() == 'mojo'
6360

64-
assert mojo.configuration.mojo[0].text() == ''
65-
assert mojo.configuration.mojo[0].'@implementation' == 'org.apache.maven.plugin.MojoExecution'
66-
assert mojo.configuration.mojo[0].'@default-value' == '${mojoExecution}'
61+
assert mojo.requirements.requirement[1].role.text() == 'org.apache.maven.plugin.descriptor.PluginDescriptor'
62+
assert mojo.requirements.requirement[1].'field-name'.text() == 'plugin'
6763

68-
assert mojo.configuration.plugin[0].text() == ''
69-
assert mojo.configuration.plugin[0].'@implementation' == 'org.apache.maven.plugin.descriptor.PluginDescriptor'
70-
assert mojo.configuration.plugin[0].'@default-value' == '${plugin}'
64+
assert mojo.requirements.requirement[2].role.text() == 'org.apache.maven.project.MavenProject'
65+
assert mojo.requirements.requirement[2].'field-name'.text() == 'project'
7166

72-
assert mojo.configuration.settings[0].text() == ''
73-
assert mojo.configuration.settings[0].'@implementation' == 'org.apache.maven.settings.Settings'
74-
assert mojo.configuration.settings[0].'@default-value' == '${settings}'
67+
assert mojo.requirements.requirement[3].role.text() == 'org.apache.maven.project.MavenProjectHelper'
68+
assert mojo.requirements.requirement[3].'role-hint'.text() == 'test'
69+
assert mojo.requirements.requirement[3].'field-name'.text() == 'projectHelper'
7570

76-
assert mojo.requirements.requirement.size() == 1
71+
assert mojo.requirements.requirement[4].role.text() == 'org.apache.maven.execution.MavenSession'
72+
assert mojo.requirements.requirement[4].'field-name'.text() == 'session'
7773

78-
assert mojo.requirements.requirement[0].role.text() == 'org.apache.maven.project.MavenProjectHelper'
79-
assert mojo.requirements.requirement[0].'role-hint'.text() == 'test'
80-
assert mojo.requirements.requirement[0].'field-name'.text() == 'projectHelper'
74+
assert mojo.requirements.requirement[5].role.text() == 'org.apache.maven.settings.Settings'
75+
assert mojo.requirements.requirement[5].'field-name'.text() == 'settings'
8176

82-
assert mojo.parameters.parameter.size() == 8
77+
assert mojo.parameters.parameter.size() == 3
8378

8479
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "namedParam" }[0]
8580
assert parameter.name.text() == 'namedParam'
@@ -99,51 +94,6 @@ assert parameter.required.text() == 'false'
9994
assert parameter.editable.text() == 'false'
10095
assert parameter.description.text() == 'Project directory.'
10196

102-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "mojo" }[0]
103-
assert parameter.name.text() == 'mojo'
104-
assert parameter.alias.isEmpty()
105-
assert parameter.type.text() == 'org.apache.maven.plugin.MojoExecution'
106-
assert parameter.deprecated.isEmpty()
107-
assert parameter.required.text() == 'true'
108-
assert parameter.editable.text() == 'false'
109-
assert parameter.description.text() == ''
110-
111-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "plugin" }[0]
112-
assert parameter.name.text() == 'plugin'
113-
assert parameter.alias.isEmpty()
114-
assert parameter.type.text() == 'org.apache.maven.plugin.descriptor.PluginDescriptor'
115-
assert parameter.deprecated.isEmpty()
116-
assert parameter.required.text() == 'true'
117-
assert parameter.editable.text() == 'false'
118-
assert parameter.description.text() == ''
119-
120-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "project" }[0]
121-
assert parameter.name.text() == 'project'
122-
assert parameter.alias.isEmpty()
123-
assert parameter.type.text() == 'org.apache.maven.project.MavenProject'
124-
assert parameter.deprecated.isEmpty()
125-
assert parameter.required.text() == 'true'
126-
assert parameter.editable.text() == 'false'
127-
assert parameter.description.text() == ''
128-
129-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "session" }[0]
130-
assert parameter.name.text() == 'session'
131-
assert parameter.alias.isEmpty()
132-
assert parameter.type.text() == 'org.apache.maven.execution.MavenSession'
133-
assert parameter.deprecated.isEmpty()
134-
assert parameter.required.text() == 'true'
135-
assert parameter.editable.text() == 'false'
136-
assert parameter.description.text() == ''
137-
138-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "settings" }[0]
139-
assert parameter.name.text() == 'settings'
140-
assert parameter.alias.isEmpty()
141-
assert parameter.type.text() == 'org.apache.maven.settings.Settings'
142-
assert parameter.deprecated.isEmpty()
143-
assert parameter.required.text() == 'true'
144-
assert parameter.editable.text() == 'false'
145-
assert parameter.description.text() == ''
146-
14797
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "touchFile" }[0]
14898
assert parameter.name.text() == 'touchFile'
14999
assert parameter.alias.isEmpty()

‎maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/verify.groovy‎

Lines changed: 15 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,28 @@ assert mojo.configuration.touchFile[0].text() == '${first.touchFile}'
5353
assert mojo.configuration.touchFile[0].'@implementation' == 'java.io.File'
5454
assert mojo.configuration.touchFile[0].'@default-value' == '${project.build.directory}/touch.txt'
5555

56-
assert mojo.configuration.session[0].text() == ''
57-
assert mojo.configuration.session[0].'@implementation' == 'org.apache.maven.execution.MavenSession'
58-
assert mojo.configuration.session[0].'@default-value' == '${session}'
56+
assert mojo.requirements.requirement.size() == 6
5957

60-
assert mojo.configuration.project[0].text() == ''
61-
assert mojo.configuration.project[0].'@implementation' == 'org.apache.maven.project.MavenProject'
62-
assert mojo.configuration.project[0].'@default-value' == '${project}'
58+
assert mojo.requirements.requirement[0].role.text() == 'org.apache.maven.plugin.MojoExecution'
59+
assert mojo.requirements.requirement[0].'field-name'.text() == 'mojo'
6360

64-
assert mojo.configuration.mojo[0].text() == ''
65-
assert mojo.configuration.mojo[0].'@implementation' == 'org.apache.maven.plugin.MojoExecution'
66-
assert mojo.configuration.mojo[0].'@default-value' == '${mojoExecution}'
61+
assert mojo.requirements.requirement[1].role.text() == 'org.apache.maven.plugin.descriptor.PluginDescriptor'
62+
assert mojo.requirements.requirement[1].'field-name'.text() == 'plugin'
6763

68-
assert mojo.configuration.plugin[0].text() == ''
69-
assert mojo.configuration.plugin[0].'@implementation' == 'org.apache.maven.plugin.descriptor.PluginDescriptor'
70-
assert mojo.configuration.plugin[0].'@default-value' == '${plugin}'
64+
assert mojo.requirements.requirement[2].role.text() == 'org.apache.maven.project.MavenProject'
65+
assert mojo.requirements.requirement[2].'field-name'.text() == 'project'
7166

72-
assert mojo.configuration.settings[0].text() == ''
73-
assert mojo.configuration.settings[0].'@implementation' == 'org.apache.maven.settings.Settings'
74-
assert mojo.configuration.settings[0].'@default-value' == '${settings}'
67+
assert mojo.requirements.requirement[3].role.text() == 'org.apache.maven.project.MavenProjectHelper'
68+
assert mojo.requirements.requirement[3].'role-hint'.text() == 'test'
69+
assert mojo.requirements.requirement[3].'field-name'.text() == 'projectHelper'
7570

76-
assert mojo.requirements.requirement.size() == 1
71+
assert mojo.requirements.requirement[4].role.text() == 'org.apache.maven.execution.MavenSession'
72+
assert mojo.requirements.requirement[4].'field-name'.text() == 'session'
7773

78-
assert mojo.requirements.requirement[0].role.text() == 'org.apache.maven.project.MavenProjectHelper'
79-
assert mojo.requirements.requirement[0].'role-hint'.text() == 'test'
80-
assert mojo.requirements.requirement[0].'field-name'.text() == 'projectHelper'
74+
assert mojo.requirements.requirement[5].role.text() == 'org.apache.maven.settings.Settings'
75+
assert mojo.requirements.requirement[5].'field-name'.text() == 'settings'
8176

82-
assert mojo.parameters.parameter.size() == 8
77+
assert mojo.parameters.parameter.size() == 3
8378

8479
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "namedParam" }[0]
8580
assert parameter.name.text() == 'namedParam'
@@ -99,51 +94,6 @@ assert parameter.required.text() == 'false'
9994
assert parameter.editable.text() == 'false'
10095
assert parameter.description.text() == 'Project directory.'
10196

102-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "mojo" }[0]
103-
assert parameter.name.text() == 'mojo'
104-
assert parameter.alias.isEmpty()
105-
assert parameter.type.text() == 'org.apache.maven.plugin.MojoExecution'
106-
assert parameter.deprecated.isEmpty()
107-
assert parameter.required.text() == 'true'
108-
assert parameter.editable.text() == 'false'
109-
assert parameter.description.text() == ''
110-
111-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "plugin" }[0]
112-
assert parameter.name.text() == 'plugin'
113-
assert parameter.alias.isEmpty()
114-
assert parameter.type.text() == 'org.apache.maven.plugin.descriptor.PluginDescriptor'
115-
assert parameter.deprecated.isEmpty()
116-
assert parameter.required.text() == 'true'
117-
assert parameter.editable.text() == 'false'
118-
assert parameter.description.text() == ''
119-
120-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "project" }[0]
121-
assert parameter.name.text() == 'project'
122-
assert parameter.alias.isEmpty()
123-
assert parameter.type.text() == 'org.apache.maven.project.MavenProject'
124-
assert parameter.deprecated.isEmpty()
125-
assert parameter.required.text() == 'true'
126-
assert parameter.editable.text() == 'false'
127-
assert parameter.description.text() == ''
128-
129-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "session" }[0]
130-
assert parameter.name.text() == 'session'
131-
assert parameter.alias.isEmpty()
132-
assert parameter.type.text() == 'org.apache.maven.execution.MavenSession'
133-
assert parameter.deprecated.isEmpty()
134-
assert parameter.required.text() == 'true'
135-
assert parameter.editable.text() == 'false'
136-
assert parameter.description.text() == ''
137-
138-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "settings" }[0]
139-
assert parameter.name.text() == 'settings'
140-
assert parameter.alias.isEmpty()
141-
assert parameter.type.text() == 'org.apache.maven.settings.Settings'
142-
assert parameter.deprecated.isEmpty()
143-
assert parameter.required.text() == 'true'
144-
assert parameter.editable.text() == 'false'
145-
assert parameter.description.text() == ''
146-
14797
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "touchFile" }[0]
14898
assert parameter.name.text() == 'touchFile'
14999
assert parameter.alias.isEmpty()

‎maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy‎

Lines changed: 15 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -56,33 +56,28 @@ assert mojo.configuration.touchFile[0].text() == '${first.touchFile}'
5656
assert mojo.configuration.touchFile[0].'@implementation' == 'java.io.File'
5757
assert mojo.configuration.touchFile[0].'@default-value' == '${project.build.directory}/touch.txt'
5858

59-
assert mojo.configuration.session[0].text() == ''
60-
assert mojo.configuration.session[0].'@implementation' == 'org.apache.maven.execution.MavenSession'
61-
assert mojo.configuration.session[0].'@default-value' == '${session}'
59+
assert mojo.requirements.requirement.size() == 6
6260

63-
assert mojo.configuration.project[0].text() == ''
64-
assert mojo.configuration.project[0].'@implementation' == 'org.apache.maven.project.MavenProject'
65-
assert mojo.configuration.project[0].'@default-value' == '${project}'
61+
assert mojo.requirements.requirement[0].role.text() == 'org.apache.maven.plugin.MojoExecution'
62+
assert mojo.requirements.requirement[0].'field-name'.text() == 'mojo'
6663

67-
assert mojo.configuration.mojo[0].text() == ''
68-
assert mojo.configuration.mojo[0].'@implementation' == 'org.apache.maven.plugin.MojoExecution'
69-
assert mojo.configuration.mojo[0].'@default-value' == '${mojoExecution}'
64+
assert mojo.requirements.requirement[1].role.text() == 'org.apache.maven.plugin.descriptor.PluginDescriptor'
65+
assert mojo.requirements.requirement[1].'field-name'.text() == 'plugin'
7066

71-
assert mojo.configuration.plugin[0].text() == ''
72-
assert mojo.configuration.plugin[0].'@implementation' == 'org.apache.maven.plugin.descriptor.PluginDescriptor'
73-
assert mojo.configuration.plugin[0].'@default-value' == '${plugin}'
67+
assert mojo.requirements.requirement[2].role.text() == 'org.apache.maven.project.MavenProject'
68+
assert mojo.requirements.requirement[2].'field-name'.text() == 'project'
7469

75-
assert mojo.configuration.settings[0].text() == ''
76-
assert mojo.configuration.settings[0].'@implementation' == 'org.apache.maven.settings.Settings'
77-
assert mojo.configuration.settings[0].'@default-value' == '${settings}'
70+
assert mojo.requirements.requirement[3].role.text() == 'org.apache.maven.project.MavenProjectHelper'
71+
assert mojo.requirements.requirement[3].'role-hint'.text() == 'test'
72+
assert mojo.requirements.requirement[3].'field-name'.text() == 'projectHelper'
7873

79-
assert mojo.requirements.requirement.size() == 1
74+
assert mojo.requirements.requirement[4].role.text() == 'org.apache.maven.execution.MavenSession'
75+
assert mojo.requirements.requirement[4].'field-name'.text() == 'session'
8076

81-
assert mojo.requirements.requirement[0].role.text() == 'org.apache.maven.project.MavenProjectHelper'
82-
assert mojo.requirements.requirement[0].'role-hint'.text() == 'test'
83-
assert mojo.requirements.requirement[0].'field-name'.text() == 'projectHelper'
77+
assert mojo.requirements.requirement[5].role.text() == 'org.apache.maven.settings.Settings'
78+
assert mojo.requirements.requirement[5].'field-name'.text() == 'settings'
8479

85-
assert mojo.parameters.parameter.size() == 8
80+
assert mojo.parameters.parameter.size() == 3
8681

8782
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "namedParam" }[0]
8883
assert parameter.name.text() == 'namedParam'
@@ -102,51 +97,6 @@ assert parameter.required.text() == 'false'
10297
assert parameter.editable.text() == 'false'
10398
assert parameter.description.text() == 'Project directory.'
10499

105-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "mojo" }[0]
106-
assert parameter.name.text() == 'mojo'
107-
assert parameter.alias.isEmpty()
108-
assert parameter.type.text() == 'org.apache.maven.plugin.MojoExecution'
109-
assert parameter.deprecated.isEmpty()
110-
assert parameter.required.text() == 'true'
111-
assert parameter.editable.text() == 'false'
112-
assert parameter.description.text() == ''
113-
114-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "plugin" }[0]
115-
assert parameter.name.text() == 'plugin'
116-
assert parameter.alias.isEmpty()
117-
assert parameter.type.text() == 'org.apache.maven.plugin.descriptor.PluginDescriptor'
118-
assert parameter.deprecated.isEmpty()
119-
assert parameter.required.text() == 'true'
120-
assert parameter.editable.text() == 'false'
121-
assert parameter.description.text() == ''
122-
123-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "project" }[0]
124-
assert parameter.name.text() == 'project'
125-
assert parameter.alias.isEmpty()
126-
assert parameter.type.text() == 'org.apache.maven.project.MavenProject'
127-
assert parameter.deprecated.isEmpty()
128-
assert parameter.required.text() == 'true'
129-
assert parameter.editable.text() == 'false'
130-
assert parameter.description.text() == ''
131-
132-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "session" }[0]
133-
assert parameter.name.text() == 'session'
134-
assert parameter.alias.isEmpty()
135-
assert parameter.type.text() == 'org.apache.maven.execution.MavenSession'
136-
assert parameter.deprecated.isEmpty()
137-
assert parameter.required.text() == 'true'
138-
assert parameter.editable.text() == 'false'
139-
assert parameter.description.text() == ''
140-
141-
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "settings" }[0]
142-
assert parameter.name.text() == 'settings'
143-
assert parameter.alias.isEmpty()
144-
assert parameter.type.text() == 'org.apache.maven.settings.Settings'
145-
assert parameter.deprecated.isEmpty()
146-
assert parameter.required.text() == 'true'
147-
assert parameter.editable.text() == 'false'
148-
assert parameter.description.text() == ''
149-
150100
parameter = mojo.parameters.parameter.findAll{ it.name.text() == "touchFile" }[0]
151101
assert parameter.name.text() == 'touchFile'
152102
assert parameter.alias.isEmpty()

‎maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/verify.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ assert descriptorFile.isFile()
2323
def pluginDescriptor = new XmlParser().parse( descriptorFile );
2424

2525
assert pluginDescriptor.mojos.mojo.size() == 1
26-
assert pluginDescriptor.mojos.mojo.parameters.parameter.size() == 50
26+
assert pluginDescriptor.mojos.mojo.parameters.parameter.size() == 48
2727

2828
return true;

0 commit comments

Comments
 (0)