Repository: maven-surefire Updated Branches: refs/heads/master 82ecd929b -> 922afcc54
[SUREFIRE] marked classes deprecated Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/922afcc5 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/922afcc5 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/922afcc5 Branch: refs/heads/master Commit: 922afcc54b04868a29ef3159febd85978e1e4587 Parents: 82ecd92 Author: Tibor17 <tibo...@lycos.com> Authored: Tue Jan 5 22:32:09 2016 +0100 Committer: Tibor17 <tibo...@lycos.com> Committed: Tue Jan 5 22:32:09 2016 +0100 ---------------------------------------------------------------------- .../org/apache/maven/plugin/failsafe/VerifyMojo.java | 1 + .../maven/plugin/surefire/AbstractSurefireMojo.java | 2 ++ .../maven/surefire/booter/BaseProviderFactory.java | 1 + .../maven/surefire/providerapi/ProviderParameters.java | 1 + .../surefire/testset/DirectoryScannerParameters.java | 11 +++++++++-- .../org/apache/maven/surefire/testset/ResolvedTest.java | 2 ++ .../maven/surefire/util/DefaultDirectoryScanner.java | 1 + .../org/apache/maven/surefire/util/DirectoryScanner.java | 1 + .../maven/surefire/booter/ProviderConfiguration.java | 2 ++ 9 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/922afcc5/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java index 021fcb6..95f522e 100644 --- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java +++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java @@ -79,6 +79,7 @@ public class VerifyMojo * @since 2.3 * @deprecated Use -DskipTests instead. */ + @Deprecated @Parameter( property = "maven.test.skip.exec" ) private boolean skipExec; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/922afcc5/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java index 0a81557..3b3af1d 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java @@ -134,6 +134,7 @@ public abstract class AbstractSurefireMojo * @since 2.3 * @deprecated Use skipTests instead. */ + @Deprecated @Parameter( property = "maven.test.skip.exec" ) protected boolean skipExec; @@ -241,6 +242,7 @@ public abstract class AbstractSurefireMojo * * @deprecated Use systemPropertyVariables instead. */ + @Deprecated @Parameter private Properties systemProperties; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/922afcc5/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java index b33b5d0..a1de9d4 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java @@ -80,6 +80,7 @@ public class BaseProviderFactory this.insideFork = insideFork; } + @Deprecated public DirectoryScanner getDirectoryScanner() { return directoryScannerParameters == null http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/922afcc5/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java index b6e6467..a511345 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java @@ -53,6 +53,7 @@ public interface ProviderParameters * @return The directory scanner * @deprecated Use scanresult instead, as of version 2.12.2. Will be removed in next major version. */ + @Deprecated DirectoryScanner getDirectoryScanner(); /** http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/922afcc5/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java index 336ffa1..36f4b2e 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java @@ -30,10 +30,13 @@ public class DirectoryScannerParameters { private final File testClassesDirectory; + @Deprecated private final List<String> includes; + @Deprecated private final List<String> excludes; + @Deprecated private final List<String> specificTests; private final boolean failIfNoTests; @@ -51,13 +54,15 @@ public class DirectoryScannerParameters this.runOrder = runOrder; } - public DirectoryScannerParameters( File testClassesDirectory, List<String> includes, List<String> excludes, - List<String> specificTests, boolean failIfNoTests, String runOrder ) + public DirectoryScannerParameters( File testClassesDirectory, @Deprecated List<String> includes, + @Deprecated List<String> excludes, @Deprecated List<String> specificTests, + boolean failIfNoTests, String runOrder ) { this( testClassesDirectory, includes, excludes, specificTests, failIfNoTests, runOrder == null ? RunOrder.DEFAULT : RunOrder.valueOfMulti( runOrder ) ); } + @Deprecated public List<String> getSpecificTests() { return specificTests; @@ -78,6 +83,7 @@ public class DirectoryScannerParameters * * @return A list of patterns. May contain both source file designators and .class extensions. */ + @Deprecated public List<String> getIncludes() { return includes; @@ -88,6 +94,7 @@ public class DirectoryScannerParameters * * @return A list of patterns. May contain both source file designators and .class extensions. */ + @Deprecated public List<String> getExcludes() { return excludes; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/922afcc5/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java index e506c30..74c11e2 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java @@ -27,7 +27,9 @@ import java.io.File; /** * Single pattern test filter resolved from multi pattern filter -Dtest=MyTest#test,AnotherTest#otherTest. + * @deprecated will be renamed to ResolvedTestPattern */ +@Deprecated // will be renamed to ResolvedTestPattern public final class ResolvedTest { /** http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/922afcc5/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java index 38dec8a..7353165 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java @@ -34,6 +34,7 @@ import java.util.Set; * @author Karl M. Davis * @author Kristian Rosenvold */ +@Deprecated public class DefaultDirectoryScanner implements DirectoryScanner { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/922afcc5/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java index 73aa659..1fdb1d2 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java @@ -22,6 +22,7 @@ package org.apache.maven.surefire.util; /** * @author Kristian Rosenvold */ +@Deprecated public interface DirectoryScanner { /** http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/922afcc5/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java ---------------------------------------------------------------------- diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java index f4a3b42..d6d5237 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java @@ -115,11 +115,13 @@ public class ProviderConfiguration return dirScannerParams; } + @Deprecated public List getIncludes() { return dirScannerParams.getIncludes(); } + @Deprecated public List getExcludes() { return dirScannerParams.getExcludes();