Update to latest upstream version.

.gitignore

@@ -1,3 +1,4 @@
 maven-assembly-plugin-2.2-beta-5-src.tar.gz
 maven-assembly-plugin-2.2-source-release.zip
 maven-assembly-plugin-2.2.1-source-release.zip
+maven-assembly-plugin-2.2.2-source-release.zip

maven-assembly-plugin-migration-to-component-metadata.patch

@@ -1,31 +0,0 @@
-diff -Naur maven-assembly-plugin-2.2.1.orig/pom.xml maven-assembly-plugin-2.2.1/pom.xml
---- maven-assembly-plugin-2.2.1.orig/pom.xml	2011-02-24 21:03:42.000000000 +0100
-+++ maven-assembly-plugin-2.2.1/pom.xml	2011-06-22 18:13:32.000000000 +0200
-@@ -212,23 +212,23 @@
-     <plugins>
-       <plugin>
-         <groupId>org.codehaus.plexus</groupId>
--        <artifactId>plexus-maven-plugin</artifactId>
-+        <artifactId>plexus-component-metadata</artifactId>
-         <executions>
-           <execution>
-             <id>create-component-descriptor</id>
-             <phase>generate-resources</phase>
-             <goals>
--              <goal>descriptor</goal>
-+              <goal>generate-metadata</goal>
-             </goals>
-             <configuration>
--              <outputDirectory>${project.build.directory}/generated-resources/plexus</outputDirectory>
-+              <generatedMetadata>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</generatedMetadata>
-             </configuration>
-           </execution>
-           <execution>
-             <id>merge-metadata</id>
-             <phase>process-resources</phase>
-             <goals>
--              <goal>merge-descriptors</goal>
-+              <goal>merge-metadata</goal>
-             </goals>
-             <configuration>
-               <!-- <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output> -->

maven-assembly-plugin.spec

@@ -1,6 +1,6 @@
 Name:           maven-assembly-plugin
-Version:        2.2.1
+Version:        2.2.2
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Maven Assembly Plugin
 
 Group:          Development/Libraries
@@ -8,8 +8,6 @@ License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-assembly-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
-Patch0:         %{name}-migration-to-component-metadata.patch
-
 BuildArch: noarch
 
 Obsoletes: maven2-plugin-assembly <= 0:2.0.8
@@ -69,10 +67,7 @@ Requires: maven-shared-repository-builder
 Requires: maven-shared-filtering
 Requires: maven-shared-file-management
 Requires: maven-shared-io
-
+Requires: jpackage-utils >= 0:1.7.2
-Requires:          jpackage-utils >= 0:1.7.2
-Requires(post):    jpackage-utils >= 0:1.7.2
-Requires(postun):  jpackage-utils >= 0:1.7.2
 
 %description
 A Maven 2 plugin to create archives of your project's sources, classes, 
@@ -81,19 +76,15 @@ dependencies etc. from flexible assembly descriptors.
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:          jpackage-utils >= 0:1.7.2
+Requires:       jpackage-utils >= 0:1.7.2
 
 %description javadoc
 API documentation for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
-%patch0 -p1
-
-mkdir -p target/classes/
-cp -pr src/main/resources/META-INF/ target/classes/
 
 %build
 # seems koji don't have easymockclassextension
@@ -101,8 +92,6 @@ mvn-rpmbuild \
         -Dmaven.test.skip=true \
         install javadoc:aggregate
 
-
-
 %install
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
@@ -129,6 +118,9 @@ rm -rf target/site/api*
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Dec 6 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2.2-1
+- Update to latest upstream version.
+
 * Sun Oct 2 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2.1-4
 - Add missing BR/R.
 

sources

@@ -1 +1 @@
-62c1483e35a3d231c1fd1de614ec6e46  maven-assembly-plugin-2.2.1-source-release.zip
+c7a3ced1b6eace42fbea1ac1074796fa  maven-assembly-plugin-2.2.2-source-release.zip