[animal-sniffer] Update to upstream version 1.8

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Aug 2 20:12:26 UTC 2012


commit 029cc1b464693b207796c4ce334c23a8af1f81ec
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Aug 2 22:09:55 2012 +0200

    Update to upstream version 1.8

 0001-Add-maven-3-compatibility.patch               |   45 --------------------
 ...-ArtifactUtils.artifactId-with-local-code.patch |   29 -------------
 animal-sniffer.spec                                |   20 +++++----
 sources                                            |    2 +-
 4 files changed, 12 insertions(+), 84 deletions(-)
---
diff --git a/animal-sniffer.spec b/animal-sniffer.spec
index c18bb02..de315af 100644
--- a/animal-sniffer.spec
+++ b/animal-sniffer.spec
@@ -1,18 +1,16 @@
 Name:           animal-sniffer
-Version:        1.7
-Release:        4%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Tools to assist verifying backward compatibility of Java classes
 
 Group:          Development/Tools
 License:        MIT
 URL:            http://mojo.codehaus.org/animal-sniffer/
 
-Source0:        http://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.7/animal-sniffer-parent-1.7-source-release.zip
+Source0:        http://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-parent/%{version}/animal-sniffer-parent-%{version}-source-release.zip
 Source1:        %{name}.sh
 
-# these should be upstreamable after some cleanup and verification
-Patch0:         0001-Add-maven-3-compatibility.patch
-Patch1:         0002-Replace-ArtifactUtils.artifactId-with-local-code.patch
+# this should be upstreamable
 Patch2:         0003-Remove-catch-for-unthrown-PlexusConfigurationExcepti.patch
 
 BuildArch:      noarch
@@ -35,9 +33,10 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  plexus-containers-component-javadoc
 BuildRequires:  mojo-parent
+BuildRequires:  objectweb-asm4
 
 Requires:       maven
-Requires:       objectweb-asm
+Requires:       objectweb-asm4
 Requires:       ant
 Requires:       mojo-signatures
 
@@ -57,9 +56,9 @@ Requires:       jpackage-utils
 
 %prep
 %setup -q -n %{name}-parent-%{version}
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
+%pom_add_dep org.apache.maven:maven-compat animal-sniffer-enforcer-rule
+%pom_add_dep org.apache.maven:maven-compat animal-sniffer-maven-plugin
 
 
 %build
@@ -115,6 +114,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug  2 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.8-1
+- Update to upstream version 1.8
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 113f899..dfd9f90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd136ae7c8785f96f69ee4c968b8e2c3  animal-sniffer-parent-1.7-source-release.zip
+a2d366fd6d3765a2a1992f05766e95a2  animal-sniffer-parent-1.8-source-release.zip


More information about the scm-commits mailing list