rpms/maven-plugin-testing/devel maven-plugin-testing-depmap.xml, NONE, 1.1 maven-plugin-testing.spec, 1.8, 1.9

Alexander Kurtakov akurtakov at fedoraproject.org
Mon May 31 08:08:20 UTC 2010


Author: akurtakov

Update of /cvs/pkgs/rpms/maven-plugin-testing/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31418/devel

Modified Files:
	maven-plugin-testing.spec 
Added Files:
	maven-plugin-testing-depmap.xml 
Log Message:
- Add depmap to fix build.


--- NEW FILE maven-plugin-testing-depmap.xml ---
<dependencies>
	<dependency>
	  <maven>
		<groupId>org.apache.maven</groupId>
		<artifactId>maven-archiver</artifactId>
		<version>2.4</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>maven-archiver</artifactId>
		<version>2.4</version>
	  </jpp>
	</dependency>
</dependencies>



Index: maven-plugin-testing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-testing/devel/maven-plugin-testing.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- maven-plugin-testing.spec	28 May 2010 21:42:18 -0000	1.8
+++ maven-plugin-testing.spec	31 May 2010 08:08:20 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           maven-plugin-testing
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven Plugin Testing
 
 Group:          Development/Libraries
@@ -9,6 +9,7 @@ URL:            http://maven.apache.org/
 #svn export http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-1.2 maven-plugin-testing-1.2
 #tar caf maven-plugin-testing-1.2 maven-plugin-testing-1.2/
 Source0:        %{name}-%{version}.tar.xz
+Source1:        %{name}-depmap.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -26,7 +27,7 @@ BuildRequires: maven-doxia-sitetools
 BuildRequires: maven-surefire-maven-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-shared-reporting-impl
-BuildRequires: maven-shared-test-tools
+BuildRequires: maven-test-tools
 Requires: maven2
 Requires:       jpackage-utils
 Requires:       java
@@ -72,11 +73,12 @@ Requires: maven-plugin-testing = %{versi
 
 %description -n maven-test-tools
 Framework to test Maven Plugins with Easymock objects.
-Obsoletes: maven-shared-test-tools <= 0:1.0
-Provides : maven-shared-test-tools = 1:%{version}-%{release}
+Obsoletes: maven-shared-test-tools <= 0:%{version}-%{release}
+Provides: maven-shared-test-tools = 1:%{version}-%{release}
 
 %prep
 %setup -q #You may need to update this according to your Source0
+rm -fr src/site/site.xml
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -84,6 +86,7 @@ mvn-jpp \
         -e \
         -Dmaven2.jpp.mode=true \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
         -Dmaven.test.skip=true \
         install javadoc:javadoc
 #tests are skipped due to some test failures most probably caused by issues with our plexus container
@@ -161,6 +164,9 @@ rm -rf %{buildroot}
 %{_javadir}/%{name}/maven-test-tools*
 
 %changelog
+* Mon May 31 2010 Alexander Kurtakov <akurtako at redhat.com> 1.2-4
+- Add depmap to fix build
+
 * Sat May 29 2010 Alexander Kurtakov <akurtako at redhat.com> 1.2-3
 - Obsolete maven-shared-test-tools.
 



More information about the scm-commits mailing list