[findbugs] Update to 3.0.1 (bug #1199681)
richardfearn
richardfearn at fedoraproject.org
Sun Mar 15 17:55:02 UTC 2015
commit c5b0b476a67b01b7c1f7a6e1b669fc7ce7969f98
Author: Richard Fearn <richardfearn at gmail.com>
Date: Sun Mar 15 18:22:45 2015 +0100
Update to 3.0.1 (bug #1199681)
.gitignore | 1 +
findbugs-3.0.0.pom | 191 -------------------
findbugs-3.0.1.pom | 377 ++++++++++++++++++++++++++++++++++++++
findbugs-ant-task-classpath.patch | 2 +-
findbugs-build.patch | 11 +-
findbugs-manual.patch | 8 +-
findbugs.spec | 10 +-
sources | 2 +-
8 files changed, 397 insertions(+), 205 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d7a20d..62403b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ findbugs-1.3.9-source.zip
/findbugs-2.0.3-source.zip
/findbugs-3.0.0-source.zip
/noUpdateChecks-plugin-20140707gitcce19ac.tgz
+/findbugs-3.0.1-source.zip
diff --git a/findbugs-3.0.1.pom b/findbugs-3.0.1.pom
new file mode 100644
index 0000000..65ba01a
--- /dev/null
+++ b/findbugs-3.0.1.pom
@@ -0,0 +1,377 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ <relativePath />
+ </parent>
+
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>findbugs</artifactId>
+ <version>3.0.1</version>
+ <packaging>jar</packaging>
+
+ <url>http://findbugs.sourceforge.net/</url>
+ <name>FindBugs-Project</name>
+ <description>Findbugs: Because it's easy!</description>
+ <inceptionYear>2003</inceptionYear>
+ <licenses>
+ <license>
+ <name>GNU Lesser Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+
+ <scm>
+ <connection>scm:git:http://code.google.com/p/findbugs/</connection>
+ <developerConnection>scm:git:https://code.google.com/p/findbugs/</developerConnection>
+ <url>https://code.google.com/p/findbugs/</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <id>bp</id>
+ <name>Bill Pugh</name>
+ <email>pugh at cs.umd.edu</email>
+ <url>http://www.cs.umd.edu/~pugh/</url>
+ <roles>
+ <role>Project Lead</role>
+ <role>Primary Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <id>al</id>
+ <name>Andrey Loskutov</name>
+ <email>Loskutov at gmx.de</email>
+ <url>http://andrei.gmxhome.de/privat.html</url>
+ <roles>
+ <role>Eclipse plugin</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>bp</id>
+ <name>Keith Lea</name>
+ <email />
+ <url>http://keithlea.com/</url>
+ <roles>
+ <role>web cloud</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Garvin LeClaire</name>
+ <email>gleclaire at codehaus.org</email>
+ <url>http://gdleclaire.blogspot.com</url>
+ <roles>
+ <role>Maven</role>
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>David H. Hovemeyer</name>
+ <email>dhovemey at ycp.edu</email>
+ <url>http://goose.ycp.edu/~dhovemey/</url>
+ <roles>
+ <role>project founder</role>
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>Nay Ayewah</name>
+ <email />
+ <url />
+ <roles>
+ <role />
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>Ben Langmead</name>
+ <email />
+ <url />
+ <roles>
+ <role />
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>Tomas Pollak</name>
+ <email />
+ <url />
+ <roles>
+ <role>Eclipse plugin tests</role>
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>Phil Crosby</name>
+ <email />
+ <url />
+ <roles>
+ <role />
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>Peter Friese</name>
+ <email />
+ <url />
+ <roles>
+ <role>Eclipse plugin</role>
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>Dave Brosius</name>
+ <email />
+ <url />
+ <roles>
+ <role />
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>Brian Goetz</name>
+ <email />
+ <url />
+ <roles>
+ <role />
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>Rohan Lloyd</name>
+ <email />
+ <url />
+ <roles>
+ <role />
+ </roles>
+ <timezone>-5</timezone>
+ </contributor>
+ <contributor>
+ <name>Tagir Valeev</name>
+ <email>lany at ngs.ru</email>
+ <url />
+ <roles>
+ <role />
+ </roles>
+ <timezone>+6</timezone>
+ </contributor>
+ </contributors>
+
+ <properties>
+ <asmVersion>5.0.2</asmVersion>
+ <junitVersion>4.11</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>bcel-findbugs</artifactId>
+ <version>6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jFormatString</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-debug-all</artifactId>
+ <version>${asmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.apple</groupId>
+ <artifactId>AppleJavaExtensions</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.6</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>icu4j</artifactId>
+ <groupId>com.ibm.icu</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <testSourceDirectory>${basedir}/src/junit</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/etc</directory>
+ <includes>
+ <include>*.xsd</include>
+ <include>bugrank.txt</include>
+ <include>findbugs.xml</include>
+ <include>messages*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/xsl</directory>
+ <includes>
+ <include>*.xsl</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/antTask</directory>
+ <includes>
+ <include>**/*.xsl</include>
+ <include>**/*.properties</include>
+ <include>**/*.db</include>
+ <include>**/*.png</include>
+ <include>**/*.html</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/gui</directory>
+ <includes>
+ <include>**/*.xsl</include>
+ <include>**/*.properties</include>
+ <include>**/*.db</include>
+ <include>**/*.png</include>
+ <include>**/*.html</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.xsl</include>
+ <include>**/*.properties</include>
+ <include>**/*.db</include>
+ <include>**/*.png</include>
+ <include>**/*.html</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals><goal>add-source</goal></goals>
+ <configuration>
+ <sources>
+ <source>src/antTask</source>
+ <source>src/tools</source>
+ <source>src/gui</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ <excludes>
+ <exclude>**/junit/**</exclude>
+ <exclude>**/infonodeJava/**</exclude>
+ <exclude>**/obsolete/**</exclude>
+ </excludes>
+ <testExcludes>
+ <exclude>**/architecture/**</exclude>
+ <exclude>**/cloud/**</exclude>
+ <exclude>**/DetectorsTest.java</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <archive>
+ <manifestFile>${basedir}/etc/MANIFEST-findbugs.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>install</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/findbugs-ant-task-classpath.patch b/findbugs-ant-task-classpath.patch
index fe5739a..64a49d2 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 d2983d9..3a8da76 100644
+index 70af8ef..4919d09 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;
diff --git a/findbugs-build.patch b/findbugs-build.patch
index 7c37df8..548faac 100644
--- a/findbugs-build.patch
+++ b/findbugs-build.patch
@@ -1,5 +1,5 @@
diff --git a/build.xml b/build.xml
-index 698b91f..1cba081 100644
+index 698b91f..f711eae 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,7 @@
@@ -10,7 +10,7 @@ index 698b91f..1cba081 100644
<property name="plugin.dir" value="plugin"/>
<property name="build.dir" value="build"/>
<property name="junit.dir" value="build/junit"/>
-@@ -59,13 +60,23 @@
+@@ -59,13 +60,24 @@
<property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
<path id="findbugs.classpath">
@@ -26,6 +26,7 @@ index 698b91f..1cba081 100644
+ <pathelement location="${systemjar.dir}/jFormatString.jar" />
+ <pathelement location="${systemjar.dir}/jsr-305.jar" />
+ <pathelement location="${systemjar.dir}/junit.jar" />
++ <pathelement location="${systemjar.dir}/hamcrest/core.jar" />
</path>
<path id="tools.classpath">
@@ -36,7 +37,7 @@ index 698b91f..1cba081 100644
<path refid="findbugs.classpath"/>
</path>
-@@ -122,13 +133,6 @@
+@@ -122,13 +134,6 @@
</javac>
</target>
<target name="classes" depends="init">
@@ -50,7 +51,7 @@ index 698b91f..1cba081 100644
<!-- Compile Java source files. -->
<echo level="info" message="compiling findbugs"/>
<javac
-@@ -298,8 +302,6 @@
+@@ -298,8 +303,6 @@
<fileset dir="${src.dir}">
<include name="**/annotations/*.java"/>
</fileset>
@@ -59,7 +60,7 @@ index 698b91f..1cba081 100644
</jar>
</target>
-@@ -634,25 +636,13 @@
+@@ -634,25 +637,13 @@
<!-- Get version properties. -->
diff --git a/findbugs-manual.patch b/findbugs-manual.patch
index 193b81f..7d04e83 100644
--- a/findbugs-manual.patch
+++ b/findbugs-manual.patch
@@ -1,5 +1,5 @@
diff --git a/build.properties b/build.properties
-index 27f21f8..8395dc2 100644
+index 27f21f8..82f65b1 100644
--- a/build.properties
+++ b/build.properties
@@ -11,7 +11,7 @@ source.findbugs.jar = src/java/,\
@@ -7,15 +7,15 @@ index 27f21f8..8395dc2 100644
# from http://docbook.sourceforge.net/projects/xsl/
-xsl.stylesheet.home =${local.software.home}/docbook-xsl-1.76.1
-+xsl.stylesheet.home =/usr/share/sgml/docbook/xsl-stylesheets-1.78.1
++xsl.stylesheet.home =/usr/share/sgml/docbook/xsl-stylesheets
# Set this to the directory containing the svnant Ant jars. These are
# needed for the srcdist target and to get the svn revision number
diff --git a/build.xml b/build.xml
-index 1cba081..60ad6d1 100644
+index f711eae..ac080c1 100644
--- a/build.xml
+++ b/build.xml
-@@ -855,24 +855,16 @@
+@@ -856,24 +856,16 @@
-->
<target name="generatemanual" unless="manual.uptodate">
<echo>Generating HTML version of manual</echo>
diff --git a/findbugs.spec b/findbugs.spec
index 3cfeea4..617757c 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -1,8 +1,8 @@
%global noupdatechecks_version 20140707gitcce19ac
Name: findbugs
-Version: 3.0.0
-Release: 4%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
Summary: Find bugs in Java code
Group: Development/Languages
@@ -12,7 +12,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-sour
Source1: findbugs-ant
Source2: findbugs-tools-README
-Source3: http://repo1.maven.org/maven2/com/google/code/findbugs/findbugs/3.0.0/findbugs-3.0.0.pom
+Source3: http://repo1.maven.org/maven2/com/google/code/findbugs/findbugs/3.0.1/findbugs-3.0.1.pom
Source4: http://repo1.maven.org/maven2/com/google/code/findbugs/annotations/3.0.0/annotations-3.0.0.pom
# This archive contains the source for the noUpdateChecks plugin.
@@ -190,6 +190,7 @@ rm -f build/doc/manual*.xml build/doc/manual*.xsl
# Install poms
mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+sed -i 's/3\.0\.0/3\.0\.1/g' %{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
@@ -225,6 +226,9 @@ end
%{_javadir}/findbugs-tools.jar
%changelog
+* Sun Mar 15 2015 Richard Fearn <richardfearn at gmail.com> - 3.0.1-1
+- Update to 3.0.1 (bug #1199681)
+
* Thu Jan 08 2015 Richard Fearn <richardfearn at gmail.com> - 3.0.0-4
- Install Javadoc into unversioned directory (bug #1068943)
diff --git a/sources b/sources
index 05e38c8..53cc32b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-521533df2112b15998d53251a3893ba7 findbugs-3.0.0-source.zip
+f50f22210b2d880bab570954a47e26ba findbugs-3.0.1-source.zip
c8ac5454ab469d46311fc9850c74ae21 noUpdateChecks-plugin-20140707gitcce19ac.tgz
More information about the scm-commits
mailing list