I believe I removed that about 10 minutes later :) Repeat after me: Compile, then commit.
Kristian 2013/5/8 Stephen Connolly <[email protected]> > On 7 May 2013 17:49, <[email protected]> wrote: > > > Updated Branches: > > refs/heads/master 231773324 -> 7b330f584 > > > > > > Added jsr305 annotations > > > > > > Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo > > Commit: > > http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7b330f58 > > Tree: > http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7b330f58 > > Diff: > http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7b330f58 > > > > Branch: refs/heads/master > > Commit: 7b330f5845d9952a75ff5949d5f46fa913254308 > > Parents: 2317733 > > Author: Kristian Rosenvold <[email protected]> > > Authored: Tue May 7 18:49:15 2013 +0200 > > Committer: Kristian Rosenvold <[email protected]> > > Committed: Tue May 7 18:49:15 2013 +0200 > > > > ---------------------------------------------------------------------- > > maven-surefire-common/pom.xml | 4 ++++ > > .../plugin/surefire/AbstractSurefireMojo.java | 7 +++++-- > > .../maven/plugin/surefire/ClasspathCache.java | 6 ++++-- > > .../maven/plugin/surefire/CommonReflector.java | 8 +++++--- > > .../apache/maven/plugin/surefire/ProviderInfo.java | 3 +++ > > .../surefire/booterclient/ForkConfiguration.java | 4 ++-- > > .../plugin/surefire/util/DependencyScanner.java | 4 +++- > > .../maven/plugin/surefire/util/Relocator.java | 12 ++++++++---- > > .../maven/plugin/surefire/util/ScannerUtil.java | 10 ++++++---- > > pom.xml | 6 ++++++ > > 10 files changed, 46 insertions(+), 18 deletions(-) > > ---------------------------------------------------------------------- > > > > > > > > > http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7b330f58/maven-surefire-common/pom.xml > > ---------------------------------------------------------------------- > > diff --git a/maven-surefire-common/pom.xml > b/maven-surefire-common/pom.xml > > index 1330eec..bed467b 100644 > > --- a/maven-surefire-common/pom.xml > > +++ b/maven-surefire-common/pom.xml > > @@ -91,6 +91,10 @@ > > <artifactId>commons-lang3</artifactId> > > </dependency> > > <dependency> > > + <groupId>com.google.code.findbugs</groupId> > > + <artifactId>jsr305</artifactId> > > + </dependency> > > + <dependency> > > <groupId>org.apache.maven.shared</groupId> > > <artifactId>maven-common-artifact-filters</artifactId> > > <version>1.3</version> > > > > > > > > > http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7b330f58/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 31dde5d..76da9de 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,6 +19,10 @@ package org.apache.maven.plugin.surefire.util; > > * under the License. > > */ > > > > +import com.sun.istack.internal.NotNull; > > > > Really? you sure you want this one? > > > > + > > +import javax.annotation.Nullable; > > + > > /** > > * Relocates class names when running with relocated provider > > * > > @@ -26,12 +30,12 @@ package org.apache.maven.plugin.surefire.util; > > */ > > public class Relocator > > { > > - private final String relocation; > > + private final @Nullable String relocation; > > > > private static final String relocationBase = > > "org.apache.maven.surefire."; > > > > > > - public Relocator( String relocation ) > > + public Relocator( @Nullable String relocation ) > > { > > this.relocation = relocation; > > } > > @@ -41,12 +45,12 @@ public class Relocator > > relocation = "shadefire"; > > } > > > > - private String getRelocation() > > + private @Nullable String getRelocation() > > { > > return relocation; > > } > > > > - public String relocate( String className ) > > + public @NotNull String relocate( @NotNull String className ) > > { > > if ( relocation == null ) > > { > > >
