[Jpackage-commits] dist/maven-enforcer/devel maven-enforcer-plexus-javadoc.patch, NONE, 1.1 maven-enforcer.spec, 1.6, 1.7

David Walluck david at ryu.zarb.org
Wed Oct 12 19:29:20 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-enforcer/devel
In directory ryu.zarb.org:/tmp/cvs-serv27730

Modified Files:
	maven-enforcer.spec 
Added Files:
	maven-enforcer-plexus-javadoc.patch 
Log Message:
- build tests

--- NEW FILE: maven-enforcer-plexus-javadoc.patch ---
--- maven-enforcer-1.0.1/pom.xml.orig	2011-10-12 13:26:59.201101969 -0400
+++ maven-enforcer-1.0.1/pom.xml	2011-10-12 13:26:59.205101659 -0400
@@ -286,7 +286,7 @@
              </tagletArtifact>
              <tagletArtifact>
                <groupId>org.codehaus.plexus</groupId>
-               <artifactId>plexus-javadoc</artifactId>
+               <artifactId>plexus-component-javadoc</artifactId>
                <version>1.0</version>
              </tagletArtifact>
            </tagletArtifacts>

Index: maven-enforcer.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-enforcer/devel/maven-enforcer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** maven-enforcer.spec	12 Oct 2011 17:18:05 -0000	1.6
--- maven-enforcer.spec	12 Oct 2011 17:29:18 -0000	1.7
***************
*** 13,18 ****
  Patch0:         fix-site.patch
  Patch1:         enforcer-rules-pom.patch
! # FIXME: we can enable if we can get the right plexuc-container-default to be used
  Patch2:         maven-enforcer-skip-tests.patch
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
--- 13,19 ----
  Patch0:         fix-site.patch
  Patch1:         enforcer-rules-pom.patch
! # FIXME: we can enable if we can get the right plexus-container-default to be used
  Patch2:         maven-enforcer-skip-tests.patch
+ Patch3:         maven-enforcer-plexus-javadoc.patch
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
***************
*** 107,121 ****
  %setup -q
  %patch0 -p0 -b .sav0
  %patch1 -p0 -b .sav1
  %patch2 -p1 -b .sav2
! 
! # use new plexus-javadoc taglet replacement
! %{__sed} -i 's:plexus-javadoc:plexus-component-javadoc:' pom.xml
  
  %build
  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 -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy javadoc:aggregate
  
  %install
--- 108,122 ----
  %setup -q
  %patch0 -p0 -b .sav0
+ %if 0
  %patch1 -p0 -b .sav1
  %patch2 -p1 -b .sav2
! %endif
! %patch3 -p1 -b .sav3
  
  %build
  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 -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} -Dmaven.test.skip=false deploy javadoc:aggregate
  
  %install
***************
*** 124,131 ****
  # jars
  %{__mkdir_p} %{buildroot}%{_javadir}
! install -p -m 644 enforcer-api/target/enforcer-api-%{namedversion}.jar %{buildroot}%{_javadir}/enforcer-api-%{namedversion}.jar
! install -p -m 644 enforcer-rules/target/enforcer-rules-%{namedversion}.jar %{buildroot}%{_javadir}/enforcer-rules-%{namedversion}.jar
! install -p -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/maven-enforcer-plugin-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} `echo $jar| sed "s|-%{namedversion}||g"`; done)
  
  # poms
--- 125,132 ----
  # jars
  %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -p enforcer-api/target/enforcer-api-%{namedversion}.jar %{buildroot}%{_javadir}/enforcer-api-%{namedversion}.jar
! %{__cp} -p enforcer-rules/target/enforcer-rules-%{namedversion}.jar %{buildroot}%{_javadir}/enforcer-rules-%{namedversion}.jar
! %{__cp} -p maven-enforcer-plugin/target/maven-enforcer-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/maven-enforcer-plugin-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do %{__ln_s} ${jar} `/bin/echo ${jar} | %{__sed} "s|-%{namedversion}||g"`; done)
  
  # poms




More information about the JPackage-commits mailing list