[Jpackage-commits] dist/maven-javadoc-plugin/devel maven-javadoc-plugin-jpp-depmap.xml, 1.1, NONE maven-javadoc-plugin-pom.patch, 1.1, 1.2 maven-javadoc-plugin.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Sat Oct 15 02:46:54 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-javadoc-plugin/devel
In directory ryu.zarb.org:/tmp/cvs-serv19322

Modified Files:
	maven-javadoc-plugin-pom.patch maven-javadoc-plugin.spec 
Removed Files:
	maven-javadoc-plugin-jpp-depmap.xml 
Log Message:
- fix for JPackage

Index: maven-javadoc-plugin-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-javadoc-plugin/devel/maven-javadoc-plugin-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-javadoc-plugin-pom.patch	14 Oct 2011 00:06:55 -0000	1.1
--- maven-javadoc-plugin-pom.patch	15 Oct 2011 00:46:52 -0000	1.2
***************
*** 1,25 ****
! --- pom.xml.orig	2011-02-15 20:08:01.759190954 -0500
! +++ pom.xml	2011-02-15 20:07:13.242356317 -0500
! @@ -55,7 +55,7 @@
!    </issueManagement>
   
!    <properties>
! -    <mavenVersion>2.0.9</mavenVersion>
! +    <mavenVersion>2.0.8</mavenVersion>
!      <doxiaVersion>1.0</doxiaVersion>
!      <doxia-sitetoolsVersion>1.0</doxia-sitetoolsVersion>
!      <wagonVersion>1.0-beta-6</wagonVersion>
! @@ -159,11 +159,11 @@
!        <artifactId>log4j</artifactId>
!        <version>1.2.14</version>
!      </dependency>
! -    <dependency>
! +    <!--<dependency>
!        <groupId>com.thoughtworks.qdox</groupId>
!        <artifactId>qdox</artifactId>
!        <version>1.9.2</version>
! -    </dependency>
! +    </dependency>-->
   
!      <!-- Plexus -->
!      <dependency>
--- 1,11 ----
! --- pom.xml.orig	2010-04-30 13:58:13.000000000 -0400
! +++ pom.xml	2011-10-14 20:05:42.807469230 -0400
! @@ -41,7 +41,7 @@
!    <inceptionYear>2004</inceptionYear>
   
!    <prerequisites>
! -    <maven>2.0.9</maven>
! +    <maven>2.0.8</maven>
!    </prerequisites>
   
!    <scm>

Index: maven-javadoc-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-javadoc-plugin/devel/maven-javadoc-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-javadoc-plugin.spec	14 Oct 2011 00:06:55 -0000	1.1
--- maven-javadoc-plugin.spec	15 Oct 2011 00:46:52 -0000	1.2
***************
*** 1,40 ****
! %global bootstrap 0
  
  Name:           maven-javadoc-plugin
! Version:        2.8
! Release:        1%{?dist}
  Summary:        Maven Javadoc Plugin
! 
! Group:          Development/Libraries
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-javadoc-plugin
! # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.8 && tar cjf maven-javadoc-plugin-2.8.tar.bz2 maven-javadoc-plugin-2.8/
! Source0:        %{name}-%{version}.tar.bz2
! Source1:        maven-javadoc-plugin-jpp-depmap.xml
! 
! Patch0:         remove-test-deps.patch
! Patch1:         pom.patch
! Patch2:         maven-javadoc-plugin-pom.patch
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! 
  BuildRequires:  maven2
  BuildRequires:  maven2-common-poms
! BuildRequires:  maven-clean-plugin
! BuildRequires:  maven-compiler-plugin
! BuildRequires:  maven-install-plugin
! BuildRequires:  maven-jar-plugin
! BuildRequires:  maven-plugin-plugin
! BuildRequires:  maven-resources-plugin
  BuildRequires:  maven-surefire-maven-plugin
  BuildRequires:  maven-enforcer-plugin
  BuildRequires:  maven-shade-plugin
  BuildRequires:  maven-shared-common-artifact-filters
  BuildRequires:  plexus-interactivity
! BuildRequires:  maven-plugin-testing-harness
  BuildRequires:  xbean
! #BuildRequires:  qdox
  
! %if ! %{bootstrap}
  BuildRequires:  maven2-plugin-javadoc
  %endif        
--- 1,42 ----
! %bcond_with bootstrap
! 
! %global namedversion %{version}
  
  Name:           maven-javadoc-plugin
! Version:        2.7
! Release:        22%{?dist}
! Epoch:          0
  Summary:        Maven Javadoc Plugin
! Group:          Development/Java
  License:        ASL 2.0
  URL:            http://maven.apache.org/plugins/maven-javadoc-plugin
! %if 0
! svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.7 && tar cjf maven-javadoc-plugin-2.7.tar.bz2 maven-javadoc-plugin-2.7/
! %endif
! Source0:        maven-javadoc-plugin-%{namedversion}.tar.bz2
! Patch0:         maven-javadoc-plugin-pom.patch
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
  BuildRequires:  maven2
  BuildRequires:  maven2-common-poms
! BuildRequires:  maven2-plugin-clean
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-plugin
! BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven-surefire-maven-plugin
+ BuildRequires:  maven-surefire-provider-junit
  BuildRequires:  maven-enforcer-plugin
  BuildRequires:  maven-shade-plugin
  BuildRequires:  maven-shared-common-artifact-filters
  BuildRequires:  plexus-interactivity
! BuildRequires:  maven-shared-plugin-testing-harness
! BuildRequires:  jetty6-ext
! BuildRequires:  junit-addons>= 0:1.4
  BuildRequires:  xbean
! BuildRequires:  qdox
  
! %if %without bootstrap
  BuildRequires:  maven2-plugin-javadoc
  %endif        
***************
*** 43,50 ****
  Requires:       maven2
  Requires:       maven-shared-invoker
! #Requires:       qdox
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! BuildArch: noarch
  
  Obsoletes: maven2-plugin-javadoc <= 2.0.8
--- 45,51 ----
  Requires:       maven2
  Requires:       maven-shared-invoker
! Requires:       qdox
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  Obsoletes: maven2-plugin-javadoc <= 2.0.8
***************
*** 55,63 ****
  generating javadocs for the specified project.
   
! %if ! %{bootstrap}
  %package javadoc
  Group:          Documentation
  Summary:        Javadoc for %{name}
- Requires:       %{name} = %{version}-%{release}
  Requires:       jpackage-utils
  
--- 56,63 ----
  generating javadocs for the specified project.
   
! %if %without bootstrap
  %package javadoc
  Group:          Documentation
  Summary:        Javadoc for %{name}
  Requires:       jpackage-utils
  
***************
*** 69,102 ****
  %setup -q 
  %patch0 -p0 -b .sav0
- #%%patch1 -p0 -b .sav1
- %patch2 -p0 -b .sav2
  
  #Fix wrong importing package in JavadocReport.java
! sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.sink.render|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
! 
! # FIXME: needs new qdox
! %if 1
! rm src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
! rm src/main/java/org/apache/maven/plugin/javadoc/FixJavadocMojo.java
! rm src/main/java/org/apache/maven/plugin/javadoc/TestFixJavadocMojo.java
! %endif
  
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! 
! mvn-jpp \
!         -e \
!         -Dmaven2.jpp.mode=true \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         -Dmaven.test.skip=true \
!         install
! %if ! %{bootstrap}
! mvn-jpp \
!         -e \
!         -Dmaven2.jpp.mode=true \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven.test.skip=true \
         javadoc:javadoc
  %endif        
  
--- 69,82 ----
  %setup -q 
  %patch0 -p0 -b .sav0
  
  #Fix wrong importing package in JavadocReport.java
! ##sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.sink.render|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
  
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=$MAVEN_REPO_LOCAL install \
! %if %without bootstrap
         javadoc:javadoc
+ %else
  %endif        
  
***************
*** 106,127 ****
  # jars
  install -d -m 0755 %{buildroot}%{_javadir}
! install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}-%{version}.jar
! 
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
!     do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
! 
! %add_to_maven_depmap org.apache.maven.plugins maven-javadoc-plugin %{version} JPP maven-javadoc-plugin
  
  # poms
  install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -pm 644 pom.xml \
!     %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  
! %if ! %{bootstrap}
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
! rm -rf target/site/api*
  %endif
  
--- 86,102 ----
  # jars
  install -d -m 0755 %{buildroot}%{_javadir}
! install -p -m 644 target/maven-javadoc-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/maven-javadoc-plugin-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} `echo $jar| sed "s|-%{namedversion}||g"`; done)
  
  # poms
  install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -pm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-maven-javadoc-plugin.pom
! %add_to_maven_depmap org.apache.maven.plugins maven-javadoc-plugin %{namedversion} JPP maven-javadoc-plugin
  
! %if %without bootstrap
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/maven-javadoc-plugin-%{namedversion}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/maven-javadoc-plugin-%{namedversion}
! ln -s maven-javadoc-plugin-%{namedversion} %{buildroot}%{_javadocdir}/maven-javadoc-plugin
  %endif
  
***************
*** 136,154 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
! %if ! %{bootstrap}
  %files javadoc
! %defattr(-,root,root,-)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  %endif
  
  %changelog
! * Tue Feb 15 2011 David Walluck <dwalluck at redhat.com> 2.8-1
! - 2.8
  
  * Tue Feb 15 2011 David Walluck <dwalluck at redhat.com> 2.7-21
--- 111,130 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/maven-javadoc-plugin-%{namedversion}.jar
! %{_javadir}*/maven-javadoc-plugin.jar
! %{_datadir}/maven2/poms/JPP-maven-javadoc-plugin.pom
! %{_mavendepmapfragdir}/%{name}
  
! %if %without bootstrap
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/maven-javadoc-plugin-%{namedversion}
! %{_javadocdir}/maven-javadoc-plugin
  %endif
  
  %changelog
! * Tue Feb 15 2011 David Walluck <dwalluck at redhat.com> 2.7-22
! - fix for JPackage
  
  * Tue Feb 15 2011 David Walluck <dwalluck at redhat.com> 2.7-21

--- maven-javadoc-plugin-jpp-depmap.xml DELETED ---




More information about the JPackage-commits mailing list