Merge branch 'spotbugs-master'

fix tag to pull off released findbugs tests

Author: Garvin LeClaire

README.md

@@ -24,9 +24,9 @@ Skip tests
 ```
 mvn -DskipTests=true clean install
 ```
-Run tests on findbugs test source code that is local instead of from FindBugs SVN repository
+Run tests on findbugs test source code that is local instead of from FindBugs github repository
 ```
-mvn -DtestSrc=local -DlocalTestSrc=/opt/findBugs/findbugsTestCases/src -Prun-its clean install
+mvn -DtestSrc=local -DlocalTestSrc=/opt/findBugs -Prun-its clean install
 ```
 
 Run selected tests

pom.xml

@@ -129,12 +129,12 @@
     <junitVersion>4.12</junitVersion>
     <mavenSurefireVersion>2.20</mavenSurefireVersion>
     <InfoReportsVersion>2.9</InfoReportsVersion>
+
     <findbugsTestDebug>false</findbugsTestDebug>
     <integrationTestSrc>${project.build.directory}/it-src-findbugs</integrationTestSrc>
-    <localTestSrc>${user.dir}/FindBugs/findbugsTestCases/src</localTestSrc>
-    <remoteTestSrc>scm:svn:http://findbugs.googlecode.com/svn/branches/1.3.9/findbugsTestCases/src</remoteTestSrc>
-    <!-- <remoteTestSrc>scm:svn:http://findbugs.googlecode.com/svn/trunk/findbugsTestCases/src/java/</remoteTestSrc> -->
-    <includesTestSrcPattern>**/A*.java, **/Use*.java</includesTestSrcPattern>
+    <localTestSrc>${user.dir}/FindBugs</localTestSrc>
+    <remoteTestSrc>scm:git:https://github.com/findbugsproject/findbugs/</remoteTestSrc>
+    <includesTestSrcPattern>**findbugsTestCases/src/java/A*.java, **findbugsTestCases/src/java/Use*.java, **findbugsTestCases/src/java/annotations/*.java</includesTestSrcPattern>
     <testSrc>remote</testSrc>
 
     <pmd.skip>true</pmd.skip>
@@ -583,8 +583,9 @@
         </plugins>
       </build>
     </profile>
+
     <profile>
-      <id>find-it-src-export</id>
+      <id>find-it-src-checkout</id>
       <activation>
         <!-- <file> -->
         <!-- <missing>${integrationTestSrc}/A.java</missing> -->
@@ -605,23 +606,25 @@
                 <id>prepare-integration-test-remote-findbugs-src</id>
                 <phase>pre-integration-test</phase>
                 <goals>
-                  <goal>export</goal>
+                  <goal>checkout</goal>
                 </goals>
                 <configuration>
                   <connectionUrl>${remoteTestSrc}</connectionUrl>
-                  <exportDirectory>${integrationTestSrc}</exportDirectory>
+                  <checkoutDirectory>${integrationTestSrc}</checkoutDirectory>
                   <providerImplementations>
-                    <svn>javasvn</svn>
+                    <git>jgit</git>
                   </providerImplementations>
                   <includes>${includesTestSrcPattern}</includes>
+                  <scmVersion>release-${findbugsVersion}</scmVersion>
+                  <scmVersionType>branch</scmVersionType>
                 </configuration>
               </execution>
             </executions>
             <dependencies>
               <dependency>
-                <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
-                <artifactId>maven-scm-provider-svnjava</artifactId>
-                <version>2.1.2</version>
+                <groupId>org.apache.maven.scm</groupId>
+                <artifactId>maven-scm-provider-jgit</artifactId>
+                <version>1.9.5</version>
               </dependency>
             </dependencies>
           </plugin>
@@ -657,7 +660,11 @@
                   <target>
 
                     <echo>Copying Source for Tests......</echo>
+                    <echo>Making ${integrationTestSrc}</echo>
                     <mkdir dir="${integrationTestSrc}" />
+                    <echo>Copying to ${integrationTestSrc}</echo>
+                    <echo>from ${localTestSrc}</echo>
+                    <echo>for ${includesTestSrcPattern}</echo>
                     <copy todir="${integrationTestSrc}">
                       <fileset dir="${localTestSrc}" includes="${includesTestSrcPattern}" />
                     </copy>

src/it/common.xml

@@ -53,7 +53,7 @@
   </dependencies>
 
   <build>
-    <sourceDirectory>@project.build.directory@/it-src-findbugs/java</sourceDirectory>
+    <sourceDirectory>@project.build.directory@/it-src-findbugs/findbugsTestCases/src/java</sourceDirectory>
     <testSourceDirectory>@basedir@/src/it-src/test/java</testSourceDirectory>
     <pluginManagement>
       <plugins>