[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia.spec, 1.9, 1.10

jpackage jpackage at ryu.zarb.org
Sun Dec 5 14:38:38 CET 2010


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

Modified Files:
	maven-doxia.spec 
Log Message:
use only one maven pass

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** maven-doxia.spec	5 Dec 2010 11:57:05 -0000	1.9
--- maven-doxia.spec	5 Dec 2010 13:38:36 -0000	1.10
***************
*** 66,70 ****
  Source6:        %{name}-jpp-depmap.xml
  Source7:        %{name}-settings.xml
- #Source8:        %{name}-plexus-containers.pom
  
  Patch0:         maven-doxia-1.0-pom.patch
--- 66,69 ----
***************
*** 183,187 ****
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
  mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/poms/
- #cp %{SOURCE8} $MAVEN_REPO_LOCAL/JPP/maven2/poms/JPP.plexus-containers.pom 
  
  export M2_SETTINGS=$(pwd)/settings.xml
--- 182,185 ----
***************
*** 193,205 ****
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven.test.failure.ignore=true \
-         install
- 
- mvn-jpp \
-         -e \
-         -s ${M2_SETTINGS} \
-         -Dmaven2.jpp.depmap.file=%{SOURCE6} \
-         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Daggregate=true \
!         javadoc:javadoc
  
  %else
--- 191,196 ----
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven.test.failure.ignore=true \
          -Daggregate=true \
!         install javadoc:javadoc
  
  %else




More information about the JPackage-commits mailing list