Build with maven 3.x

0001-Add-default-role-hint-to-DefaultResourceManager.patch

@@ -1,25 +0,0 @@
-From af71610068c086c03272c63716745fae519af96a Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Fri, 6 Aug 2010 15:25:23 +0200
-Subject: [PATCH] Add default role-hint to DefaultResourceManager
-
----
- .../plexus/resource/DefaultResourceManager.java    |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java b/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
-index 8d840f9..5a464f3 100644
---- a/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
-+++ b/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
-@@ -44,7 +44,7 @@ import java.util.Map;
-  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
-  * @author Jason van Zyl
-  * @version $Id: DefaultResourceManager.java 8647 2010-02-15 00:08:07Z olamy $
-- * @plexus.component instantiation-strategy="per-lookup"
-+ * @plexus.component instantiation-strategy="per-lookup" role-hint="default"
-  */
- public class DefaultResourceManager
-     extends AbstractLogEnabled
--- 
-1.7.2.1
-

plexus-resources-1.0-jpp-depmap.xml

@@ -1,14 +0,0 @@
-<dependencies>
-  <dependency>
-    <maven>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-8</version>
-    </maven>
-    <jpp>
-      <groupId>JPP/plexus</groupId>
-      <artifactId>container-default</artifactId>
-      <version>1.0-alpha-8</version>
-    </jpp>
-  </dependency>
-</dependencies>

plexus-resources-settings.xml

@@ -1,47 +0,0 @@
-<settings>
-	<profiles>
-		<profile>
-			<id>JPP</id>
-			<repositories>
-				<repository>
-					<id>internal</id>
-					<layout>jpp</layout>
-					<url>__JPP_URL_PLACEHOLDER__</url>
-				</repository>
-				<repository>
-					<id>external</id>
-					<layout>jpp</layout>
-					<url>__JAVADIR_PLACEHOLDER__</url>
-				</repository>
-				<repository>
-					<id>local</id>
-					<layout>jpp</layout>
-					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
-				</repository>
-			</repositories>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>plugins-internal</id>
-					<name>plugins-internal</name>
-					<layout>jpp</layout>
-					<url>__JPP_URL_PLACEHOLDER__</url>
-				</pluginRepository>
-				<pluginRepository>
-					<id>plugins-external</id>
-					<name>plugins-external</name>
-					<layout>jpp</layout>
-					<url>__JAVADIR_PLACEHOLDER__</url>
-				</pluginRepository>
-				<pluginRepository>
-					<id>plugins-maven</id>
-					<name>plugins-maven</name>
-					<layout>jpp</layout>
-					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
-				</pluginRepository>
-			</pluginRepositories>
-		</profile>
-	</profiles>
-	<activeProfiles>
-		<activeProfile>JPP</activeProfile>
-	</activeProfiles>
-</settings>

plexus-resources.spec

@@ -34,7 +34,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.4.a7%{?dist}
+Release:        0.5.a7%{?dist}
 Summary:        Plexus Resource Manager
 License:        MIT
 Group:          Development/Tools
@@ -42,9 +42,6 @@ URL:            http://plexus.codehaus.org/
 # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-resources-1.0-alpha-7/
 # tar caf plexus-resources-1.0-alpha-7-src.tar.xz plexus-resources-1.0-alpha-7
 Source0:        %{name}-%{version}-alpha-7-src.tar.xz
-Source3:        plexus-resources-settings.xml
-Source4:        plexus-resources-1.0-jpp-depmap.xml
-Patch0:         0001-Add-default-role-hint-to-DefaultResourceManager.patch
 Requires:       classworlds >= 0:1.1
 Requires:       plexus-container-default
 Requires:       plexus-utils
@@ -54,14 +51,14 @@ Requires(postun): jpackage-utils >= 0:1.7.3
 BuildRequires:  jpackage-utils >= 0:1.7.3
 BuildRequires:  java-devel >= 0:1.5.0
 BuildRequires:  ant >= 0:1.6
-BuildRequires:  maven2
+BuildRequires:  maven
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-release-plugin
 BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
@@ -70,7 +67,6 @@ BuildRequires:  plexus-container-default
 BuildRequires:  plexus-utils
 
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -83,58 +79,34 @@ is like a J2EE application server, without all the baggage.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{namedversion}
-cp -p %{SOURCE3} settings.xml
-%patch0 -p1
 
 %build
-sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+mvn-rpmbuild \
-sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
+        -Dmaven.test.failure.ignore=true \
-sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
-sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
-
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
-mvn-jpp \
-        -e \
-        -s $(pwd)/settings.xml \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven2.jpp.depmap.file=%{SOURCE4} \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install javadoc:javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 target/%{name}-%{namedversion}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}.jar
 %add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} JPP/%{parent} %{subname}
 
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-
 # poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
@@ -143,17 +115,17 @@ rm -rf $RPM_BUILD_ROOT
 %update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/%{parent}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako@redhat.com> 1.0-0.5.a7
+- Build with maven 3.x
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.4.a7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild