[Jpackage-commits] dist/maven-javadoc-plugin/devel .cvsignore, 1.2, 1.3 maven-javadoc-plugin-JavadocReport-doxia-sink.patch, NONE, 1.1 maven-javadoc-plugin-pom.patch, 1.2, NONE maven-javadoc-plugin.spec, 1.3, 1.4 pom.patch, 1.1, NONE remove-test-deps.patch, 1.1, NONE sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Sat Oct 15 09:42:20 CEST 2011


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

Modified Files:
	.cvsignore maven-javadoc-plugin.spec sources 
Added Files:
	maven-javadoc-plugin-JavadocReport-doxia-sink.patch 
Removed Files:
	maven-javadoc-plugin-pom.patch pom.patch 
	remove-test-deps.patch 
Log Message:
- fix for JPackage

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-javadoc-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	14 Oct 2011 00:06:55 -0000	1.2
--- .cvsignore	15 Oct 2011 07:42:18 -0000	1.3
***************
*** 1 ****
! maven-javadoc-plugin-2.8.tar.bz2
--- 1 ----
! maven-javadoc-plugin-2.7.tar.bz2

--- NEW FILE: maven-javadoc-plugin-JavadocReport-doxia-sink.patch ---
--- maven-javadoc-plugin-2.7/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig	2010-04-12 15:44:10.000000000 -0400
+++ maven-javadoc-plugin-2.7/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2011-10-15 03:28:16.258876207 -0400
@@ -30,7 +30,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
 /**

--- maven-javadoc-plugin-pom.patch DELETED ---

--- pom.patch DELETED ---

--- remove-test-deps.patch DELETED ---

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-javadoc-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	14 Oct 2011 00:06:55 -0000	1.2
--- sources	15 Oct 2011 07:42:18 -0000	1.3
***************
*** 1 ****
! b0586f11d31fcd35e18ec807f359c820  maven-javadoc-plugin-2.8.tar.bz2
--- 1 ----
! f1f175bfe12b6c3f56de76840270cd4f  maven-javadoc-plugin-2.7.tar.bz2

Index: maven-javadoc-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-javadoc-plugin/devel/maven-javadoc-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** maven-javadoc-plugin.spec	15 Oct 2011 00:47:17 -0000	1.3
--- maven-javadoc-plugin.spec	15 Oct 2011 07:42:18 -0000	1.4
***************
*** 1,3 ****
! %bcond_with bootstrap
  
  %global namedversion %{version}
--- 1,3 ----
! %bcond_without bootstrap
  
  %global namedversion %{version}
***************
*** 16,21 ****
--- 16,79 ----
  Source0:        maven-javadoc-plugin-%{namedversion}.tar.bz2
  Patch0:         maven-javadoc-plugin-pom.patch
+ Patch1:         maven-javadoc-plugin-JavadocReport-doxia-sink.patch
+ Obsoletes:      maven2-plugin-javadoc <= 2.0.8
+ Provides:       maven2-plugin-javadoc = %{epoch}:%{version}-%{release}
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
+ Requires:       jpackage-utils
+ Requires:       jakarta-commons-httpclient >= 0:3.1
+ Requires:       jakarta-commons-lang >= 0:2.4
+ Requires:       jakarta-commons-logging >= 0:1.1.1
+ Requires:       qdox >= 0:1.9.2
+ Requires:       maven2 >= 0:2.0.8
+ Requires:       maven-shared-invoker
+ Requires:       qdox
+ Requires:       log4j >= 0:1.2.14
+ Requires:       maven-archiver >= 0:2.3
+ Requires:       maven-doxia >= 0:1.0
+ Requires:       maven-doxia-shared-sitetools >= 0:1.0
+ Requires:       maven-reporting-api >= 0:2.0.8
+ Requires:       maven-shared-invoker >= 0:2.0.8
+ # XXX: 1.0-beta-6
+ Requires:       maven-wagon >= 0:1.0
+ # XXX: 1.0-alpha-9
+ Requires:       plexus-archiver >= 0:1.0
+ # XXX: 1.0-alpha-9
+ Requires:       plexus-container-default
+ Requires:       plexus-utils >= 0:1.5.8
+ BuildRequires:  jpackage-utils
+ BuildRequires:  jakarta-commons-httpclient >= 0:3.1
+ BuildRequires:  jakarta-commons-lang >= 0:2.4
+ BuildRequires:  jakarta-commons-logging >= 0:1.1.1
+ BuildRequires:  qdox >= 0:1.9.2
+ BuildRequires:  maven2 >= 0:2.0.8
+ BuildRequires:  maven-shared-invoker
+ BuildRequires:  qdox
+ BuildRequires:  log4j >= 0:1.2.14
+ BuildRequires:  maven-archiver >= 0:2.3
+ BuildRequires:  maven-doxia >= 0:1.0
+ BuildRequires:  maven-doxia-shared-sitetools >= 0:1.0
+ BuildRequires:  maven-reporting-api >= 0:2.0.8
+ BuildRequires:  maven-shared-invoker >= 0:2.0.8
+ # XXX: 1.0-beta-6
+ BuildRequires:  maven-wagon >= 0:1.0
+ # XXX: 1.0-alpha-9
+ BuildRequires:  plexus-archiver >= 0:1.0
+ # XXX: 1.0-alpha-9
+ BuildRequires:  plexus-container-default
+ BuildRequires:  plexus-utils >= 0:1.5.8
+ BuildRequires:  junit-addons >= 0:1.4
+ BuildRequires:  junit >= 0:3.8.2
+ BuildRequires:  maven-common-artifact-filters >= 0:1.2
+ BuildRequires:  maven-shared-plugin-testing-harness >= 0:1.2
+ BuildRequires:  jetty6-ext >= 0:6.1.19
+ BuildRequires:  jetty6 >= 0:6.1.19
+ BuildRequires:  maven-enforcer-plugin
+ BuildRequires:  maven-surefire-maven-plugin
+ BuildRequires:  maven-surefire-provider-junit
+ BuildRequires:  modello-maven-plugin
+ %if %without bootstrap
+ BuildRequires:  maven2-plugin-javadoc = %{epoch}:%{version}
+ %endif        
  BuildRequires:  maven2
  BuildRequires:  maven2-common-poms
***************
*** 26,55 ****
  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        
! 
! Requires:       jpackage-utils
! Requires:       maven2
! Requires:       maven-shared-invoker
! Requires:       qdox
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
- Obsoletes: maven2-plugin-javadoc <= 2.0.8
- Provides:  maven2-plugin-javadoc = %{version}-%{release}
- 
  %description
  The Maven Javadoc Plugin is a plugin that uses the javadoc tool for
--- 84,91 ----
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-shade
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
  The Maven Javadoc Plugin is a plugin that uses the javadoc tool for
***************
*** 68,79 ****
  %prep
  %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
--- 104,113 ----
  %prep
  %setup -q 
! %patch0 -p1 -b .sav0
! %patch1 -p1 -b .sav1
  
  %build
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven.test.skip install \
  %if %without bootstrap
         javadoc:javadoc




More information about the JPackage-commits mailing list