BCEL6: switch to use latest BCEL6 shapshot, see findbugsproject#106

The build uses now BCEL6 snapshot built from BCEL6 trunk + 1 patch, see iloveeclipse/commons-bcel@25dfa20 and https://issues.apache.org/jira/browse/BCEL-273.
sebasjm · Jun 9, 2016 · 8eae9e5 · 8eae9e5
1 parent 070c1f3
commit 8eae9e5
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,8 +25,8 @@ findbugs/lib/findbugs-annotations.jar
 findbugs/lib/findbugs-ant.jar
 findbugs/lib/findbugs.jar
 findbugs/lib/apache-ant-1.8.3-src.zip
-findbugs/lib/asm-debug-all-6.0-SNAPSHOT.jar
-findbugs/lib/bcel-6.0-SNAPSHOT_452b5e6.jar
+findbugs/lib/asm-debug-all-*.jar
+findbugs/lib/bcel-*.jar
 findbugs/local.properties
 findbugs/optionalPlugin/
 findbugs/design/architecture/architecture.aux

diff --git a/eclipsePlugin/.classpath b/eclipsePlugin/.classpath
@@ -5,7 +5,7 @@
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
     <classpathentry kind="lib" path="lib/annotations.jar"/>
     <classpathentry kind="lib" path="lib/jFormatString.jar"/>
-    <classpathentry kind="lib" path="lib/bcel-6.0-SNAPSHOT_452b5e6.jar"/>
+    <classpathentry kind="lib" path="lib/bcel-6.0-SNAPSHOT.jar"/>
     <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
     <classpathentry kind="lib" path="lib/asm-debug-all-6.0-SNAPSHOT.jar"/>
     <classpathentry kind="lib" path="lib/jaxen-1.1.6.jar"/>

diff --git a/eclipsePlugin/META-INF/MANIFEST.MF b/eclipsePlugin/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 3.1.0.qualifier
 Bundle-ClassPath: findbugs-plugin.jar,
  lib/jsr305.jar,
  lib/annotations.jar,
- lib/bcel-6.0-SNAPSHOT_452b5e6.jar,
+ lib/bcel-6.0-SNAPSHOT.jar,
  lib/dom4j-1.6.1.jar,
  lib/jaxen-1.1.6.jar,
  lib/jFormatString.jar,

diff --git a/eclipsePlugin/build.properties b/eclipsePlugin/build.properties
@@ -16,7 +16,7 @@ bin.includes = FindBugs.png,\
                META-INF/,\
                umdFindbugs.png,\
                lib/annotations.jar,\
-               lib/bcel-6.0-SNAPSHOT_452b5e6.jar,\
+               lib/bcel-6.0-SNAPSHOT.jar,\
                lib/commons-lang-2.6.jar,\
                lib/dom4j-1.6.1.jar,\
                lib/jFormatString.jar,\

diff --git a/eclipsePlugin/build.xml b/eclipsePlugin/build.xml
@@ -64,7 +64,7 @@
 
     <!-- list of required libraries, copied from FB core project -->
     <property name="jars.required" value="jsr305.jar,
-        bcel-6.0-SNAPSHOT_452b5e6.jar,
+        bcel-6.0-SNAPSHOT.jar,
         annotations.jar,
         jFormatString.jar,
         commons-lang-2.6.jar,

diff --git a/findbugs/.classpath b/findbugs/.classpath
@@ -32,7 +32,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/jdepend-2.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant.jar" sourcepath="lib/apache-ant-1.8.3-src.zip"/>
 	<classpathentry exported="true" kind="lib" path="lib/asm-debug-all-6.0-SNAPSHOT.jar" sourcepath="/asm3"/>
-	<classpathentry exported="true" kind="lib" path="lib/bcel-6.0-SNAPSHOT_452b5e6.jar">
+	<classpathentry exported="true" kind="lib" path="lib/bcel-6.0-SNAPSHOT.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-bcel/apidocs/"/>
 		</attributes>

diff --git a/findbugs/META-INF/MANIFEST.MF b/findbugs/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-SymbolicName: findbugs
 Bundle-Version: 1.0.0
 Bundle-ClassPath: findbugs.jar,
  lib/AppleJavaExtensions.jar,
- lib/bcel-6.0-SNAPSHOT_452b5e6.jar,
+ lib/bcel-6.0-SNAPSHOT.jar,
  lib/dom4j-1.6.1.jar,
  lib/junit.jar,
  lib/asm-debug-all-6.0-SNAPSHOT.jar,

diff --git a/findbugs/build.xml b/findbugs/build.xml
@@ -447,15 +447,15 @@
               projectName="Byte code Engineering Library (BCEL)"
               outputFile="${sampleoutput.dir}/bcel.xml"
             >
-      <class location="${jar.dir}/bcel-6.0-SNAPSHOT_452b5e6.jar" />
+      <class location="${jar.dir}/bcel-6.0-SNAPSHOT.jar" />
     </findbugs>
     <findbugs home="${basedir}"
               output="xml:withMessages"
               cloud="edu.umd.cs.findbugs.cloud.appengine.findbugs-cloud"
               jvmargs="-ea -Xmx1200m"
               projectName="Byte code Engineering Library (BCEL)"
               outputFile="${sampleoutput.dir}/bcel-cloud-appengine.xml" >
-      <class location="${jar.dir}/bcel-6.0-SNAPSHOT_452b5e6.jar" />
+      <class location="${jar.dir}/bcel-6.0-SNAPSHOT.jar" />
     </findbugs>
 
 
@@ -1207,12 +1207,6 @@
       <condition property="apidoc.uptodate">
           <isset property="docs.uptodate"/>
        </condition>
-      <condition property="asm6.exists">
-          <available file="${jar.dir}/asm-debug-all-6.0-SNAPSHOT.jar" />
-      </condition>
-      <condition property="bcel6.exists">
-          <available file="${jar.dir}/bcel-6.0-SNAPSHOT_452b5e6.jar" />
-      </condition>
     </target>
 
     <target name="apiJavadoc" depends="version" unless="apidoc.uptodate">
@@ -1241,17 +1235,72 @@
         </target>
 
     <!-- Download snapshot of asm 6.0 with Java 9 support, built from SVN version 1818 from ASM_6_FUTURE branch,
-        install resulting jar in lib. -->
-    <target name="getasm6" unless="asm6.exists">
-        <get src="https://github.com/findbugsproject/findbugs/releases/download/3.1.0_preview1/asm-debug-all-6.0-SNAPSHOT.jar"
-             dest="${jar.dir}/asm-debug-all-6.0-SNAPSHOT.jar"
-         verbose="on"/>
+        install resulting jar in lib.
+
+        unless="asm6.exists"
+        -->
+
+    <scriptdef name="getAndCheckLibrary" language="javascript">
+        <attribute name="url"/>
+        <attribute name="path"/>
+        <attribute name="checksum"/>
+        <![CDATA[
+           var URL = Java.type("java.net.URL");
+           var File = Java.type("java.io.File");
+
+           var path = attributes.get("path");
+           var url = attributes.get("url");
+           var checksum = attributes.get("checksum");
+           print(path + " / " + url + " : " + checksum);
+
+           var file = new File(path);
+
+           check = project.createTask("checksum");
+           check.setFile(file);
+           check.setProperty(checksum);
+           check.setVerifyproperty("check.result");
+
+           result = false;
+           if(file.exists()){
+               print("File exists, verifying checksum...")
+               result = check.eval();
+               if(!result){
+                  print("Checksum check failed, deleting!")
+                  file.delete();
+               } else {
+                  print("Checksum check succeeded!")
+               }
+           }
+           if(result == false){
+               print("Downloading file...")
+               get = project.createTask("get");
+               get.setSrc(new URL(url));
+               get.setDest(file)
+               get.perform();
+               result = check.eval();
+               if(!result ){
+                   fail = project.createTask("fail");
+                   fail.setMessage("Download and checksum check failed for: " + path);
+                   fail.perform();
+               }
+           }
+        ]]>
+    </scriptdef>
+
+    <target name="getasm6" >
+        <getAndCheckLibrary
+            url="https://github.com/findbugsproject/findbugs/releases/download/3.1.0_preview1/asm-debug-all-6.0-SNAPSHOT.jar"
+            path="${jar.dir}/asm-debug-all-6.0-SNAPSHOT.jar"
+            checksum="6e823866918153a46337151f19b67300"
+        />
     </target>
 
-    <target name="getbcel6" unless="bcel6.exists">
-        <get src="https://github.com/findbugsproject/findbugs/files/304635/bcel-6.0-SNAPSHOT.zip"
-             dest="${jar.dir}/bcel-6.0-SNAPSHOT_452b5e6.jar"
-         verbose="on"/>
+    <target name="getbcel6">
+        <getAndCheckLibrary
+            url="https://github.com/findbugsproject/findbugs/releases/download/3.1.0_preview1/bcel-6.0-SNAPSHOT-25dfa20.jar"
+            path="${jar.dir}/bcel-6.0-SNAPSHOT.jar"
+            checksum="64687b3e6e1e0537d6df8f8065f7aee6"
+        />
     </target>
 
     <!-- Download, patch, and build a modified BCEL 5.2.  Install resulting bcel.jar in lib. -->

diff --git a/findbugs/etc/MANIFEST-findbugs.MF b/findbugs/etc/MANIFEST-findbugs.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: bcel-6.0-SNAPSHOT_452b5e6.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-6.0-SNAPSHOT.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
+Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-6.0-SNAPSHOT.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
diff --git a/findbugs/etc/MANIFEST-findbugsGUI.MF b/findbugs/etc/MANIFEST-findbugsGUI.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: bcel-6.0-SNAPSHOT_452b5e6.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-6.0-SNAPSHOT.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
+Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-6.0-SNAPSHOT.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
diff --git a/findbugs/runMaven b/findbugs/runMaven
@@ -1,5 +1,5 @@
 #! /bin/sh
-mvn install:install-file -Dfile=lib/bcel-6.0-SNAPSHOT_452b5e6.jar -DgroupId=com.google.code.findbugs -DartifactId=bcel -Dversion=6.0-SNAPSHOT -Dpackaging=jar
+mvn install:install-file -Dfile=lib/bcel-6.0-SNAPSHOT.jar -DgroupId=com.google.code.findbugs -DartifactId=bcel -Dversion=6.0-SNAPSHOT -Dpackaging=jar
 mvn install:install-file -Dfile=lib/asm-debug-all-6.0-SNAPSHOT.jar -DgroupId=org.ow2.asm -DartifactId=asm-debug-all -Dversion=6.0-SNAPSHOT -Dpackaging=jar
 mvn clean
 mvn package