[Jpackage-commits] dist/maven-plugin-build-helper/devel maven-plugin-build-helper-jpp-depmap.xml, NONE, 1.1 maven-plugin-build-helper.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Fri Dec 17 19:31:35 CET 2010


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

Modified Files:
	maven-plugin-build-helper.spec 
Added Files:
	maven-plugin-build-helper-jpp-depmap.xml 
Log Message:
- adapt to JPP-6

Index: maven-plugin-build-helper.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-plugin-build-helper/devel/maven-plugin-build-helper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-plugin-build-helper.spec	17 Dec 2010 18:13:23 -0000	1.1
--- maven-plugin-build-helper.spec	17 Dec 2010 18:31:33 -0000	1.2
***************
*** 12,30 ****
  # tar caf %{name}-%{version}.tar.xz %{name}-%{version}
  Source0:        %{name}-%{version}.tar.xz
  Patch0:         add-junit-dependency.patch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildArch: noarch
  
  BuildRequires: plexus-utils
! BuildRequires: maven-plugin-cobertura
! BuildRequires: maven-plugin-plugin
! BuildRequires: maven-resources-plugin
! BuildRequires: maven-compiler-plugin
! BuildRequires: maven-install-plugin
! BuildRequires: maven-jar-plugin
! BuildRequires: maven-javadoc-plugin
! BuildRequires: maven-enforcer-plugin
! BuildRequires: maven-surefire-plugin
  BuildRequires: maven-surefire-provider-junit4
  BuildRequires: maven-doxia-sitetools
--- 12,31 ----
  # tar caf %{name}-%{version}.tar.xz %{name}-%{version}
  Source0:        %{name}-%{version}.tar.xz
+ Source1:        %{name}-jpp-depmap.xml
  Patch0:         add-junit-dependency.patch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  BuildArch: noarch
  
  BuildRequires: plexus-utils
! BuildRequires: mojo-maven2-plugin-cobertura
! BuildRequires: maven2-plugin-plugin
! BuildRequires: maven2-plugin-resources
! BuildRequires: maven2-plugin-compiler
! BuildRequires: maven2-plugin-install
! BuildRequires: maven2-plugin-jar
! BuildRequires: maven2-plugin-javadoc
! BuildRequires: maven2-plugin-enforcer
! BuildRequires: maven2-plugin-surefire
  BuildRequires: maven-surefire-provider-junit4
  BuildRequires: maven-doxia-sitetools
***************
*** 40,43 ****
--- 41,45 ----
  Maven build lifecycle.
  
+ %if 0
  %package javadoc
  Group:          Documentation
***************
*** 46,49 ****
--- 48,52 ----
  %description javadoc
  API documentation for %{name}.
+ %endif
  
  %prep
***************
*** 55,61 ****
  mvn-jpp \
          -e \
!         -Dmaven2.jpp.mode=true \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         package javadoc:javadoc
  
  %install
--- 58,67 ----
  mvn-jpp \
          -e \
!         -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
!         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
!         package \
! %if 0
! javadoc:javadoc
! %endif
  
  %install
***************
*** 78,81 ****
--- 84,88 ----
      %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  
+ %if 0
  # javadoc
  install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
***************
*** 83,86 ****
--- 90,94 ----
  ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  rm -rf target/site/api*
+ %endif
  
  %clean
***************
*** 100,109 ****
--- 108,122 ----
  %{_mavendepmapfragdir}/%{name}
  
+ %if 0
  %files javadoc
  %defattr(-,root,root,-)
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
+ %endif
  
  %changelog
+ * Fri Dec 17 2010 David Walluck <dwalluck at redhat.com> 1.5-3
+ - adapt to JPP-6
+ 
  * Thu Oct 28 2010 Alexander Kurtakov <akurtako at redhat.com> 1.5-2
  - Maven plugins should require parent poms because they are totally unusable without them.

--- NEW FILE: maven-plugin-build-helper-jpp-depmap.xml ---
<dependencies>
  <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>
</dependencies>




More information about the JPackage-commits mailing list