rpms/maven-shared/devel maven-shared-modelv3.patch, NONE, 1.1 maven-shared.spec, 1.13, 1.14

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-shared/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3750/devel

Modified Files:
	maven-shared.spec 
Added Files:
	maven-shared-modelv3.patch 
Log Message:
Fix build.

maven-shared-modelv3.patch:
 pom.xml |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE maven-shared-modelv3.patch ---
diff -up maven-shared-components-8/maven-model-converter/pom.xml.modelv3 maven-shared-components-8/maven-model-converter/pom.xml
--- maven-model-converter/pom.xml.modelv3	2009-11-26 17:53:56.000000000 +0100
+++ maven-model-converter/pom.xml	2009-11-26 17:54:17.000000000 +0100
@@ -31,11 +31,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model-v3</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>2.0.4</version>
     </dependency>


Index: maven-shared.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-shared/devel/maven-shared.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- maven-shared.spec	1 Sep 2009 14:52:05 -0000	1.13
+++ maven-shared.spec	22 Dec 2009 09:45:48 -0000	1.14
@@ -65,7 +65,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        8
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -81,6 +81,7 @@ Patch2:        %{name}-file-management-p
 Patch3:        %{name}-io-ArtifactLocatorStrategyTest.patch
 Patch4:        %{name}-plugin-tools-pom.patch
 Patch5:        %{name}-disable-cobertura.patch
+Patch6:        %{name}-modelv3.patch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven2 >= 0:2.0.4-9
@@ -92,6 +93,9 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-source
 BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven2-plugin-surefire-report
+BuildRequires:  maven-doxia-sitetools
+BuildRequires:  plexus-maven-plugin
 BuildRequires:  junit
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
@@ -538,6 +542,7 @@ chmod -R go=u-w *
 %patch3 -b .sav3
 %patch4 -b .sav4
 %patch5 -b .sav5
+%patch6 -b .sav6
 
 # Remove test that needs junit-addons until that makes it into Fedora
 rm -f maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
@@ -1102,6 +1107,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Nov 26 2009 Lubomir Rintel <lkundrak at v3.sk> 8-4
+- Fix build
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 8-3
 - Add tomcat5, easymock, and maven2-plugin-source BRs