You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/05/07 19:03:22 UTC
git commit: Fixed annotation
Updated Branches:
refs/heads/master 7b330f584 -> ed24b09eb
Fixed annotation
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ed24b09e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ed24b09e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ed24b09e
Branch: refs/heads/master
Commit: ed24b09eb95a7be0f43a2bde56804157661ec40a
Parents: 7b330f5
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Tue May 7 19:03:09 2013 +0200
Committer: Kristian Rosenvold <kr...@apache.org>
Committed: Tue May 7 19:03:09 2013 +0200
----------------------------------------------------------------------
.../plugin/surefire/AbstractSurefireMojo.java | 9 +++++----
.../maven/plugin/surefire/util/Relocator.java | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ed24b09e/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 bb1f6ff..c77ef41 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
@@ -675,6 +675,7 @@ public abstract class AbstractSurefireMojo
private DefaultScanResult scanDependencies()
{
try {
+ //noinspection unchecked
return new DependencyScanner(
DependencyScanner.filter(project.getTestArtifacts(), getDependenciesToScan()),
getIncludeList(), getExcludeList(), getSpecificTests()).scan();
@@ -1229,7 +1230,7 @@ public abstract class AbstractSurefireMojo
return getSuiteXmlFiles() != null && getSuiteXmlFiles().length > 0;
}
- private List<String> readListFromFile( final File file )
+ @Nonnull private List<String> readListFromFile( @Nonnull final File file )
{
List<String> list;
@@ -2009,7 +2010,7 @@ public abstract class AbstractSurefireMojo
class JUnit3ProviderInfo
implements ProviderInfo
{
- public String getProviderName()
+ @Nonnull public String getProviderName()
{
return "org.apache.maven.surefire.junit.JUnit3Provider";
}
@@ -2048,7 +2049,7 @@ public abstract class AbstractSurefireMojo
this.junitDepArtifact = junitDepArtifact;
}
- public String getProviderName()
+ @Nonnull public String getProviderName()
{
return "org.apache.maven.surefire.junit4.JUnit4Provider";
}
@@ -2085,7 +2086,7 @@ public abstract class AbstractSurefireMojo
this.junitDepArtifact = junitDepArtifact;
}
- public String getProviderName()
+ @Nonnull public String getProviderName()
{
return "org.apache.maven.surefire.junitcore.JUnitCoreProvider";
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ed24b09e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
index 76da9de..d61ee20 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java
@@ -19,8 +19,8 @@ package org.apache.maven.plugin.surefire.util;
* under the License.
*/
-import com.sun.istack.internal.NotNull;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
@@ -50,7 +50,7 @@ public class Relocator
return relocation;
}
- public @NotNull String relocate( @NotNull String className )
+ public @Nonnull String relocate( @Nonnull String className )
{
if ( relocation == null )
{