Attachment 586854 Details for Bug 825243 – Added findbugs-ant POM

[patch] Added findbugs-ant POM

0001-Added-findbugs-ant-POM.patch (text/plain), 6.60 KB, created by gil cattaneo on 2012-05-25 12:37:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-25 12:37:06 UTC

Size: 6.60 KB

patch

obsolete

>From 1e5331ce822ede9cf6435329f8fbe6cd2a7ee76d Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 25 May 2012 12:37:13 +0200
>Subject: [PATCH] - Added findbugs-ant POM - com.google.code.findbugs:* added
> to the dependencies map - Adapt to current guidelines
>
>---
> findbugs-ant-1.3.2.pom |   29 +++++++++++++++++++++++++
> findbugs.spec          |   55 ++++++++++++++++++++++++++++-------------------
> 2 files changed, 62 insertions(+), 22 deletions(-)
> create mode 100644 findbugs-ant-1.3.2.pom
>
>diff --git a/findbugs-ant-1.3.2.pom b/findbugs-ant-1.3.2.pom
>new file mode 100644
>index 0000000..b74b7ea
>--- /dev/null
>+++ b/findbugs-ant-1.3.2.pom
>@@ -0,0 +1,29 @@
>+<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-ant</artifactId>
>+	<version>1.3.2</version>
>+	<packaging>jar</packaging>
>+	<url>http://findbugs.sourceforge.net/</url>
>+	<name>FindBugs-AntTask</name>
>+	<description>AntTask to run Findbugs</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>findbugs</artifactId>
>+			<version>1.3.2</version>
>+		</dependency>
>+	</dependencies>
>+</project>
>diff --git a/findbugs.spec b/findbugs.spec
>index 067d985..f1471b0 100644
>--- a/findbugs.spec
>+++ b/findbugs.spec
>@@ -5,7 +5,7 @@
> 
> Name:           findbugs
> Version:        1.3.9
>-Release:        8%{?dist}
>+Release:        9%{?dist}
> Summary:        Find bugs in Java code
> 
> Group:          Development/Languages
>@@ -18,7 +18,7 @@ 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
>-
>+Source5:        http://repo1.maven.org/maven2/net/sourceforge/findbugs/findbugs-ant/1.3.2/findbugs-ant-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.
>@@ -103,6 +103,8 @@ cp -p %{SOURCE3} findbugs.pom
> cp -p %{SOURCE4} annotations.pom
> 
> %patch2 -p1
>+cp -p %{SOURCE5} findbugs-ant.pom
>+sed -i "s|1.3.2|%{version}|" findbugs-ant.pom
> 
> cp -p %{SOURCE2} README.fedora
> 
>@@ -139,24 +141,20 @@ jar cf ../../lib/findbugs-tools.jar edu/umd/cs/findbugs/tools
> %install
> # Install the jars
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
>-cp -p lib/annotations.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations-%{version}.jar
>-ln -s %{name}-annotations-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations.jar
>-cp -p lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools-%{version}.jar
>-ln -s %{name}-tools-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools.jar
>-cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+cp -p lib/annotations.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations.jar
>+cp -p lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools.jar
>+cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
> 
> # Install the ant task
> mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant
>-cp -p lib/%{name}-ant.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}-%{version}.jar
>-ln -s ant-%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}.jar
>+cp -p lib/%{name}-ant.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}.jar
>+
> mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
> cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
> 
> # Install the javadocs
> mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
>-cp -a apiJavaDoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>+cp -a apiJavaDoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
> # Install the scripts
> mkdir -p $RPM_BUILD_ROOT%{_bindir}
>@@ -175,10 +173,12 @@ rm -f doc/manual*.xml doc/manual*.xsl
> 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
>+cp findbugs-ant.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.ant-ant-%{name}.pom
> 
> # Add depmaps
>-%add_maven_depmap JPP-%{name}.pom %{name}.jar
>-%add_maven_depmap JPP-%{name}-annotations.pom %{name}-annotations.jar
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "com.google.code.%{name}:%{name}"
>+%add_maven_depmap JPP-%{name}-annotations.pom %{name}-annotations.jar -a "com.google.code.%{name}:annotations"
>+%add_maven_depmap -f ant JPP.ant-ant-%{name}.pom ant/ant-%{name}.jar -a "com.google.code.%{name}:%{name}-ant"
> 
> %files
> %doc LICENSE.txt design/DecouplingFromBCEL.txt design/VisitingAndCaching.txt
>@@ -186,25 +186,36 @@ cp annotations.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
> %doc design/architecture/architecture.pdf doc
> %{_bindir}/*
> %{_datadir}/%{name}
>-%{_javadir}/findbugs-annotations*
>-%{_javadir}/findbugs-%{version}.jar
>-%{_javadir}/findbugs.jar
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>+%{_javadir}/%{name}-annotations.jar
>+%{_javadir}/%{name}.jar
>+%{_mavenpomdir}/JPP-%{name}*.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %files -n ant-findbugs
> %doc LICENSE.txt
>-%{_javadir}/ant/*
>+%{_javadir}/ant/ant-%{name}.jar
>+%{_mavenpomdir}/JPP.ant-ant-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}-ant
> %config(noreplace) %{_sysconfdir}/ant.d/%{name}
> 
>+%pre javadoc
>+# workaround for rpm bug, can be removed in F-17
>+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
>+
> %files javadoc
>-%{_javadocdir}/*
>+%{_javadocdir}/%{name}
> 
> %files tools
> %doc LICENSE.txt README.fedora
>-%{_javadir}/findbugs-tools*
>+%{_javadir}/%{name}-tools.jar
> 
> %changelog
>+* Fri May 25 2012 gil cattaneo <puntogil@libero.it> 1.3.9-9
>+- Added findbugs-ant POM
>+- com.google.code.findbugs:* added to the dependencies map
>+- Adapt to current guidelines
>+
> * Wed Mar 14 2012 Marek Goldmann <mgoldman@redhat.com> 1.3.9-8
> - Added POMS (RHBZ#803352)
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 825243: 586854