Changeset 1271

Timestamp:

01/25/09 15:51:22 (3 years ago)

Author:

amandel

Message:

Update findbugs to 1.3.7

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• config/build-report.xml (modified) (3 diffs)
• config/ivy.xml (modified) (1 diff)
• lib/findbugs/annotations.jar (modified) (previous)
• lib/findbugs/bcel.jar (modified) (previous)
• lib/findbugs/findbugs-ant.jar (modified) (previous)
• lib/findbugs/findbugs.jar (modified) (previous)
• lib/findbugs/jFormatString.jar (added)
• src/xml/findbugs/findbugs.xsd (modified) (4 diffs)

trunk/CHANGES

@@ -7 +7 @@
   * Update to commons-cli 1.1
   * Update to docbook-xsl 1.73.2
-  * Update to FindBugs 1.3.3 (#45) (JRE 5 required)
+  * Update to FindBugs 1.3.7 (#45) (JRE 5 required)
   * Update to PMD 4.1
-  * Update to fb-contrib 3.4.2
+  * Update to fb-contrib 3.6.1
   * Update to Checkstyle 4.4
   * Fixed bugs: #43 #50 #53

trunk/config/build-report.xml

@@ -78 +78 @@
             <include name="default/jaxen/*.jar"/>
             <include name="default/dom4j/*.jar"/>
+            <include name="default/commons-lang/*.jar"/>
             <exclude name="**/fb-contrib.jar"/>
          </fileset>
       </path>
       <path id="findbugs.plugins">
-                  <path location="${base.dir}/lib/default/fb-contrib/fb-contrib.jar"/>
+        <path location="${base.dir}/lib/default/fb-contrib/fb-contrib.jar"/>
       </path>
       <!-- This is the auxiliary classpath used by findbugs -->   
@@ -105 +106 @@
                 maxheap="128"
                 encoding="US-ASCII"
-                cpus="1"> <!-- Increase to speed up -->
+                cpus="0"> <!-- Increase to speed up -->
          <classpath refid="jcreport.classpath"/>
          <reports>   
@@ -111 +112 @@
                     level="test"
                     sourcepath="${base.dir}/test/java"
-                    classpath="${build.dir}/classes">
+                    classpath="${build.dir}/test-classes">
             </report>    
             <report name="fawkez-prod"

trunk/config/ivy.xml

@@ -35 +35 @@
             <artifact name="fop-hyph"/>
         </dependency>
-        <dependency org="findbugs" name="findbugs" rev="1.3.5">
+        <dependency org="findbugs" name="findbugs" rev="1.3.7">
             <artifact name="bcel" type="jar"/>
             <artifact name="findbugs" type="jar"/>
             <artifact name="findbugs-ant" type="jar"/>
             <artifact name="jsr305" type="jar"/>
+            <artifact name="jFormatString" type="jar"/>
         </dependency>
+        <dependency org="commons-lang" name="commons-lang" rev="2.4" />
         <dependency org="fb-contrib" name="fb-contrib" rev="3.6.1"/>
         <dependency org="luntsys" name="luntbuild" rev="1.3.4">

trunk/src/xml/findbugs/findbugs.xsd

@@ -205 +205 @@
                  minOccurs='0' maxOccurs='unbounded'/>
    </xsd:sequence>
+   <xsd:attribute name="errors" type="xsd:unsignedInt" use="optional"/>
+   <xsd:attribute name="missingClasses" type="xsd:unsignedInt" use="optional"/>
   </xsd:complexType>
  </xsd:element>
@@ -267 +269 @@
    <xsd:attribute name='descriptor'  type='xsd:string' use='required'/>
    <xsd:attribute name='role' use='optional' type="xsd:string"/>
+   <xsd:attribute name='typeParameters' use='optional' type='xsd:string'/>
   </xsd:complexType>
  </xsd:element>
@@ -328 +331 @@
       </xsd:element>
       <xsd:element ref='PackageStats' maxOccurs='unbounded'/>
+      <xsd:element ref="FindBugsProfile" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attribute name='timestamp' use='required' type='xsd:string'/>
    <xsd:attribute name='total_classes' use='required' type='xsd:int'/>
+   <xsd:attribute name="referenced_classes" type="xsd:unsignedInt" use="optional"/>
    <xsd:attribute name='total_bugs' use='required' type='xsd:int'/>
    <xsd:attribute name='total_size' use='required' type='xsd:int'/>
    <xsd:attribute name='num_packages' use='required' type='xsd:int'/>
+   <xsd:attribute name="vm_version" type="xsd:string" use="optional"/>
    <xsd:attribute name="cpu_seconds" type="xsd:float" use="optional" />
    <xsd:attribute name="clock_seconds" type="xsd:float" use="optional" />
@@ -357 +363 @@
    <xsd:attribute name='priority_2' use='optional' type='xsd:int'/>
    <xsd:attribute name='priority_3' use='optional' type='xsd:int'/>
+  </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name='FindBugsProfile'>
+  <xsd:complexType>
+   <xsd:sequence>
+    <xsd:element ref="ClassProfile" minOccurs="0" maxOccurs="unbounded"/>
+   </xsd:sequence>
+   <xsd:attribute name='name' use='required' type='xsd:string'/>
+   <xsd:attribute name="totalMilliseconds" type="xsd:unsignedInt" use="required"/>
+   <xsd:attribute name="invocations" type="xsd:unsignedInt" use="required"/>
+   <xsd:attribute name="avgMicrosecondsPerInvocation" type="xsd:unsignedInt" use="required"/>
+  </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name='ClassProfile'>
+  <xsd:complexType>
+   <xsd:attribute name='name' use='required' type='xsd:string'/>
+   <xsd:attribute name="totalMilliseconds" type="xsd:unsignedInt" use="required"/>
+   <xsd:attribute name="invocations" type="xsd:unsignedInt" use="required"/>
+   <xsd:attribute name="avgMicrosecondsPerInvocation" type="xsd:unsignedInt" use="required"/>
   </xsd:complexType>
  </xsd:element>