[findbugs] Use current POMs

richardfearn richardfearn at fedoraproject.org
Sun Jul 13 11:14:36 UTC 2014


commit 6cb8fc01f8854981ab07a54e3e44d831b88c825b
Author: Richard Fearn <richardfearn at gmail.com>
Date:   Sun Jul 13 11:53:43 2014 +0100

    Use current POMs

 annotations-2.0.3.pom => annotations-3.0.0.pom |    6 +-
 findbugs-2.0.3.pom                             |  355 ------------------------
 findbugs-3.0.0.pom                             |  191 +++++++++++++
 findbugs-ant-2.0.3.pom                         |  154 ----------
 findbugs-ant-3.0.0.pom                         |  159 +++++++++++
 findbugs.spec                                  |   12 +-
 6 files changed, 360 insertions(+), 517 deletions(-)
---
diff --git a/annotations-2.0.3.pom b/annotations-3.0.0.pom
similarity index 96%
rename from annotations-2.0.3.pom
rename to annotations-3.0.0.pom
index 3be02ae..59e950d 100644
--- a/annotations-2.0.3.pom
+++ b/annotations-3.0.0.pom
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.google.code.findbugs</groupId>
 	<artifactId>annotations</artifactId>
-	<version>2.0.3</version>
+	<version>3.0.0</version>
 	<packaging>jar</packaging>
 	<url>http://findbugs.sourceforge.net/</url>
 	<name>FindBugs-Annotations</name>
@@ -56,8 +56,8 @@
 	<contributors>
 		<contributor>
 			<name>Garvin LeClaire</name>
-			<email>gleclaire at codehaus.org</email>
-			<url>http://gdleclaire.blogspot.com</url>
+			<email>garvin.leclaire at gmail.com</email>
+			<url></url>
 			<roles>
 				<role>Maven</role>
 			</roles>
diff --git a/findbugs-3.0.0.pom b/findbugs-3.0.0.pom
new file mode 100644
index 0000000..d02b907
--- /dev/null
+++ b/findbugs-3.0.0.pom
@@ -0,0 +1,191 @@
+<?xml version="1.0"?>
+<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>com.google.code.findbugs</groupId>
+  <artifactId>findbugs</artifactId>
+  <version>3.0.0</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: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>garvin.leclaire at gmail.com</email>
+      <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>
+  </contributors>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>bcel-findbugs</artifactId>
+      <version>6.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jFormatString</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.6.1</version>
+    </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>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-debug-all</artifactId>
+      <version>5.0.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.6</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/findbugs-ant-3.0.0.pom b/findbugs-ant-3.0.0.pom
new file mode 100644
index 0000000..19f4f3f
--- /dev/null
+++ b/findbugs-ant-3.0.0.pom
@@ -0,0 +1,159 @@
+<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>com.google.code.findbugs</groupId>
+	<artifactId>findbugs-ant</artifactId>
+	<version>3.0.0</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: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></email>
+      <url>http://keithlea.com/</url>
+      <roles>
+        <role>web cloud</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Garvin LeClaire</name>
+      <email>garvin.leclaire at gmail.com</email>
+      <url></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></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Ben Langmead</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Tomas Pollak</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role>Eclipse plugin tests</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Phil Crosby</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Peter Friese</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role>Eclipse plugin</role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Dave Brosius</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Brian Goetz</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+    <contributor>
+      <name>Rohan Lloyd</name>
+      <email></email>
+      <url></url>
+      <roles>
+        <role></role>
+      </roles>
+      <timezone>-5</timezone>
+    </contributor>
+  </contributors>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>findbugs</artifactId>
+			<version>3.0.0</version>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/findbugs.spec b/findbugs.spec
index d2b9edb..91d28ca 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -2,7 +2,7 @@
 
 Name:           findbugs
 Version:        3.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -12,8 +12,8 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-sour
 Source1:        findbugs-ant
 Source2:        findbugs-tools-README
 
-Source3:        http://search.maven.org/remotecontent?filepath=com/google/code/findbugs/findbugs/2.0.3/findbugs-2.0.3.pom
-Source4:        http://search.maven.org/remotecontent?filepath=com/google/code/findbugs/annotations/2.0.3/annotations-2.0.3.pom
+Source3:        http://repo1.maven.org/maven2/com/google/code/findbugs/findbugs/3.0.0/findbugs-3.0.0.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.
 # It was created with:
@@ -21,7 +21,7 @@ Source4:        http://search.maven.org/remotecontent?filepath=com/google/code/f
 #   $ git --git-dir=findbugs.git archive --format tgz cce19ac plugins/noUpdateChecks -o noUpdateChecks-plugin-20140707gitcce19ac.tgz
 Source5:        noUpdateChecks-plugin-%{noupdatechecks_version}.tgz
 
-Source6:        http://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-ant/2.0.3/findbugs-ant-2.0.3.pom
+Source6:        http://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-ant/3.0.0/findbugs-ant-3.0.0.pom
 
 # This patch has not been submitted upstream, as it contains Fedora-specific
 # changes.  It looks in /usr/share/java for jar files at compile time, instead
@@ -191,7 +191,6 @@ rm -f build/doc/manual*.xml build/doc/manual*.xsl
 
 # Install poms
 mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
-sed -i 's/2\.0\.3/3\.0\.0/g' %{SOURCE3} %{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
@@ -220,6 +219,9 @@ cp %{SOURCE6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.ant-ant-%{name}.pom
 %{_javadir}/findbugs-tools.jar
 
 %changelog
+* Sun Jul 13 2014 Richard Fearn <richardfearn at gmail.com> - 3.0.0-3
+- Use current POMs
+
 * Tue Jul 08 2014 Richard Fearn <richardfearn at gmail.com> - 3.0.0-2
 - Generate HTML manual (using xsltproc) and include in main package
 


More information about the scm-commits mailing list