[maven-common-artifact-filters] Build with xmvn

[Mikolaj Izdebski]

commit 23d51dd25e700832f0ea4cf5b3f48382560d0271
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Feb 19 07:41:42 2013 +0100

    Build with xmvn

 maven-common-artifact-filters-1.4-pom.patch |   35 ----------
 maven-common-artifact-filters.spec          |   92 +++++++--------------------
 2 files changed, 22 insertions(+), 105 deletions(-)
---
diff --git a/maven-common-artifact-filters.spec b/maven-common-artifact-filters.spec
index ce378f7..19db812 100644
--- a/maven-common-artifact-filters.spec
+++ b/maven-common-artifact-filters.spec
@@ -1,112 +1,64 @@
 Name:          maven-common-artifact-filters
 Version:       1.4
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Maven Common Artifact Filters
-Group:         Development/Libraries
 License:       ASL 2.0
 Url:           http://maven.apache.org/shared/
 Source0:       http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Patch0:        %{name}-%{version}-pom.patch
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
-BuildRequires: easymock
-BuildRequires: junit
+BuildArch:     noarch
 
 BuildRequires: maven-local
+BuildRequires: easymock
 
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-
+BuildRequires: maven-shared
 BuildRequires: maven-plugin-testing-harness
 BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
 BuildRequires: maven-test-tools
 BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-utils
-
-# test deps
-BuildRequires: aopalliance
-BuildRequires: cglib
 
-Requires:      junit
-Requires:      maven
-Requires:      maven-test-tools
-Requires:      plexus-containers-container-default
-Requires:      plexus-utils
-
-Requires:      java
-Requires:      jpackage-utils
-BuildArch:     noarch
-
-Provides: maven-shared-common-artifact-filters = %{version}-%{release}
-Obsoletes: maven-shared-common-artifact-filters < %{version}-%{release}
+Provides:      maven-shared-common-artifact-filters = %{version}-%{release}
+Obsoletes:     maven-shared-common-artifact-filters < %{version}-%{release}
 
 %description
 A collection of ready-made filters to control inclusion/exclusion of artifacts
 during dependency resolution.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}.
 
 %prep
 %setup -q
-# replace maven-project with maven-core and maven-compat 3.0.3
-%patch0 -p0
-
-rm -rf DEPENDENCIES
 
-%pom_xpath_inject "pom:project/pom:dependencies" "
-  <dependency>
-    <groupId>aopalliance</groupId>
-    <artifactId>aopalliance</artifactId>
-    <scope>test</scope>
-  </dependency>
-  <dependency>
-    <groupId>cglib</groupId>
-    <artifactId>cglib</artifactId>
-    <scope>test</scope>
-  </dependency>"
+# Maven 2 -> Maven 3
+%pom_remove_dep :maven-project
+%pom_add_dep org.apache.maven:maven-core
+%pom_add_dep org.apache.maven:maven-compat
+%pom_xpath_set "pom:dependency[pom:groupId[text()='org.apache.maven']]/pom:version" 3.0.4
 
+# Workaround for rhbz#911365
+%pom_add_dep aopalliance:aopalliance::test
+%pom_add_dep cglib:cglib::test
 
 %build
-
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+%mvn_build
 
 %install
+%mvn_install
 
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# pom
-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/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc LICENSE NOTICE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Tue Feb 19 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.4-7
+- Build with xmvn
+- Bring back BR on maven-shared
+
 * Mon Feb 18 2013 Tomas Radej <tradej at redhat.com> - 1.4-6
 - Removed B/R on maven-shared (unnecessary + blocking maven-shared retirement)