From 699cc5e9365325ab69f0f06565c366cfa156d815 Mon Sep 17 00:00:00 2001
From: Tomas Radej <tradej@redhat.com>
Date: Fri, 16 Sep 2011 12:24:10 +0200
Subject: [PATCH] Updated to 2.3.2

---
 .gitignore                            |  1 +
 maven-jar-plugin-maven-core-dep.patch | 16 +++++++++++++
 maven-jar-plugin.spec                 | 33 ++++++++++++---------------
 sources                               |  2 +-
 4 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 maven-jar-plugin-maven-core-dep.patch

diff --git a/.gitignore b/.gitignore
index c686a61..f167b6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-jar-plugin-2.3.tar.xz
 maven-jar-plugin-2.3.1-source-release.zip
+/maven-jar-plugin-2.3.2-source-release.zip
diff --git a/maven-jar-plugin-maven-core-dep.patch b/maven-jar-plugin-maven-core-dep.patch
new file mode 100644
index 0000000..ba528dc
--- /dev/null
+++ b/maven-jar-plugin-maven-core-dep.patch
@@ -0,0 +1,16 @@
+diff --git a/pom.xml b/pom.xml
+index f5732ad..68aa1d8 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -71,6 +71,11 @@ under the License.
+   <dependencies>
+     <dependency>
+       <groupId>org.apache.maven</groupId>
++      <artifactId>maven-core</artifactId>
++      <version>${mavenVersion}</version>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.maven</groupId>
+       <artifactId>maven-plugin-api</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>
diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec
index 8fc604c..a325597 100644
--- a/maven-jar-plugin.spec
+++ b/maven-jar-plugin.spec
@@ -1,12 +1,15 @@
 Name:           maven-jar-plugin
-Version:        2.3.1
-Release:        3%{?dist}
+Version:        2.3.2
+Release:        1%{?dist}
 Summary:        Maven JAR Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-jar-plugin/
-Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/maven-jar-plugin/2.3.1/maven-jar-plugin-2.3.1-source-release.zip
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
+
+# Some classes from maven-artifact come in maven-core, added a dep in pom.xml
+Patch0:         %{name}-maven-core-dep.patch
 
 BuildArch: noarch
 
@@ -35,10 +38,7 @@ Requires: apache-commons-lang
 Requires: plexus-utils
 Requires: maven-plugin-testing-harness
 Requires: junit
-Requires:       jpackage-utils
-Requires:       java
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
+Requires: java
 
 Provides:       maven2-plugin-jar = %{version}-%{release}
 Obsoletes:      maven2-plugin-jar <= 0:2.0.8
@@ -58,36 +58,30 @@ API documentation for %{name}.
 
 %prep
 %setup -q 
+%patch0 -p1
+
 #let plexus-container-default be retrieved as a dependency
 sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
 
 %build
-mvn-rpmbuild \
-        -Dmaven.test.skip=true \
-        install javadoc:javadoc
+# Test class MockArtifact doesn't override method getMetadata
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip -X
 
 %install
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
-%add_to_maven_depmap org.apache.maven.plugins maven-jar-plugin %{version} JPP maven-jar-plugin
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %{_javadir}/*
 %{_mavenpomdir}/*
@@ -97,6 +91,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Sep 19 2011 Tomas Radej <tradej@redhat.com> - 2.3.2-1
+- Updated to 2.3.2
+
 * Fri Jun 17 2011 Alexander Kurtakov <akurtako@redhat.com> 2.3.1-3
 - Build with maven 3.
 
diff --git a/sources b/sources
index 9dde933..4ba0c20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b67514e0c4bda37ea21e8f934e1cfeb  maven-jar-plugin-2.3.1-source-release.zip
+64f5367c10a477b9cdfa9f730abc5e88  maven-jar-plugin-2.3.2-source-release.zip