[findbugs-contrib/f21] Update to 6.0.0
richardfearn
richardfearn at fedoraproject.org
Fri Jan 9 19:33:36 UTC 2015
commit 39bcbf723f98a354e7dcb574679fb84f8ef66382
Author: Richard Fearn <richardfearn at gmail.com>
Date: Fri Jan 9 20:26:44 2015 +0100
Update to 6.0.0
.gitignore | 1 +
findbugs-contrib-build.patch | 21 ++++++++++-----------
findbugs-contrib.spec | 20 ++++++++++++++------
sources | 2 +-
4 files changed, 26 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0487794..6ca3156 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ fb-contrib-src-4.2.0.zip
/fb-contrib-src-4.6.1.zip
/fb-contrib-5.2.0-sources.jar
/fb-contrib-5.2.1-sources.jar
+/fb-contrib-6.0.0-sources.jar
diff --git a/findbugs-contrib-build.patch b/findbugs-contrib-build.patch
index 8847fb7..7a02d90 100644
--- a/findbugs-contrib-build.patch
+++ b/findbugs-contrib-build.patch
@@ -1,5 +1,5 @@
diff --git a/build.xml b/build.xml
-index 1c2c9b7..31e491a 100644
+index e03ec9d..b977130 100644
--- a/build.xml
+++ b/build.xml
@@ -6,6 +6,7 @@
@@ -10,26 +10,20 @@ index 1c2c9b7..31e491a 100644
<property name="src.dir" value="${basedir}/src" />
<property name="classes.dir" value="${basedir}/classes" />
<property name="lib.dir" value="${basedir}/lib" />
-@@ -53,25 +54,26 @@
- <antcall target="install"/>
- </target>
-
-- <target name="-init" depends="yank" description="prepares repository for a build">
-+ <target name="-init" description="prepares repository for a build">
- <mkdir dir="${lib.dir}" />
+@@ -58,23 +59,23 @@
<mkdir dir="${classes.dir}" />
<mkdir dir="${javadoc.dir}" />
<path id="fb-contrib.classpath">
- <pathelement location="${lib.dir}/findbugs-${findbugs.version}.jar" />
-- <pathelement location="${lib.dir}/bcel-${bcel.version}.jar" />
+- <pathelement location="${lib.dir}/bcel-findbugs-${bcel-findbugs.version}.jar" />
- <pathelement location="${lib.dir}/annotations-${annotations.version}.jar" />
-- <pathelement location="${lib.dir}/asm-tree-${asm-tree.version}.jar" />
+- <pathelement location="${lib.dir}/asm-debug-all-${asm-debug-all.version}.jar" />
+ <pathelement location="${system.dir}/findbugs.jar" />
+ <pathelement location="${system.dir}/findbugs-bcel.jar" />
+ <pathelement location="${system.dir}/findbugs-annotations.jar" />
+ <pathelement location="${system.dir}/jsr-305.jar" />
+ <pathelement location="${system.dir}/jcip-annotations.jar" />
-+ <pathelement location="${system.dir}/objectweb-asm/asm-tree.jar" />
++ <pathelement location="${system.dir}/objectweb-asm/asm-debug-all.jar" />
</path>
<path id="fb-contrib.samples.classpath">
- <pathelement location="${lib.dir}/javax.servlet.jsp-api-${javax.servlet.jsp-api.version}.jar" />
@@ -40,6 +34,9 @@ index 1c2c9b7..31e491a 100644
- <pathelement location="${lib.dir}/backport-util-concurrent-${backport-util-concurrent.version}.jar" />
- <pathelement location="${lib.dir}/slf4j-api-${slf4j-api.version}.jar" />
- <pathelement location="${lib.dir}/guava-${guava.version}.jar" />
+- <pathelement location="${lib.dir}/httpclient-cache-${httpclient-cache.version}.jar" />
+- <pathelement location="${lib.dir}/httpcore-${httpcore.version}.jar" />
+- <pathelement location="${lib.dir}/httpclient-${httpclient.version}.jar" />
+ <pathelement location="${system.dir}/jsp.jar" />
+ <pathelement location="${system.dir}/junit.jar" />
+ <pathelement location="${system.dir}/servlet.jar" />
@@ -47,6 +44,8 @@ index 1c2c9b7..31e491a 100644
+ <pathelement location="${system.dir}/apache-commons-lang3.jar" />
+ <pathelement location="${system.dir}/slf4j/api.jar" />
+ <pathelement location="${system.dir}/guava.jar" />
++ <pathelement location="${system.dir}/httpcomponents/httpcore.jar" />
++ <pathelement location="${system.dir}/httpcomponents/httpclient.jar" />
</path>
</target>
diff --git a/findbugs-contrib.spec b/findbugs-contrib.spec
index d444306..cff9765 100644
--- a/findbugs-contrib.spec
+++ b/findbugs-contrib.spec
@@ -6,8 +6,8 @@
%global eclipse_plugin_dir %{eclipse_plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{eclipse_plugin_vers}.%{eclipse_plugin_date}-%{eclipse_plugin_rev}
Name: findbugs-contrib
-Version: 5.2.1
-Release: 4%{?dist}
+Version: 6.0.0
+Release: 1%{?dist}
Summary: Extra findbugs detectors
Group: Development/Languages
@@ -25,6 +25,8 @@ BuildArch: noarch
BuildRequires: ant, findbugs, java-devel >= 1:1.6.0, jpackage-utils
BuildRequires: jsp22, junit, log4j, servlet3
BuildRequires: apache-commons-lang3, guava, slf4j
+BuildRequires: httpcomponents-core, httpcomponents-client
+
Requires: findbugs, java >= 1:1.6.0, jpackage-utils
%description
@@ -43,6 +45,8 @@ Javadoc documentation for %{name}.
Group: Development/Languages
Summary: Sample input files illustrating the detectors
Requires: %{name} = %{version}-%{release}, jsp22, junit, log4j, servlet3
+Requires: apache-commons-lang3, guava, slf4j
+Requires: httpcomponents-core, httpcomponents-client
%description samples
This package contains sample input files that illustrate the various findbugs
@@ -62,14 +66,14 @@ addition to the base findbugs detectors.
%setup -q -c
%patch0 -p1
-# Remove BRPI_Sample - we can't compile it because backport-util-concurrent is
+# Remove {BRPI,PRMC}_Sample - we can't compile them because backport-util-concurrent is
# no longer in Fedora
# http://pkgs.fedoraproject.org/cgit/backport-util-concurrent.git/tree/dead.package
-rm -f samples/BRPI_Sample.java
+rm -f samples/{BRPI,PRMC}_Sample.java
%build
-ant build
-ant javadoc
+ant build -Dno.yank=1
+ant javadoc -Dno.yank=1
%install
# Install the plugin
@@ -106,6 +110,10 @@ end
%{eclipse_plugin_dir}/plugin/fb-contrib-%{version}.jar
%changelog
+* Fri Jan 09 2015 Richard Fearn <richardfearn at gmail.com> - 6.0.0-1
+- Update to 6.0.0
+- Add extra dependencies to -samples package
+
* Thu Jan 08 2015 Richard Fearn <richardfearn at gmail.com> - 5.2.1-4
- Install Javadoc into unversioned directory (bug #1068945)
diff --git a/sources b/sources
index 7b68edb..9a21c66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db8a121c827947076d08445567ef8eae fb-contrib-5.2.1-sources.jar
+aff6a6548ceb8ea5c79c2a7beebcf831 fb-contrib-6.0.0-sources.jar
More information about the scm-commits
mailing list