[findbugs] Update to 3.0.0
richardfearn
richardfearn at fedoraproject.org
Tue Jul 8 07:51:10 UTC 2014
commit fd5a0b237df455bf7f506f1b28c6d19305c3f861
Author: Richard Fearn <richardfearn at gmail.com>
Date: Tue Jul 8 08:48:40 2014 +0100
Update to 3.0.0
.gitignore | 2 +
findbugs-ant-task-classpath.patch | 13 ++----
findbugs-build.patch | 83 +++++++++++++++++++++++++-----------
findbugs-fedora.patch | 20 ++++-----
findbugs.spec | 40 +++++++++--------
sources | 4 +-
6 files changed, 96 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 591f6a3..7d7a20d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ findbugs-1.3.9-source.zip
/findbugs-2.0.2-source.zip
/noUpdateChecks-plugin-20131026svn14849.tgz
/findbugs-2.0.3-source.zip
+/findbugs-3.0.0-source.zip
+/noUpdateChecks-plugin-20140707gitcce19ac.tgz
diff --git a/findbugs-ant-task-classpath.patch b/findbugs-ant-task-classpath.patch
index 7c91094..fe5739a 100644
--- a/findbugs-ant-task-classpath.patch
+++ b/findbugs-ant-task-classpath.patch
@@ -1,5 +1,5 @@
diff --git a/src/antTask/edu/umd/cs/findbugs/anttask/AbstractFindBugsTask.java b/src/antTask/edu/umd/cs/findbugs/anttask/AbstractFindBugsTask.java
-index 4a0714d..2d2096f 100644
+index d2983d9..3a8da76 100644
--- a/src/antTask/edu/umd/cs/findbugs/anttask/AbstractFindBugsTask.java
+++ b/src/antTask/edu/umd/cs/findbugs/anttask/AbstractFindBugsTask.java
@@ -28,6 +28,7 @@ import org.apache.tools.ant.BuildException;
@@ -10,19 +10,16 @@ index 4a0714d..2d2096f 100644
import org.apache.tools.ant.types.Reference;
/**
-@@ -308,8 +309,13 @@ public abstract class AbstractFindBugsTask extends Task {
- }
+@@ -311,7 +312,11 @@ public abstract class AbstractFindBugsTask extends Task {
File findbugsLibFindBugs = new File(findbugsLib, "findbugs.jar");
// log("executing using home dir [" + homeDir + "]");
-- if (findbugsLibFindBugs.exists())
+ if (findbugsLibFindBugs.exists()) {
- findbugsEngine.setClasspath(new Path(getProject(), findbugsLibFindBugs.getPath()));
-+ if (findbugsLibFindBugs.exists()) {
+ FileSet findbugsLibFileSet = new FileSet();
+ findbugsLibFileSet.setProject(getProject());
+ findbugsLibFileSet.setDir(findbugsLib);
+ findbugsLibFileSet.setIncludes("*.jar");
+ findbugsEngine.createClasspath().addFileset(findbugsLibFileSet);
-+ }
- else
+ } else {
throw new IllegalArgumentException("Can't find findbugs.jar in " + findbugsLib);
- findbugsEngine.createJvmarg().setValue("-Dfindbugs.home=" + homeDir.getPath());
+ }
diff --git a/findbugs-build.patch b/findbugs-build.patch
index ffd631e..7c37df8 100644
--- a/findbugs-build.patch
+++ b/findbugs-build.patch
@@ -1,5 +1,5 @@
diff --git a/build.xml b/build.xml
-index 0981cc5..bb52951 100644
+index 698b91f..1cba081 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,7 @@
@@ -10,33 +10,22 @@ index 0981cc5..bb52951 100644
<property name="plugin.dir" value="plugin"/>
<property name="build.dir" value="build"/>
<property name="junit.dir" value="build/junit"/>
-@@ -60,24 +61,23 @@
+@@ -59,13 +60,23 @@
<property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
<path id="findbugs.classpath">
-- <pathelement location="${jar.dir}/bcel.jar"/>
-- <pathelement location="${jar.dir}/dom4j-1.6.1.jar"/>
-- <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/>
-- <pathelement location="${jar.dir}/junit.jar"/>
-- <pathelement location="${jar.dir}/asm-3.3.jar"/>
-- <pathelement location="${jar.dir}/asm-commons-3.3.jar"/>
-- <pathelement location="${jar.dir}/asm-tree-3.3.jar"/>
-- <pathelement location="${jar.dir}/jaxen-1.1.6.jar"/>
-- <pathelement location="${jar.dir}/jsr305.jar"/>
-- <pathelement location="${jar.dir}/jFormatString.jar"/>
-- <pathelement location="${jar.dir}/commons-lang-2.6.jar"/>
-- <pathelement location="${jar.dir}/jcip-annotations.jar"/>
-+ <pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
-+ <pathelement location="${systemjar.dir}/dom4j.jar"/>
-+ <pathelement location="${systemjar.dir}/junit.jar"/>
-+ <pathelement location="${systemjar.dir}/objectweb-asm3/asm.jar"/>
-+ <pathelement location="${systemjar.dir}/objectweb-asm3/asm-commons.jar"/>
-+ <pathelement location="${systemjar.dir}/objectweb-asm3/asm-tree.jar"/>
-+ <pathelement location="${systemjar.dir}/jaxen.jar"/>
-+ <pathelement location="${systemjar.dir}/jsr-305.jar"/>
-+ <pathelement location="${systemjar.dir}/jFormatString.jar"/>
-+ <pathelement location="${systemjar.dir}/apache-commons-lang.jar"/>
-+ <pathelement location="${systemjar.dir}/jcip-annotations.jar"/>
+- <fileset dir="${jar.dir}" includes="*.jar"/>
++ <pathelement location="${systemjar.dir}/ant.jar" />
++ <pathelement location="${systemjar.dir}/objectweb-asm/asm-debug-all.jar" />
++ <pathelement location="${systemjar.dir}/findbugs-bcel.jar" />
++ <pathelement location="${systemjar.dir}/apache-commons-lang.jar" />
++ <pathelement location="${systemjar.dir}/dom4j.jar" />
++ <pathelement location="${systemjar.dir}/jaxen.jar" />
++ <pathelement location="${systemjar.dir}/jcip-annotations.jar" />
++ <pathelement location="${systemjar.dir}/jdepend.jar" />
++ <pathelement location="${systemjar.dir}/jFormatString.jar" />
++ <pathelement location="${systemjar.dir}/jsr-305.jar" />
++ <pathelement location="${systemjar.dir}/junit.jar" />
</path>
<path id="tools.classpath">
@@ -47,7 +36,21 @@ index 0981cc5..bb52951 100644
<path refid="findbugs.classpath"/>
</path>
-@@ -329,8 +329,6 @@
+@@ -122,13 +133,6 @@
+ </javac>
+ </target>
+ <target name="classes" depends="init">
+- <echo>Requires JDK 7.x (not 8!), using: ${ant.java.version}</echo>
+- <fail message="Requires JDK 7.x (not 8!), using: ${ant.java.version}">
+- <condition>
+- <equals arg1="1.8" arg2="${ant.java.version}"/>
+- </condition>
+- </fail>
+-
+ <!-- Compile Java source files. -->
+ <echo level="info" message="compiling findbugs"/>
+ <javac
+@@ -298,8 +302,6 @@
<fileset dir="${src.dir}">
<include name="**/annotations/*.java"/>
</fileset>
@@ -56,6 +59,34 @@ index 0981cc5..bb52951 100644
</jar>
</target>
+@@ -634,25 +636,13 @@
+
+ <!-- Get version properties. -->
+
+- <target name="-get-git-revision">
+- <exec executable="git" spawn="false" outputproperty="gitrnum">
+- <arg value="log"/>
+- <arg value="--pretty=format:%h"/>
+- <arg value="-n"/>
+- <arg value="1"/>
+- </exec>
+- <echo>Got git revision ${gitrnum}</echo>
+- </target>
+-
+-
+- <target name="version" depends="classes,-get-git-revision" >
+- <echo>${gitrnum}</echo>
++ <target name="version" depends="classes" >
+ <java classpathref="tools.classpath"
+ output="${version.props.file}"
+ classname="edu.umd.cs.findbugs.Version"
+ failonerror="true">
+ <arg value="-props"/>
+- <sysproperty key="git.revision" value="${gitrnum}"/>
++ <sysproperty key="git.revision" value="Unknown"/>
+ </java>
+
+ <loadproperties srcfile="${version.props.file}"/>
diff --git a/design/architecture/Makefile b/design/architecture/Makefile
index 8765025..0fc7869 100644
--- a/design/architecture/Makefile
diff --git a/findbugs-fedora.patch b/findbugs-fedora.patch
index ffa71ad..4e0a91a 100644
--- a/findbugs-fedora.patch
+++ b/findbugs-fedora.patch
@@ -1,13 +1,13 @@
diff --git a/etc/MANIFEST-findbugs.MF b/etc/MANIFEST-findbugs.MF
-index 9ac9bfc..9d885be 100644
+index b29d6f8..9d885be 100644
--- a/etc/MANIFEST-findbugs.MF
+++ b/etc/MANIFEST-findbugs.MF
@@ -1,3 +1 @@
Manifest-Version: 1.0
-Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
--Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-3.3.jar asm-tree-3.3.jar asm-commons-3.3.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-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
diff --git a/etc/script.properties b/etc/script.properties
-index f595a9a..501a16c 100644
+index f595a9a..d13b6fc 100644
--- a/etc/script.properties
+++ b/etc/script.properties
@@ -3,48 +3,8 @@
@@ -60,7 +60,7 @@ index f595a9a..501a16c 100644
\n\
if [ ! -d "$findbugs_home" ]; then\n\
\techo "The path $findbugs_home,"\n\
-@@ -88,16 +48,18 @@ script.set.default.java=\
+@@ -88,16 +48,17 @@ script.set.default.java=\
# Fragment to execute java, using the arguments stored
# in the shell's $@ variable (and/or in the $fb_appargs variable).
@@ -72,8 +72,7 @@ index f595a9a..501a16c 100644
- fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\
+ \n\
+ fb_classpath=\$(build-classpath findbugs findbugs-bcel dom4j jaxen \\\n\
-+ \tobjectweb-asm3/asm objectweb-asm3/asm-tree objectweb-asm3/asm-commons \\\n\
-+ \tjsr-305 jFormatString apache-commons-lang)\n\
++ \tobjectweb-asm/asm-debug-all jsr-305 jFormatString apache-commons-lang)\n\
+ \n\
set -f\n\
#echo command: \\\n\
@@ -97,7 +96,7 @@ index 1f42652..d8fa084 100644
fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
@WRAP_JAVA@
diff --git a/src/scripts/standard/findbugs b/src/scripts/standard/findbugs
-index d5bd992..779a61a 100644
+index d5bd992..779a61a 100755
--- a/src/scripts/standard/findbugs
+++ b/src/scripts/standard/findbugs
@@ -8,8 +8,6 @@
@@ -110,16 +109,15 @@ index d5bd992..779a61a 100644
fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
@WRAP_JAVA@
diff --git a/src/scripts/standard/findbugs2 b/src/scripts/standard/findbugs2
-index 36c054b..dccfa99 100644
+index 36c054b..03df061 100644
--- a/src/scripts/standard/findbugs2
+++ b/src/scripts/standard/findbugs2
-@@ -109,13 +109,19 @@ if [ $fb_osname = "Darwin" ]; then
+@@ -109,13 +109,18 @@ if [ $fb_osname = "Darwin" ]; then
-Dapple.laf.useScreenMenuBar=true"
fi
+fb_classpath=$(build-classpath findbugs findbugs-bcel dom4j jaxen \
-+ objectweb-asm3/asm objectweb-asm3/asm-tree objectweb-asm3/asm-commons \
-+ jsr-305 jFormatString apache-commons-lang)
++ objectweb-asm/asm-debug-all jsr-305 jFormatString apache-commons-lang)
+
+fb_mainclass=edu.umd.cs.findbugs.LaunchAppropriateUI
+
diff --git a/findbugs.spec b/findbugs.spec
index a531e32..124bf28 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -1,8 +1,8 @@
-%global noupdatechecks_version 20131026svn14849
+%global noupdatechecks_version 20140707gitcce19ac
Name: findbugs
-Version: 2.0.3
-Release: 9%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
Summary: Find bugs in Java code
Group: Development/Languages
@@ -12,16 +12,16 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-sour
Source1: findbugs-ant
Source2: findbugs-tools-README
-Source3: http://search.maven.org/remotecontent?filepath=com/google/code/findbugs/findbugs/%{version}/findbugs-%{version}.pom
-Source4: http://search.maven.org/remotecontent?filepath=com/google/code/findbugs/annotations/%{version}/annotations-%{version}.pom
+Source3: http://search.maven.org/remotecontent?filepath=com/google/code/findbugs/findbugs/2.0.3/findbugs-2.0.3.pom
+Source4: http://search.maven.org/remotecontent?filepath=com/google/code/findbugs/annotations/2.0.3/annotations-2.0.3.pom
# This archive contains the source for the noUpdateChecks plugin.
# It was created with:
-# $ svn export http://findbugs.googlecode.com/svn/trunk/plugins/noUpdateChecks -r 14849 noUpdateChecks-plugin-20131026svn14849
-# $ tar -zcf noUpdateChecks-plugin-20131026svn14849.tgz noUpdateChecks-plugin-20131026svn14849
+# $ git clone --bare https://code.google.com/p/findbugs
+# $ git --git-dir=findbugs.git archive --format tgz cce19ac plugins/noUpdateChecks -o noUpdateChecks-plugin-20140707gitcce19ac.tgz
Source5: noUpdateChecks-plugin-%{noupdatechecks_version}.tgz
-Source6: http://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-ant/%{version}/findbugs-ant-%{version}.pom
+Source6: http://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-ant/2.0.3/findbugs-ant-2.0.3.pom
# This patch has not been submitted upstream, as it contains Fedora-specific
# changes. It looks in /usr/share/java for jar files at compile time, instead
@@ -44,6 +44,7 @@ BuildRequires: findbugs-bcel
BuildRequires: ant
BuildRequires: docbook-style-xsl
BuildRequires: apache-commons-lang
+BuildRequires: dom4j
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jaxen
BuildRequires: jcip-annotations
@@ -52,7 +53,7 @@ BuildRequires: jFormatString
BuildRequires: jpackage-utils
BuildRequires: jsr-305
BuildRequires: junit
-BuildRequires: objectweb-asm3
+BuildRequires: objectweb-asm
BuildRequires: perl
BuildRequires: tex(latex)
BuildRequires: texlive-preprint
@@ -65,7 +66,7 @@ Requires: jFormatString
Requires: jpackage-utils
Requires: jsr-305
Requires: junit
-Requires: objectweb-asm3
+Requires: objectweb-asm
%description
Findbugs is a program which uses static analysis to look for bugs in Java code.
@@ -115,9 +116,6 @@ rm -f lib/*.jar
# Get rid of code for Mac OS X that depends on a jar from Apple
rm -f src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
-# Turn on the executable bits for some auxiliary scripts
-chmod a+x etc/summarizeBugs etc/diffBugSummaries design/architecture/mkdep.pl
-
%build
# Build the class files
ant
@@ -137,7 +135,7 @@ jar cf ../../lib/findbugs-tools.jar edu/umd/cs/findbugs/tools
popd
# Build the noUpdateChecks plugin
-pushd noUpdateChecks-plugin-%{noupdatechecks_version}
+pushd plugins/noUpdateChecks
ant plugin-jar
popd
@@ -170,21 +168,22 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -a etc plugin $RPM_BUILD_ROOT%{_datadir}/%{name}
# Install the noUpdateChecks plugin
-cp -p noUpdateChecks-plugin-%{noupdatechecks_version}/build/noUpdateChecks.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugin
+cp -p plugins/noUpdateChecks/build/noUpdateChecks.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugin
# Create /usr/share/findbugs/lib directory containing symlinks to required JARs (bug #1080682)
# List is based on the Class-Path attribute in etc/MANIFEST-findbugs.MF
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
-for i in findbugs findbugs-bcel dom4j jaxen objectweb-asm3/asm objectweb-asm3/asm-tree \
- objectweb-asm3/asm-commons jsr-305 jFormatString apache-commons-lang; do
+for i in findbugs findbugs-bcel dom4j jaxen objectweb-asm/asm-debug-all jsr-305 \
+ jFormatString apache-commons-lang; do
ln -s %{_javadir}/$i.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/lib
done
# Remove now unnecessary build-only manual files so %%doc doesn't get them
-rm -f doc/manual*.xml doc/manual*.xsl
+rm -f src/doc/manual*.xml src/doc/manual*.xsl
# Install poms
mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+sed -i 's/2\.0\.3/3\.0\.0/g' %{SOURCE3} %{SOURCE4} %{SOURCE6}
cp %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
cp %{SOURCE4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
cp %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.ant-ant-%{name}.pom
@@ -197,7 +196,7 @@ cp %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.ant-ant-%{name}.pom
%files -f .mfiles
%doc licenses/LICENSE.txt design/DecouplingFromBCEL.txt design/VisitingAndCaching.txt
%doc README.txt "design/eclipse findbugs plugin features.sxw"
-%doc design/architecture/architecture.pdf doc
+%doc design/architecture/architecture.pdf src/doc
%{_bindir}/*
%{_datadir}/%{name}
@@ -213,6 +212,9 @@ cp %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.ant-ant-%{name}.pom
%{_javadir}/findbugs-tools.jar
%changelog
+* Tue Jul 08 2014 Richard Fearn <richardfearn at gmail.com> - 3.0.0-1
+- Update to 3.0.0 (bug #1116843)
+
* Mon Jul 07 2014 Richard Fearn <richardfearn at gmail.com> - 2.0.3-9
- Revert back to installing Javadoc into versioned directory
diff --git a/sources b/sources
index 13ea81a..05e38c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-755c8bc7a6b1fec0492cc390ef92142b findbugs-2.0.3-source.zip
-f6ead169e65392441e9777faadf7418b noUpdateChecks-plugin-20131026svn14849.tgz
+521533df2112b15998d53251a3893ba7 findbugs-3.0.0-source.zip
+c8ac5454ab469d46311fc9850c74ae21 noUpdateChecks-plugin-20140707gitcce19ac.tgz
More information about the scm-commits
mailing list