[eclipse-findbugs/f20] Update to 2.0.3
richardfearn
richardfearn at fedoraproject.org
Tue Feb 11 21:24:09 UTC 2014
commit dde5ecdd14321ddc032785caf3e636e8b12ee87c
Author: Richard Fearn <richardfearn at gmail.com>
Date: Tue Feb 11 20:32:21 2014 +0000
Update to 2.0.3
.gitignore | 1 +
eclipse-findbugs.spec | 23 +++++++++++++-----
eclipsePlugin-build.patch | 56 +++++++++++++++++++++++++++++----------------
sources | 2 +-
4 files changed, 54 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff53744..6c0e20d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
eclipsePlugin-1.3.9.20090821-source.zip
/eclipsePlugin-2.0.2.20121210-source.zip
+/eclipsePlugin-2.0.3.20131122-15020-source.zip
diff --git a/eclipse-findbugs.spec b/eclipse-findbugs.spec
index df81979..e8ddcca 100644
--- a/eclipse-findbugs.spec
+++ b/eclipse-findbugs.spec
@@ -1,15 +1,16 @@
%global eclipse_base %{_libdir}/eclipse
-%global pkg_date 20121210
+%global pkg_date 20131122
+%global pkg_svn_rev 15020
Name: eclipse-findbugs
-Version: 2.0.2
+Version: 2.0.3
Release: 1%{?dist}
Summary: Eclipse plugin for FindBugs
Group: Development/Languages
License: LGPLv2+
URL: http://findbugs.sourceforge.net/
-Source0: http://downloads.sourceforge.net/findbugs/eclipsePlugin-%{version}.%{pkg_date}-source.zip
+Source0: http://downloads.sourceforge.net/findbugs/eclipsePlugin-%{version}.%{pkg_date}-%{pkg_svn_rev}-source.zip
# This patch is Fedora-specific, so it has not been submitted upstream. The
# patch makes the build infrastructure use installed JARs for the build, rather
@@ -24,13 +25,13 @@ Requires: java >= 1:1.6.0, jpackage-utils
BuildArch: noarch
%global plugins_dir %{_datadir}/eclipse/dropins/findbugs/plugins
-%global plugin_dir %{plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}
+%global plugin_dir %{plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}-%{pkg_svn_rev}
%description
An Eclipse plugin for the FindBugs Java bug detector.
%prep
-%setup -q -n eclipsePlugin-%{version}.%{pkg_date}
+%setup -q -n eclipsePlugin-%{version}.%{pkg_date}-%{pkg_svn_rev}
%patch0 -p1
# Set up the eclipse path
@@ -42,12 +43,14 @@ ant -DeclipsePlugin.dir=%{eclipse_base}/plugins \
-DeclipseSdkPlugin.dir=%{eclipse_base}/dropins/sdk/plugins \
-Djavadir=%{_javadir} \
-Dplugin.date=%{pkg_date} \
- -Drelease.base=%{version}
+ -Drelease.base=%{version} \
+ -Dfindbugs.svn.revision=%{pkg_svn_rev} \
+ dist
%install
mkdir -p $RPM_BUILD_ROOT%{plugins_dir}
unzip -q -d $RPM_BUILD_ROOT%{plugins_dir} \
- bin_build/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}.zip
+ zips/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}-%{pkg_svn_rev}.zip
# Symlink to the external jars we need
%define javalink ../../../../../../java
@@ -63,6 +66,9 @@ ln -s %{javalink}/apache-commons-lang.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
ln -s %{javalink}/objectweb-asm/asm.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
ln -s %{javalink}/objectweb-asm/asm-commons.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
ln -s %{javalink}/objectweb-asm/asm-tree.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
+ln -s %{javalink}/objectweb-asm/asm-analysis.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
+ln -s %{javalink}/objectweb-asm/asm-util.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
+ln -s %{javalink}/objectweb-asm/asm-xml.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
# Remove unnecessary files (used at build-time only)
rm -f $RPM_BUILD_ROOT%{plugin_dir}/.options
@@ -73,6 +79,9 @@ rm -fr $RPM_BUILD_ROOT%{plugin_dir}/doc
%{_datadir}/eclipse/dropins/findbugs
%changelog
+* Tue Feb 11 2014 Richard Fearn <richardfearn at gmail.com> 2.0.3-1
+- Update to 2.0.3
+
* Sat Oct 26 2013 Richard Fearn <richardfearn at gmail.com> 2.0.2-1
- Update to 2.0.2
diff --git a/eclipsePlugin-build.patch b/eclipsePlugin-build.patch
index 60edadf..0d88ac7 100644
--- a/eclipsePlugin-build.patch
+++ b/eclipsePlugin-build.patch
@@ -1,16 +1,16 @@
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
-index 0e6418b..4db99b0 100644
+index ea61635..0cd4946 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
-@@ -4,16 +4,17 @@ Bundle-Name: FindBugs Plug-in
+@@ -4,19 +4,20 @@ Bundle-Name: FindBugs Plug-in
Bundle-SymbolicName: edu.umd.cs.findbugs.plugin.eclipse; singleton:=true
- Bundle-Version: 2.0.2.qualifier
+ Bundle-Version: 2.0.3.qualifier
Bundle-ClassPath: findbugs-plugin.jar,
- lib/jsr305.jar,
- lib/annotations.jar,
- lib/bcel.jar,
- lib/dom4j-1.6.1.jar,
-- lib/jaxen-1.1.1.jar,
+- lib/jaxen-1.1.6.jar,
+ lib/findbugs.jar,
+ lib/jsr-305.jar,
+ lib/findbugs-annotations.jar,
@@ -18,22 +18,28 @@ index 0e6418b..4db99b0 100644
+ lib/dom4j.jar,
+ lib/jaxen.jar,
lib/jFormatString.jar,
-- lib/commons-lang-2.4.jar,
+- lib/commons-lang-2.6.jar,
- lib/asm-3.3.jar,
- lib/asm-commons-3.3.jar,
-- lib/asm-tree-3.3.jar
+- lib/asm-tree-3.3.jar,
+- lib/asm-analysis-3.3.jar,
+- lib/asm-util-3.3.jar,
+- lib/asm-xml-3.3.jar
+ lib/apache-commons-lang.jar,
+ lib/asm.jar,
+ lib/asm-commons.jar,
-+ lib/asm-tree.jar
++ lib/asm-tree.jar,
++ lib/asm-analysis.jar,
++ lib/asm-util.jar,
++ lib/asm-xml.jar
Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
Bundle-Vendor: FindBugs Project
Bundle-Localization: plugin
diff --git a/build.xml b/build.xml
-index cddee58..c2f9b51 100644
+index 437043d..e036890 100644
--- a/build.xml
+++ b/build.xml
-@@ -62,16 +62,17 @@
+@@ -63,19 +63,20 @@
<property name="lib.dir" value="lib"/>
<!-- list of required libraries, copied from FB core project -->
@@ -45,22 +51,28 @@ index cddee58..c2f9b51 100644
+ findbugs-bcel.jar,
+ findbugs-annotations.jar,
jFormatString.jar,
-- commons-lang-2.4.jar,
+- commons-lang-2.6.jar,
- asm-3.3.jar,
- asm-tree-3.3.jar,
- asm-commons-3.3.jar,
+- asm-analysis-3.3.jar,
+- asm-util-3.3.jar,
+- asm-xml-3.3.jar,
- dom4j-1.6.1.jar,
-- jaxen-1.1.1.jar" />
+- jaxen-1.1.6.jar" />
+ apache-commons-lang.jar,
+ objectweb-asm/asm.jar,
+ objectweb-asm/asm-tree.jar,
+ objectweb-asm/asm-commons.jar,
++ objectweb-asm/asm-analysis.jar,
++ objectweb-asm/asm-util.jar,
++ objectweb-asm/asm-xml.jar,
+ dom4j.jar,
+ jaxen.jar" />
<!-- list of all libraries, copied from FB core project, plus old libraries not more used -->
<property name="jars.cleanup" value="${jars.required},
-@@ -79,11 +80,18 @@
+@@ -83,12 +84,19 @@
findbugs-ant.jar" />
<path id="plugin.classpath">
@@ -68,6 +80,7 @@ index cddee58..c2f9b51 100644
+ <fileset dir="${javadir}" includes="${jars.required}"/>
<fileset dir="${eclipsePlugin.dir}">
<include name="**/*.jar"/>
+ <exclude name="**/datanucleus-enhancer*.jar"/>
<exclude name="edu.umd.cs.findbugs.**/*.jar"/>
</fileset>
+ <fileset dir="${eclipseJdtPlugin.dir}">
@@ -80,7 +93,7 @@ index cddee58..c2f9b51 100644
</path>
<!-- Need these jars for ant target 'srcdist', which uses subversion. Grab them at:
-@@ -109,7 +117,7 @@
+@@ -113,7 +121,7 @@
<mkdir dir="${lib.dir}"/>
</target>
@@ -88,8 +101,8 @@ index cddee58..c2f9b51 100644
+ <target name="clean" depends="init" description="Clean up temporary files">
<delete includeemptydirs="true" >
<fileset dir="${bin.dir}" includes="**/*"/>
- <fileset dir="${lib.dir}" includes="**/*"/>
-@@ -120,7 +128,7 @@
+ <fileset dir="${zip.dir}" includes="**/*"/>
+@@ -125,7 +133,7 @@
</delete>
</target>
@@ -98,7 +111,7 @@ index cddee58..c2f9b51 100644
<echo message="Compiling FindBugs Eclipse plugin"/>
<fail unless="eclipsePlugin.dir"
message="Please specify path to the Eclipse 3.3+ plugins folder in local.properties file, like: eclipsePlugin.dir=F:\\java\\eclipse33\\plugins"/>
-@@ -149,13 +157,10 @@
+@@ -154,16 +162,10 @@
</copy>
</target>
@@ -110,10 +123,13 @@ index cddee58..c2f9b51 100644
- <loadproperties srcFile="${bin.dir}/version.properties" >
- <filterchain><linecontains><contains value="release.base"/></linecontains></filterchain>
- </loadproperties>
+- <loadproperties srcFile="${bin.dir}/version.properties" >
+- <filterchain><linecontains><contains value="findbugs.svn.revision"/></linecontains></filterchain>
+- </loadproperties>
+
+ <echo>svnversion ${findbugs.svn.revision}</echo>
- <!-- 2) read plugin base version from META-INF/MANIFEST.MF to ${eclipse.release.base} -->
- <loadfile srcFile="META-INF/MANIFEST.MF" property="eclipse.release.base">
-@@ -218,15 +223,9 @@
+@@ -231,15 +233,9 @@
and disabled because of bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=256361
<include name="META-INF/p2.inf" /> -->
</fileset>
@@ -129,4 +145,4 @@ index cddee58..c2f9b51 100644
+ <mkdir dir="${dist.dir}/plugin" />
<!-- Create plugin zipfile. -->
- <zip destfile="${bin.dir}/${plugin.id}_${plugin.version}.zip">
+ <zip destfile="${zip.dir}/${plugin.id}_${plugin.version}.zip">
diff --git a/sources b/sources
index ea3546d..860cd60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c4d2520b9ec4ed72d7fc73bc017ad0d eclipsePlugin-2.0.2.20121210-source.zip
+d3605acf37d8fa6c8b6e9834cb8e1e5c eclipsePlugin-2.0.3.20131122-15020-source.zip
More information about the scm-commits
mailing list