[eclipse-findbugs] Update to 3.0.0
richardfearn
richardfearn at fedoraproject.org
Tue Jul 8 08:58:16 UTC 2014
commit 0d035783967184d7c490c3a7e627e50123564b75
Author: Richard Fearn <richardfearn at gmail.com>
Date: Mon Jul 7 22:56:27 2014 +0100
Update to 3.0.0
.gitignore | 1 +
eclipse-findbugs.spec | 28 +++++++++----------
eclipsePlugin-build.patch | 67 ++++++++++++++++++---------------------------
sources | 2 +-
4 files changed, 42 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c0e20d..882be0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
eclipsePlugin-1.3.9.20090821-source.zip
/eclipsePlugin-2.0.2.20121210-source.zip
/eclipsePlugin-2.0.3.20131122-15020-source.zip
+/edu.umd.cs.findbugs.plugin.eclipse_3.0.0.20140706-2cfb468-source.zip
diff --git a/eclipse-findbugs.spec b/eclipse-findbugs.spec
index 783b902..a303a91 100644
--- a/eclipse-findbugs.spec
+++ b/eclipse-findbugs.spec
@@ -1,15 +1,15 @@
-%global pkg_date 20131122
-%global pkg_svn_rev 15020
+%global pkg_date 20140706
+%global pkg_git_rev 2cfb468
Name: eclipse-findbugs
-Version: 2.0.3
-Release: 3%{?dist}
+Version: 3.0.0
+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}-%{pkg_svn_rev}-source.zip
+Source0: http://downloads.sourceforge.net/findbugs/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}-%{pkg_git_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 +24,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}-%{pkg_svn_rev}
+%global plugin_dir %{plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}-%{pkg_git_rev}
%description
An Eclipse plugin for the FindBugs Java bug detector.
%prep
-%setup -q -n eclipsePlugin-%{version}.%{pkg_date}-%{pkg_svn_rev}
+%setup -q -c edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}-%{pkg_git_rev}
%patch0 -p1
%build
@@ -53,13 +53,13 @@ ant -DeclipsePlugin.dir=${ECLIPSE_BASE}/plugins \
-Djavadir=%{_javadir} \
-Dplugin.date=%{pkg_date} \
-Drelease.base=%{version} \
- -Dfindbugs.svn.revision=%{pkg_svn_rev} \
+ -Dfindbugs.git.revision=%{pkg_git_rev} \
dist
%install
mkdir -p $RPM_BUILD_ROOT%{plugins_dir}
unzip -q -d $RPM_BUILD_ROOT%{plugins_dir} \
- zips/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}-%{pkg_svn_rev}.zip
+ zips/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}-%{pkg_git_rev}.zip
# Symlink to the external jars we need
%define javalink ../../../../../../java
@@ -72,12 +72,7 @@ ln -s %{javalink}/dom4j.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
ln -s %{javalink}/jaxen.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
ln -s %{javalink}/jFormatString.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
ln -s %{javalink}/apache-commons-lang.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
-ln -s %{javalink}/objectweb-asm3/asm.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
-ln -s %{javalink}/objectweb-asm3/asm-commons.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
-ln -s %{javalink}/objectweb-asm3/asm-tree.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
-ln -s %{javalink}/objectweb-asm3/asm-analysis.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
-ln -s %{javalink}/objectweb-asm3/asm-util.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
-ln -s %{javalink}/objectweb-asm3/asm-xml.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
+ln -s %{javalink}/objectweb-asm/asm-debug-all.jar $RPM_BUILD_ROOT%{plugin_dir}/lib
# Remove unnecessary files (used at build-time only)
rm -f $RPM_BUILD_ROOT%{plugin_dir}/.options
@@ -88,6 +83,9 @@ rm -fr $RPM_BUILD_ROOT%{plugin_dir}/doc
%{_datadir}/eclipse/dropins/findbugs
%changelog
+* Mon Jul 07 2014 Richard Fearn <richardfearn at gmail.com> - 3.0.0-1
+- Update to 3.0.0 (bug #1116843)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/eclipsePlugin-build.patch b/eclipsePlugin-build.patch
index bdf7f87..79536a5 100644
--- a/eclipsePlugin-build.patch
+++ b/eclipsePlugin-build.patch
@@ -1,14 +1,14 @@
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
-index ea61635..0cd4946 100644
+index e4b7a14..d8b1602 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
-@@ -4,19 +4,20 @@ Bundle-Name: FindBugs Plug-in
+@@ -4,14 +4,15 @@ Bundle-Name: FindBugs Plug-in
Bundle-SymbolicName: edu.umd.cs.findbugs.plugin.eclipse; singleton:=true
- Bundle-Version: 2.0.3.qualifier
+ Bundle-Version: 3.0.0.qualifier
Bundle-ClassPath: findbugs-plugin.jar,
- lib/jsr305.jar,
- lib/annotations.jar,
-- lib/bcel.jar,
+- lib/bcel-6.0-SNAPSHOT.jar,
- lib/dom4j-1.6.1.jar,
- lib/jaxen-1.1.6.jar,
+ lib/findbugs.jar,
@@ -19,32 +19,22 @@ index ea61635..0cd4946 100644
+ lib/jaxen.jar,
lib/jFormatString.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-analysis-3.3.jar,
-- lib/asm-util-3.3.jar,
-- lib/asm-xml-3.3.jar
+- lib/asm-debug-all-5.0.2.jar
+ lib/apache-commons-lang.jar,
-+ lib/asm.jar,
-+ lib/asm-commons.jar,
-+ lib/asm-tree.jar,
-+ lib/asm-analysis.jar,
-+ lib/asm-util.jar,
-+ lib/asm-xml.jar
++ lib/asm-debug-all.jar
Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
Bundle-Vendor: FindBugs Project
Bundle-Localization: plugin
diff --git a/build.xml b/build.xml
-index 437043d..e036890 100644
+index 4c4c281..0531dbd 100644
--- a/build.xml
+++ b/build.xml
-@@ -63,19 +63,20 @@
+@@ -63,14 +63,15 @@
<property name="lib.dir" value="lib"/>
<!-- list of required libraries, copied from FB core project -->
- <property name="jars.required" value="jsr305.jar,
-- bcel.jar,
+- bcel-6.0-SNAPSHOT.jar,
- annotations.jar,
+ <property name="jars.required" value="findbugs.jar,
+ jsr-305.jar,
@@ -52,27 +42,17 @@ index 437043d..e036890 100644
+ findbugs-annotations.jar,
jFormatString.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,
+- asm-debug-all-5.0.2.jar,
- dom4j-1.6.1.jar,
- jaxen-1.1.6.jar" />
+ apache-commons-lang.jar,
-+ objectweb-asm3/asm.jar,
-+ objectweb-asm3/asm-tree.jar,
-+ objectweb-asm3/asm-commons.jar,
-+ objectweb-asm3/asm-analysis.jar,
-+ objectweb-asm3/asm-util.jar,
-+ objectweb-asm3/asm-xml.jar,
++ asm-debug-all.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},
-@@ -83,12 +84,19 @@
+@@ -78,12 +79,19 @@
findbugs-ant.jar" />
<path id="plugin.classpath">
@@ -92,8 +72,8 @@ index 437043d..e036890 100644
+ <fileset file="@SWT_JAR@"/>
</path>
- <!-- Need these jars for ant target 'srcdist', which uses subversion. Grab them at:
-@@ -113,7 +121,7 @@
+ <target name="init">
+@@ -100,7 +108,7 @@
<mkdir dir="${lib.dir}"/>
</target>
@@ -102,16 +82,23 @@ index 437043d..e036890 100644
<delete includeemptydirs="true" >
<fileset dir="${bin.dir}" includes="**/*"/>
<fileset dir="${zip.dir}" includes="**/*"/>
-@@ -125,7 +133,7 @@
+@@ -112,14 +120,8 @@
</delete>
</target>
- <target name="classes" depends="init,fbjars" description="Compile java source files">
+ <target name="classes" depends="init" description="Compile java source files">
<echo message="Compiling FindBugs Eclipse plugin"/>
+- <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>
<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"/>
-@@ -154,16 +162,10 @@
+ message="Please specify path to the Eclipse 3.6+ plugins folder in local.properties file, like: eclipsePlugin.dir=F:\\java\\eclipse33\\plugins"/>
+ <!-- Compile Java source files. -->
+@@ -147,16 +149,10 @@
</copy>
</target>
@@ -124,12 +111,12 @@ index 437043d..e036890 100644
- <filterchain><linecontains><contains value="release.base"/></linecontains></filterchain>
- </loadproperties>
- <loadproperties srcFile="${bin.dir}/version.properties" >
-- <filterchain><linecontains><contains value="findbugs.svn.revision"/></linecontains></filterchain>
+- <filterchain><linecontains><contains value="findbugs.git.revision"/></linecontains></filterchain>
- </loadproperties>
- <echo>svnversion ${findbugs.svn.revision}</echo>
+ <echo>gitversion ${findbugs.git.revision}</echo>
-@@ -231,15 +233,9 @@
+@@ -224,15 +220,9 @@
and disabled because of bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=256361
<include name="META-INF/p2.inf" /> -->
</fileset>
diff --git a/sources b/sources
index 860cd60..4632d01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3605acf37d8fa6c8b6e9834cb8e1e5c eclipsePlugin-2.0.3.20131122-15020-source.zip
+83c509cecaf967ace952a09b1c8e2114 edu.umd.cs.findbugs.plugin.eclipse_3.0.0.20140706-2cfb468-source.zip
More information about the scm-commits
mailing list