Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1FB4AF24D for ; Tue, 7 May 2013 17:03:23 +0000 (UTC) Received: (qmail 7369 invoked by uid 500); 7 May 2013 17:03:23 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 7325 invoked by uid 500); 7 May 2013 17:03:22 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 7318 invoked by uid 99); 7 May 2013 17:03:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 May 2013 17:03:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 92B69888A00; Tue, 7 May 2013 17:03:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: krosenvold@apache.org To: commits@maven.apache.org Message-Id: <0b3028b597754acbb8c6911c2d27a883@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fixed annotation Date: Tue, 7 May 2013 17:03:22 +0000 (UTC) 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 Authored: Tue May 7 19:03:09 2013 +0200 Committer: Kristian Rosenvold 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 readListFromFile( final File file ) + @Nonnull private List readListFromFile( @Nonnull final File file ) { List 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 ) {