[animal-sniffer] Update to latest upstream (1.7)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Jul 26 17:08:21 UTC 2011
commit 8bda17ee514d4fecaeeefd4ead84c6b85c4adb34
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Jul 26 18:35:06 2011 +0200
Update to latest upstream (1.7)
- Add fixes for maven3 only buildroot
.gitignore | 1 +
0001-Add-maven-3-compatibility.patch | 45 +++++++++++++++
0001-add-asm-dependency-to-maven-plugin.patch | 60 --------------------
...-ArtifactUtils.artifactId-with-local-code.patch | 29 ++++++++++
...h-for-unthrown-PlexusConfigurationExcepti.patch | 36 ++++++++++++
animal-sniffer.spec | 29 +++++----
sources | 2 +-
7 files changed, 128 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2afb96e..1b6aae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/animal-sniffer-1.6.tar.xz
/animal-sniffer-parent-1.6-source-release.zip
+/animal-sniffer-parent-1.7-source-release.zip
diff --git a/0001-Add-maven-3-compatibility.patch b/0001-Add-maven-3-compatibility.patch
new file mode 100644
index 0000000..41bdbc7
--- /dev/null
+++ b/0001-Add-maven-3-compatibility.patch
@@ -0,0 +1,45 @@
+From abbe898f7077b340570f24d3435a2282a6df2e78 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Mon, 25 Jul 2011 16:45:13 +0200
+Subject: [PATCH 1/3] Add maven 3 compatibility
+
+---
+ animal-sniffer-enforcer-rule/pom.xml | 5 +++++
+ animal-sniffer-maven-plugin/pom.xml | 5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/animal-sniffer-enforcer-rule/pom.xml b/animal-sniffer-enforcer-rule/pom.xml
+index 788afab..b45c17d 100644
+--- a/animal-sniffer-enforcer-rule/pom.xml
++++ b/animal-sniffer-enforcer-rule/pom.xml
+@@ -48,6 +48,11 @@
+
+ <dependencies>
+ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>${maven.version}</version>
++ </dependency>
++ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer</artifactId>
+ <version>1.7</version>
+diff --git a/animal-sniffer-maven-plugin/pom.xml b/animal-sniffer-maven-plugin/pom.xml
+index 02b0621..b4d21c0 100644
+--- a/animal-sniffer-maven-plugin/pom.xml
++++ b/animal-sniffer-maven-plugin/pom.xml
+@@ -73,6 +73,11 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>2.0.1</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+--
+1.7.6
+
diff --git a/0002-Replace-ArtifactUtils.artifactId-with-local-code.patch b/0002-Replace-ArtifactUtils.artifactId-with-local-code.patch
new file mode 100644
index 0000000..a005d15
--- /dev/null
+++ b/0002-Replace-ArtifactUtils.artifactId-with-local-code.patch
@@ -0,0 +1,29 @@
+From a534ab5de6779e61932f5ab1103185de5ecc5415 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 26 Jul 2011 18:00:43 +0200
+Subject: [PATCH 2/3] Replace ArtifactUtils.artifactId with local code
+
+This removed dependency on old maven2 code
+---
+ .../animal_sniffer/maven/BuildSignaturesMojo.java | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/BuildSignaturesMojo.java b/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/BuildSignaturesMojo.java
+index 837260b..b343cb9 100644
+--- a/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/BuildSignaturesMojo.java
++++ b/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/BuildSignaturesMojo.java
+@@ -654,8 +654,9 @@ public class BuildSignaturesMojo
+
+ private static String artifactId( Artifact artifact )
+ {
+- return ArtifactUtils.artifactId( artifact.getGroupId(), artifact.getArtifactId(), artifact.getType(),
+- artifact.getClassifier(), artifact.getBaseVersion() );
++ String classifier = artifact.getClassifier();
++ return artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getType() +
++ ( classifier != null ? ":" + classifier : "" ) + ":" + artifact.getBaseVersion();
+ }
+
+ private ToolchainPrivate[] getToolchains( String type )
+--
+1.7.6
+
diff --git a/0003-Remove-catch-for-unthrown-PlexusConfigurationExcepti.patch b/0003-Remove-catch-for-unthrown-PlexusConfigurationExcepti.patch
new file mode 100644
index 0000000..eee97e4
--- /dev/null
+++ b/0003-Remove-catch-for-unthrown-PlexusConfigurationExcepti.patch
@@ -0,0 +1,36 @@
+From 54bb761d81700dcca3343b1afd8f15ad948a587e Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 26 Jul 2011 18:15:50 +0200
+Subject: [PATCH 3/3] Remove catch for unthrown PlexusConfigurationException
+
+---
+ .../maven/JdkToolchainConverter.java | 13 +++----------
+ 1 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/JdkToolchainConverter.java b/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/JdkToolchainConverter.java
+index 1c28dfc..b9b5123 100644
+--- a/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/JdkToolchainConverter.java
++++ b/animal-sniffer-maven-plugin/src/main/java/org/codehaus/mojo/animal_sniffer/maven/JdkToolchainConverter.java
+@@ -74,16 +74,9 @@ public class JdkToolchainConverter
+ Map parameters = new HashMap();
+ for ( int j = 0; j < params.length; j++ )
+ {
+- try
+- {
+- String name = params[j].getName();
+- String val = params[j].getValue();
+- parameters.put( name, val );
+- }
+- catch ( PlexusConfigurationException ex )
+- {
+- throw new ComponentConfigurationException( ex );
+- }
++ String name = params[j].getName();
++ String val = params[j].getValue();
++ parameters.put( name, val );
+ }
+ final JdkToolchain result = new JdkToolchain();
+ result.setParameters( Collections.unmodifiableMap( parameters ) );
+--
+1.7.6
+
diff --git a/animal-sniffer.spec b/animal-sniffer.spec
index 2214e90..e111cc3 100644
--- a/animal-sniffer.spec
+++ b/animal-sniffer.spec
@@ -1,16 +1,19 @@
Name: animal-sniffer
-Version: 1.6
-Release: 8%{?dist}
+Version: 1.7
+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.6/animal-sniffer-parent-1.6-source-release.zip
+Source0: http://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.7/animal-sniffer-parent-1.7-source-release.zip
Source1: %{name}.sh
-Patch0: 0001-add-asm-dependency-to-maven-plugin.patch
+# 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
+Patch2: 0003-Remove-catch-for-unthrown-PlexusConfigurationExcepti.patch
BuildArch: noarch
@@ -22,6 +25,7 @@ BuildRequires: maven-site-plugin
BuildRequires: maven-shade-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-plugin
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-plugin-build-helper
@@ -37,8 +41,6 @@ Requires: ant
Requires: mojo-signatures
Requires: java >= 1:1.6.0
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description
Tools to assist verifying that classes compiled with a newer JDK/API
@@ -55,6 +57,9 @@ Requires: jpackage-utils
%prep
%setup -q -n %{name}-parent-%{version}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
%build
mvn-rpmbuild install javadoc:aggregate
@@ -98,16 +103,10 @@ install -pm 644 java-boot-classpath-detector/pom.xml $RPM_BUILD_ROOT%{_mavenpomd
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_bindir}/%{name}
%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}
%{_javadir}/*.jar
@@ -115,6 +114,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jul 26 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.7-1
+- Update to latest upstream (1.7)
+- Add fixes for maven3 only buildroot
+
* Thu Jun 9 2011 Alexander Kurtakov <akurtako at redhat.com> 1.6-8
- Build with maven 3.x.
- Use upstream source.
diff --git a/sources b/sources
index 2ca5f5c..113f899 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7962b1f24fe2cd7b931eac5ac7d9cc1e animal-sniffer-parent-1.6-source-release.zip
+cd136ae7c8785f96f69ee4c968b8e2c3 animal-sniffer-parent-1.7-source-release.zip
More information about the scm-commits
mailing list