[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia-directory.patch, 1.1, 1.2 maven-doxia-jpp-depmap.xml, 1.4, 1.5 maven-doxia-module-fo-pom.patch, NONE, 1.1 maven-doxia.spec, 1.34, 1.35

David Walluck david at ryu.zarb.org
Wed Oct 12 06:05:30 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv28542

Modified Files:
	maven-doxia-directory.patch maven-doxia-jpp-depmap.xml 
	maven-doxia.spec 
Added Files:
	maven-doxia-module-fo-pom.patch 
Log Message:
- fix install

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -C 2 -d -r1.34 -r1.35
*** maven-doxia.spec	12 Oct 2011 03:53:07 -0000	1.34
--- maven-doxia.spec	12 Oct 2011 04:05:28 -0000	1.35
***************
*** 34,41 ****
  Name:           maven-doxia
  Version:        1.1
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Content generation framework
! License:        Apache Software License
  Group:          Development/Java
  URL:            http://maven.apache.org/doxia/
--- 34,41 ----
  Name:           maven-doxia
  Version:        1.1
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Content generation framework
! License:        ASL 2.0
  Group:          Development/Java
  URL:            http://maven.apache.org/doxia/
***************
*** 58,61 ****
--- 58,62 ----
  Patch5:         maven-doxia-directory.patch
  Patch6:         maven-doxia-doxia-maven-plugin.patch
+ Patch7:         maven-doxia-module-fo-pom.patch
  Requires(post):   jpackage-utils
  Requires(postun): jpackage-utils
***************
*** 154,165 ****
  %patch4 -p1 -b .sav4
  %patch5 -p1 -b .sav5
  %patch6 -p1 -b .sav6
  
  %if %with maven
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
  export MAVEN_OPTS="-Xms1g -Xmx1g"
! %{_bindir}/mvn-jpp -e -Dproject.build.directory=target -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dmaven2.jpp.depmap.file=%{SOURCE6} -Dmaven.test.skip=true -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy
! #javadoc:aggregate
  %else
  mkdir lib
--- 155,168 ----
  %patch4 -p1 -b .sav4
  %patch5 -p1 -b .sav5
+ %if 0
  %patch6 -p1 -b .sav6
+ %endif
+ %patch7 -p1 -b .sav7
  
  %if %with maven
  export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
! export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file://`pwd`/maven2-brew
  export MAVEN_OPTS="-Xms1g -Xmx1g"
! %{_bindir}/mvn-jpp -e -Dproject.build.directory=target -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dmaven2.jpp.depmap.file=%{SOURCE6} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy javadoc:aggregate
  %else
  mkdir lib
***************
*** 196,238 ****
  # jars
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-book/*/doxia-book-*.jar %{buildroot}%{_javadir}/doxia-book-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xhtml/*/doxia-module-xhtml-*.jar %{buildroot}%{_javadir}/doxia-module-xhtml-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xdoc/*/doxia-module-xdoc-*.jar %{buildroot}%{_javadir}/doxia-module-xdoc-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-twiki/*/doxia-module-twiki-*.jar %{buildroot}%{_javadir}/doxia-module-twiki-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-rtf/*/doxia-module-rtf-*.jar %{buildroot}%{_javadir}/doxia-module-rtf-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-latex/*/doxia-module-latex-*.jar %{buildroot}%{_javadir}/doxia-module-latex-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-itext/*/doxia-module-itext-*.jar %{buildroot}%{_javadir}/doxia-module-itext-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fo/*/doxia-module-fo-*.jar %{buildroot}%{_javadir}/doxia-module-fo-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fml/*/doxia-module-fml-*.jar %{buildroot}%{_javadir}/doxia-module-fml-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-docbook-simple/*/doxia-module-docbook-simple-*.jar %{buildroot}%{_javadir}/doxia-module-docbook-simple-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-confluence/*/doxia-module-confluence-*.jar %{buildroot}%{_javadir}/doxia-module-confluence-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-apt/*/doxia-module-apt-*.jar %{buildroot}%{_javadir}/doxia-module-apt-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/*/doxia-core-*-tests.jar %{buildroot}%{_javadir}/doxia-core-%{namedversion}-tests.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/*/doxia-core-1.?.jar %{buildroot}%{_javadir}/doxia-core-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-test-docs/*/doxia-test-docs-*.jar %{buildroot}%{_javadir}/doxia-test-docs-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-sink-api/*/doxia-sink-api-*.jar %{buildroot}%{_javadir}/doxia-sink-api-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-logging-api/*/doxia-logging-api-*.jar %{buildroot}%{_javadir}/doxia-logging-api-%{namedversion}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do %{__ln_s} ${jar} `/bin/echo ${jar} | %{__sed} -e "s|-%{namedversion}||g"`; done)
  
  # poms
  %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-book/*/doxia-book-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-book.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xhtml/*/doxia-module-xhtml-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-xhtml.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xdoc/*/doxia-module-xdoc-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-xdoc.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-twiki/*/doxia-module-twiki-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-twiki.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-rtf/*/doxia-module-rtf-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-rtf.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-latex/*/doxia-module-latex-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-latex.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-itext/*/doxia-module-itext-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-itext.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fo/*/doxia-module-fo-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-fo.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fml/*/doxia-module-fml-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-fml.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-docbook-simple/*/doxia-module-docbook-simple-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-docbook-simple.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-confluence/*/doxia-module-confluence-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-confluence.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-apt/*/doxia-module-apt-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-apt.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-modules/*/doxia-modules-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-modules.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/*/doxia-core-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-core.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-test-docs/*/doxia-test-docs-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-test-docs.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-sink-api/*/doxia-sink-api-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-sink-api.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-logging-api/*/doxia-logging-api-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-logging-api.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia/*/doxia-*.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia.pom
  
  # depmaps
--- 199,241 ----
  # jars
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-book/%{namedversion}/doxia-book-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-book-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xhtml/%{namedversion}/doxia-module-xhtml-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-xhtml-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xdoc/%{namedversion}/doxia-module-xdoc-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-xdoc-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-twiki/%{namedversion}/doxia-module-twiki-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-twiki-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-rtf/%{namedversion}/doxia-module-rtf-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-rtf-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-latex/%{namedversion}/doxia-module-latex-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-latex-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-itext/%{namedversion}/doxia-module-itext-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-itext-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fo/%{namedversion}/doxia-module-fo-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-fo-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fml/%{namedversion}/doxia-module-fml-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-fml-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-docbook-simple/%{namedversion}/doxia-module-docbook-simple-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-docbook-simple-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-confluence/%{namedversion}/doxia-module-confluence-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-confluence-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-apt/%{namedversion}/doxia-module-apt-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-module-apt-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/%{namedversion}/doxia-core-%{namedversion}-tests.jar %{buildroot}%{_javadir}/doxia-core-%{namedversion}-tests.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/%{namedversion}/doxia-core-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-core-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-test-docs/%{namedversion}/doxia-test-docs-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-test-docs-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-sink-api/%{namedversion}/doxia-sink-api-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-sink-api-%{namedversion}.jar
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-logging-api/%{namedversion}/doxia-logging-api-%{namedversion}.jar %{buildroot}%{_javadir}/doxia-logging-api-%{namedversion}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do %{__ln_s} ${jar} `/bin/echo ${jar} | %{__sed} -e "s|-%{namedversion}||g"`; done)
  
  # poms
  %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-book/%{namedversion}/doxia-book-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-book.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xhtml/%{namedversion}/doxia-module-xhtml-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-xhtml.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-xdoc/%{namedversion}/doxia-module-xdoc-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-xdoc.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-twiki/%{namedversion}/doxia-module-twiki-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-twiki.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-rtf/%{namedversion}/doxia-module-rtf-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-rtf.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-latex/%{namedversion}/doxia-module-latex-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-latex.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-itext/%{namedversion}/doxia-module-itext-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-itext.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fo/%{namedversion}/doxia-module-fo-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-fo.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-fml/%{namedversion}/doxia-module-fml-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-fml.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-docbook-simple/%{namedversion}/doxia-module-docbook-simple-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-docbook-simple.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-confluence/%{namedversion}/doxia-module-confluence-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-confluence.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-module-apt/%{namedversion}/doxia-module-apt-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-module-apt.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-modules/%{namedversion}/doxia-modules-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-modules.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-core/%{namedversion}/doxia-core-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-core.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-test-docs/%{namedversion}/doxia-test-docs-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-test-docs.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-sink-api/%{namedversion}/doxia-sink-api-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-sink-api.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia-logging-api/%{namedversion}/doxia-logging-api-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia-logging-api.pom
! %{__cp} -p maven2-brew/org/apache/maven/doxia/doxia/%{namedversion}/doxia-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-doxia.pom
  
  # depmaps
***************
*** 258,262 ****
  # Install javadocs
  %{__mkdir_p} %{buildroot}%{_javadocdir}/doxia-%{namedversion}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/doxia-%{namedversion}/ || :
  %{__ln_s} doxia-%{version} %{buildroot}%{_javadocdir}/doxia
  
--- 261,265 ----
  # Install javadocs
  %{__mkdir_p} %{buildroot}%{_javadocdir}/doxia-%{namedversion}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/doxia-%{namedversion}
  %{__ln_s} doxia-%{version} %{buildroot}%{_javadocdir}/doxia
  

Index: maven-doxia-directory.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia-directory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-doxia-directory.patch	12 Oct 2011 01:51:01 -0000	1.1
--- maven-doxia-directory.patch	12 Oct 2011 04:05:28 -0000	1.2
***************
*** 6,10 ****
         <resource>
  -        <directory>${build.directory}/generated-site/xsd</directory>
! +        <directory>${project.build.directory}/generated-site/xsd</directory>
           <includes>
             <include>**/*.xsd</include>
--- 6,10 ----
         <resource>
  -        <directory>${build.directory}/generated-site/xsd</directory>
! +        <directory>target/generated-site/xsd</directory>
           <includes>
             <include>**/*.xsd</include>

Index: maven-doxia-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia-jpp-depmap.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** maven-doxia-jpp-depmap.xml	12 Oct 2011 01:28:28 -0000	1.4
--- maven-doxia-jpp-depmap.xml	12 Oct 2011 04:05:28 -0000	1.5
***************
*** 1,104 ****
  <dependencies>
- <!--
-   <dependency>
- 	<maven>
- 	  <groupId>com.lowagie</groupId>
- 	  <artifactId>itext</artifactId>
- 	  <version>1.4</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>itext</artifactId>
- 	  <version>2.1.4</version>
- 	</jpp>
-   </dependency>
- 
-   <dependency>
- 	<maven>
- 	  <groupId>org.mortbay.jetty</groupId>
- 	  <artifactId>servlet-api</artifactId>
- 	  <version>2.5-20081211</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>servlet_2_5_api</artifactId>
- 	  <version>2.5</version>
- 	</jpp>
-   </dependency>
- 
-   <dependency>
- 	<maven>
- 	  <groupId>velocity</groupId>
- 	  <artifactId>velocity</artifactId>
- 	  <version>1.4</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>velocity14</artifactId>
- 	  <version>1.4</version>
- 	</jpp>
-   </dependency>
- 
-   <dependency>
- 	<maven>
- 	  <groupId>org.codehaus.plexus</groupId>
- 	  <artifactId>plexus-containers-container-default</artifactId>
- 	  <version>1.0-alpha-30</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP/plexus</groupId>
- 	  <artifactId>containers-container-default</artifactId>
- 	  <version>1.0-alpha-34</version>
- 	</jpp>
-   </dependency>
- 
-   <dependency>
- 	<maven>
- 	  <groupId>com.thoughtworks.qdox</groupId>
- 	  <artifactId>qdox</artifactId>
- 	  <version>1.6.3</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>qdox161</artifactId>
- 	  <version>1.6.1</version>
- 	</jpp>
-   </dependency>
-   <dependency>
- 	<maven>
- 	  <groupId>qdox</groupId>
- 	  <artifactId>qdox</artifactId>
- 	  <version>1.6.1</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>qdox161</artifactId>
- 	  <version>1.6.1</version>
- 	</jpp>
-   </dependency>
-   <dependency>
- 	<maven>
- 	  <groupId>xml-apis</groupId>
- 	  <artifactId>xml-apis-ext</artifactId>
- 	  <version>1.3.04</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>xml-commons-jaxp-1.3-apis</artifactId>
- 	  <version>1.3.04</version>
- 	</jpp>
-   </dependency>
- -->
-   <dependency>
- 	<maven>
- 	  <groupId>xml-apis</groupId>
- 	  <artifactId>xmlParserAPIs</artifactId>
- 	  <version>2.0.2</version>
- 	</maven>
- 	<jpp>
- 	  <groupId>JPP</groupId>
- 	  <artifactId>xml-commons-jaxp-1.3-apis</artifactId>
- 	  <version>1.3.04</version>
- 	</jpp>
-   </dependency>
  </dependencies>
--- 1,2 ----

--- NEW FILE: maven-doxia-module-fo-pom.patch ---
--- maven-doxia-1.1/doxia-modules/doxia-module-fo/pom.xml.orig	2009-03-03 13:32:44.000000000 -0500
+++ maven-doxia-1.1/doxia-modules/doxia-module-fo/pom.xml	2011-10-12 00:04:30.244143203 -0400
@@ -70,11 +70,11 @@
       <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xmlParserAPIs</artifactId>
       <version>2.0.2</version>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>




More information about the JPackage-commits mailing list