rpms/maven-changes-plugin/devel 0001-xmlrpc3-common-dependency.patch, NONE, 1.1 maven-changes-plugin.depmap, NONE, 1.1 maven-changes-plugin.spec, 1.1, 1.2

Stanislav Ochotnicky sochotni at fedoraproject.org
Sun Jul 25 15:13:22 UTC 2010


Author: sochotni

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

Modified Files:
	maven-changes-plugin.spec 
Added Files:
	0001-xmlrpc3-common-dependency.patch 
	maven-changes-plugin.depmap 
Log Message:
Fix wrong import


0001-xmlrpc3-common-dependency.patch:
 pom.xml |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE 0001-xmlrpc3-common-dependency.patch ---
>From 05fbad1c5ed7da809904908e5d0924ca97f645de Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Wed, 21 Jul 2010 14:34:36 +0200
Subject: [PATCH 1/2] xmlrpc3-common dependency

---
 pom.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4754b2e..d64e323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,6 +301,12 @@ under the License.
       <version>3.0</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.xmlrpc</groupId>
+      <artifactId>xmlrpc-common</artifactId>
+      <version>3.0</version>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
-- 
1.7.1.1



--- NEW FILE maven-changes-plugin.depmap ---
<dependencies>
    <dependency>
      <maven>
        <groupId>org.apache.xmlrpc</groupId>
        <artifactId>xmlrpc-client</artifactId>
        <version>3.0</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>xmlrpc3-client</artifactId>
        <version>3.0</version>
      </jpp>
    </dependency>
    <dependency>
      <maven>
        <groupId>org.apache.xmlrpc</groupId>
        <artifactId>xmlrpc-common</artifactId>
        <version>3.0</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>xmlrpc3-common</artifactId>
        <version>3.0</version>
      </jpp>
    </dependency>
</dependencies>


Index: maven-changes-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-changes-plugin/devel/maven-changes-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-changes-plugin.spec	25 Jul 2010 13:49:49 -0000	1.1
+++ maven-changes-plugin.spec	25 Jul 2010 15:13:21 -0000	1.2
@@ -10,10 +10,11 @@ URL:            http://maven.apache.org/
 # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.3
 # tar caf maven-changes-plugin-2.3.tar.xz maven-changes-plugin-2.3
 Source0:        %{name}-%{version}.tar.xz
-#Source1:        %{name}.depmap
+Source1:        %{name}.depmap
 
 # patches not upstreamed yet, tests need to  be fixed to work with new
 # doxia too
+Patch0:         0001-xmlrpc3-common-dependency.patch
 Patch1:         0002-doxia-1.1-import-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,14 +70,15 @@ API documentation for %{name}.
 
 %prep
 %setup -q #You may need to update this according to your Source0
+%patch0 -p1
 %patch1 -p1
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-#        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
 # tests are skipped because package expects old doxia and doesn't work
 # with new one
 mvn-jpp -e \
+        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven.test.skip=true \
         install javadoc:javadoc



More information about the scm-commits mailing list