From 7fe18d7e768afb3b51e954e5eea9276fb0442935 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Jun 12 2011 11:39:42 +0000 Subject: Build with maven 3.x --- diff --git a/0001-Add-default-role-hint-to-DefaultResourceManager.patch b/0001-Add-default-role-hint-to-DefaultResourceManager.patch deleted file mode 100644 index ec7708c..0000000 --- a/0001-Add-default-role-hint-to-DefaultResourceManager.patch +++ /dev/null @@ -1,25 +0,0 @@ -From af71610068c086c03272c63716745fae519af96a Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -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 Trygve Laugstøl - * @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 - diff --git a/plexus-resources-1.0-jpp-depmap.xml b/plexus-resources-1.0-jpp-depmap.xml deleted file mode 100644 index 7a8e1ca..0000000 --- a/plexus-resources-1.0-jpp-depmap.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - org.codehaus.plexus - plexus-container-default - 1.0-alpha-8 - - - JPP/plexus - container-default - 1.0-alpha-8 - - - diff --git a/plexus-resources-settings.xml b/plexus-resources-settings.xml deleted file mode 100644 index efe7bd7..0000000 --- a/plexus-resources-settings.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - JPP - - - internal - jpp - __JPP_URL_PLACEHOLDER__ - - - external - jpp - __JAVADIR_PLACEHOLDER__ - - - local - jpp - __MAVENREPO_DIR_PLACEHOLDER__ - - - - - plugins-internal - plugins-internal - jpp - __JPP_URL_PLACEHOLDER__ - - - plugins-external - plugins-external - jpp - __JAVADIR_PLACEHOLDER__ - - - plugins-maven - plugins-maven - jpp - __MAVENDIR_PLUGIN_PLACEHOLDER__ - - - - - - JPP - - diff --git a/plexus-resources.spec b/plexus-resources.spec index f85d6c1..0cff732 100644 --- a/plexus-resources.spec +++ b/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|__JPP_URL_PLACEHOLDER__|file://`pwd`/.m2/repository|g" settings.xml -sed -i -e "s|__JAVADIR_PLACEHOLDER__|file://`pwd`/external_repo|g" settings.xml -sed -i -e "s|__MAVENREPO_DIR_PLACEHOLDER__|file://`pwd`/.m2/repository|g" settings.xml -sed -i -e "s|__MAVENDIR_PLUGIN_PLACEHOLDER__|file:///usr/share/maven2/plugins|g" settings.xml -sed -i -e "s|__ECLIPSEDIR_PLUGIN_PLACEHOLDER__|file:///usr/share/eclipse/plugins|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 \ +mvn-rpmbuild \ + -Dmaven.test.failure.ignore=true \ 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} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %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 1.0-0.5.a7 +- Build with maven 3.x + * Wed Feb 09 2011 Fedora Release Engineering - 1.0-0.4.a7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild