Skip to content

Commit 246a23f

Browse files
fix deprecation notices for suiteXmlFiles parameter
- `@deprecated` annotation should be placed after docs ... - drop some of the unused methods
1 parent 479bf20 commit 246a23f

4 files changed

Lines changed: 2 additions & 10 deletions

File tree

maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,14 @@ public class IntegrationTestMojo extends AbstractSurefireMojo {
308308
private int rerunFailingTestsCount;
309309

310310
/**
311-
* @deprecated not supported after 3.6.0, please use groups or Junit suite support
312311
* (TestNG) List of <suiteXmlFile> elements specifying TestNG suite xml file locations. Note that
313312
* {@code suiteXmlFiles} is incompatible with several other parameters of this plugin, like
314313
* {@code includes} and {@code excludes}.<br>
315314
* This parameter is ignored if the {@code test} parameter is specified (allowing you to run a single test
316315
* instead of an entire suite).
317316
*
318317
* @since 2.2
318+
* @deprecated not supported after 3.6.0, please use groups or Junit suite support
319319
*/
320320
@Parameter(property = "failsafe.suiteXmlFiles")
321321
@Deprecated

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,4 @@ private StartupConfiguration getTestStartupConfiguration(ClassLoaderConfiguratio
279279
private File getTestSourceDirectory() {
280280
return new File("TestSrc");
281281
}
282-
283-
private List<String> getSuiteXmlFileStrings() {
284-
return Arrays.asList("A1", "A2");
285-
}
286282
}

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,4 @@ private StartupConfiguration getTestStartupConfiguration(ClassLoaderConfiguratio
206206
private File getTestSourceDirectory() {
207207
return new File("TestSrc");
208208
}
209-
210-
private String[] getSuiteXmlFileStrings() {
211-
return new String[] {"A1", "A2"};
212-
}
213209
}

maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefireMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,14 @@ public class SurefireMojo extends AbstractSurefireMojo implements SurefireReport
287287
private int failOnFlakeCount;
288288

289289
/**
290-
* @deprecated not supported after 3.6.0, please use groups or Junit suite support
291290
* (TestNG) List of &lt;suiteXmlFile&gt; elements specifying TestNG suite xml file locations. Note that
292291
* {@code suiteXmlFiles} is incompatible with several other parameters of this plugin, like
293292
* {@code includes} and {@code excludes}.<br>
294293
* This parameter is ignored if the {@code test} parameter is specified (allowing you to run a single test
295294
* instead of an entire suite).
296295
*
297296
* @since 2.2
297+
* @deprecated not supported after 3.6.0, please use groups or Junit suite support
298298
*/
299299
@Deprecated
300300
@Parameter(property = "surefire.suiteXmlFiles")

0 commit comments

Comments
 (0)