[findbugs] Add POMs for findbugs.jar & findbugs-annotations.jar
richardfearn
richardfearn at fedoraproject.org
Sun Mar 18 17:16:57 UTC 2012
commit 72c48d036afa680b45445b842bbc58431ae130f9
Author: Richard Fearn <richardfearn at gmail.com>
Date: Sun Mar 18 17:09:05 2012 +0000
Add POMs for findbugs.jar & findbugs-annotations.jar
Contributed by Marek Goldmann
annotations-1.3.2.pom | 22 +++++++++++++
findbugs-1.3.7.pom | 74 ++++++++++++++++++++++++++++++++++++++++++++++
findbugs-1.3.9-pom.patch | 45 ++++++++++++++++++++++++++++
findbugs.spec | 28 +++++++++++++++++-
4 files changed, 168 insertions(+), 1 deletions(-)
---
diff --git a/annotations-1.3.2.pom b/annotations-1.3.2.pom
new file mode 100644
index 0000000..53bdf65
--- /dev/null
+++ b/annotations-1.3.2.pom
@@ -0,0 +1,22 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <version>1.3.2</version>
+ <packaging>jar</packaging>
+ <url>http://findbugs.sourceforge.net/</url>
+ <name>FindBugs-Annotations</name>
+ <description>Annotation supports the FindBugs tool</description>
+ <licenses>
+ <license>
+ <name>GNU Lesser Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://findbugs.googlecode.com/svn/trunk/</connection>
+ <developerConnection>scm:svn:https://findbugs.googlecode.com/svn/trunk/</developerConnection>
+ <url>http://findbugs.googlecode.com/svn/trunk/</url>
+ </scm>
+</project>
diff --git a/findbugs-1.3.7.pom b/findbugs-1.3.7.pom
new file mode 100644
index 0000000..1d518a2
--- /dev/null
+++ b/findbugs-1.3.7.pom
@@ -0,0 +1,74 @@
+<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>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>findbugs</artifactId>
+ <version>1.3.7</version>
+ <packaging>jar</packaging>
+ <url>http://findbugs.sourceforge.net/</url>
+ <name>FindBugs</name>
+ <description>Findbugs: Because it's easy!</description>
+ <licenses>
+ <license>
+ <name>GNU Lesser Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://findbugs.googlecode.com/svn/trunk/</connection>
+ <developerConnection>scm:svn:https://findbugs.googlecode.com/svn/trunk/</developerConnection>
+ <url>http://findbugs.googlecode.com/svn/trunk/</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>jFormatString</artifactId>
+ <version>1.3.7</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>1.3.7</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>bcel</artifactId>
+ <version>1.3.7</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-xml</artifactId>
+ <version>3.1</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/findbugs-1.3.9-pom.patch b/findbugs-1.3.9-pom.patch
new file mode 100644
index 0000000..07f6007
--- /dev/null
+++ b/findbugs-1.3.9-pom.patch
@@ -0,0 +1,45 @@
+diff -ur old/annotations.pom new/annotations.pom
+--- old/annotations.pom 2012-03-18 16:36:12.849721722 +0000
++++ new/annotations.pom 2012-03-18 16:42:53.945040770 +0000
+@@ -2,7 +2,7 @@
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+- <version>1.3.2</version>
++ <version>1.3.9</version>
+ <packaging>jar</packaging>
+ <url>http://findbugs.sourceforge.net/</url>
+ <name>FindBugs-Annotations</name>
+diff -ur old/findbugs.pom new/findbugs.pom
+--- old/findbugs.pom 2012-03-18 16:36:12.850721723 +0000
++++ new/findbugs.pom 2012-03-18 16:43:21.457062653 +0000
+@@ -2,7 +2,7 @@
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>findbugs</artifactId>
+- <version>1.3.7</version>
++ <version>1.3.9</version>
+ <packaging>jar</packaging>
+ <url>http://findbugs.sourceforge.net/</url>
+ <name>FindBugs</name>
+@@ -23,17 +23,17 @@
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>jFormatString</artifactId>
+- <version>1.3.7</version>
++ <version>1.3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+- <version>1.3.7</version>
++ <version>1.3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>bcel</artifactId>
+- <version>1.3.7</version>
++ <version>1.3.9</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
diff --git a/findbugs.spec b/findbugs.spec
index 77f1954..067d985 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -5,7 +5,7 @@
Name: findbugs
Version: 1.3.9
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Find bugs in Java code
Group: Development/Languages
@@ -15,6 +15,10 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-sour
Source1: findbugs-ant
Source2: findbugs-tools-README
+# Versions will be fixed in a patch
+Source3: http://repo1.maven.org/maven2/net/sourceforge/findbugs/findbugs/1.3.7/findbugs-1.3.7.pom
+Source4: http://repo1.maven.org/maven2/net/sourceforge/findbugs/annotations/1.3.2/annotations-1.3.2.pom
+
# This patch has not been submitted upstream, as it contains Fedora-specific
# changes. It looks in /usr/share/java for jar files at both compile time and
# run time, instead of in findbugs' lib directory.
@@ -26,6 +30,9 @@ Patch0: findbugs-1.3.9-build.patch
Patch1: findbugs-asm-version.patch
%define asm_version 3.3
+# Updates the version information in POMs, as we don't have up to date POM's :(
+Patch2: findbugs-1.3.9-pom.patch
+
BuildArch: noarch
BuildRequires: findbugs-bcel
@@ -92,6 +99,11 @@ README.fedora for more information.
%patch0 -p1
%patch1 -p1
+cp -p %{SOURCE3} findbugs.pom
+cp -p %{SOURCE4} annotations.pom
+
+%patch2 -p1
+
cp -p %{SOURCE2} README.fedora
# Make sure we don't accidentally use any existing JAR files
@@ -159,6 +171,15 @@ cp -a etc plugin $RPM_BUILD_ROOT%{_datadir}/%{name}
# Remove now unnecessary build-only manual files so %%doc doesn't get them
rm -f doc/manual*.xml doc/manual*.xsl
+# Install poms
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+cp findbugs.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+cp annotations.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
+
+# Add depmaps
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}-annotations.pom %{name}-annotations.jar
+
%files
%doc LICENSE.txt design/DecouplingFromBCEL.txt design/VisitingAndCaching.txt
%doc README.txt design/eclipse\ findbugs\ plugin\ features.sxw
@@ -168,6 +189,8 @@ rm -f doc/manual*.xml doc/manual*.xsl
%{_javadir}/findbugs-annotations*
%{_javadir}/findbugs-%{version}.jar
%{_javadir}/findbugs.jar
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
%files -n ant-findbugs
%doc LICENSE.txt
@@ -182,6 +205,9 @@ rm -f doc/manual*.xml doc/manual*.xsl
%{_javadir}/findbugs-tools*
%changelog
+* Wed Mar 14 2012 Marek Goldmann <mgoldman at redhat.com> 1.3.9-8
+- Added POMS (RHBZ#803352)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list