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

David Walluck david at ryu.zarb.org
Fri Oct 14 02:06:57 CEST 2011


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

Modified Files:
	.cvsignore sources 
Added Files:
	maven-javadoc-plugin-jpp-depmap.xml 
	maven-javadoc-plugin-pom.patch maven-javadoc-plugin.spec 
	pom.patch remove-test-deps.patch 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-javadoc-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	14 Oct 2011 00:05:34 -0000	1.1
--- .cvsignore	14 Oct 2011 00:06:55 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ maven-javadoc-plugin-2.8.tar.bz2

--- NEW FILE: maven-javadoc-plugin-pom.patch ---
--- 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>

--- NEW FILE: pom.patch ---
--- pom.xml.save	2010-09-03 00:41:09.000000000 +0800
+++ pom.xml	2010-09-03 00:42:18.000000000 +0800
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-invoker</artifactId>
-      <version>2.0.9</version>
+      <version>2.0.12-SNAPSHOT</version>
     </dependency>
 
     <!-- Doxia -->
@@ -203,6 +203,11 @@
       <artifactId>plexus-utils</artifactId>
       <version>1.5.8</version>
     </dependency>
+	<dependency>
+		<groupId>org.codehaus.plexus</groupId>
+		<artifactId>plexus-interactivity-api</artifactId>
+		<version>1.0</version>
+	</dependency>
 
     <!-- test -->
     <dependency>

--- NEW FILE: remove-test-deps.patch ---
--- pom.xml.sav0	2011-05-01 18:42:15.000000000 -0400
+++ pom.xml	2011-09-19 03:03:37.765795909 -0400
@@ -211,38 +211,6 @@
       <artifactId>plexus-utils</artifactId>
       <version>1.5.8</version>
     </dependency>
-
-    <!-- test -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit-addons</groupId>
-      <artifactId>junit-addons</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-testing</groupId>
-      <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>1.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.19</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-client</artifactId>
-      <version>6.1.19</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-javadoc-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	14 Oct 2011 00:05:34 -0000	1.1
--- sources	14 Oct 2011 00:06:55 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ b0586f11d31fcd35e18ec807f359c820  maven-javadoc-plugin-2.8.tar.bz2

--- NEW FILE: maven-javadoc-plugin.spec ---
%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        

Requires:       jpackage-utils
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
Provides:  maven2-plugin-javadoc = %{version}-%{release}

%description
The Maven Javadoc Plugin is a plugin that uses the javadoc tool for
generating javadocs for the specified project.
 
%if ! %{bootstrap}
%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
API documentation for %{name}.
%endif

%prep
%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        

%install
rm -rf %{buildroot}

# 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

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%{__rm} -rf %{buildroot}

%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
- remove qdox dependency from pom

* Tue Feb 15 2011 David Walluck <dwalluck at redhat.com> 2.7-20
- remove fix mojo (and dependency on qdox 1.9.2)

* Tue Sep 28 2010 Hui Wang <huwang at redhat.com> 2.7-19
- Adjust BRs

* Fri Sep 03 2010 Weinan Li <weli at redhat.com> 2.7-18
- Remove xbean-reflect-3.4.jar

* Fri Sep 03 2010 Weinan Li <weli at redhat.com> 2.7-17
- Fix maven-invoker version in pom.patch
- Add xbean-reflect-3.4.jar

* Wed Sep 01 2010 Weinan Li <weli at redhat.com> 2.7-16
- Remove qdox from depmap
- Remove maven-shared-invoker from depmap

* Mon Aug 30 2010 Hui Wang <huwang at redhat.com> 2.7-15
- Fix bootstrap value to 0

* Mon Aug 30 2010 Hui Wang <huwang at redhat.com> 2.7-14
- Enable javadoc 

* Mon Aug 30 2010 Hui Wang <huwang at redhat.com> 2.7-13
- Remove maven-toolchain.jar
- Add commons-codec jpp depmap
- Disable javadoc 
- Build with maven2-2.2.1

* Fri Aug 27 2010 Hui Wang <huwang at redhat.com> 2.7-12
- Enable javadoc

* Fri Aug 27 2010 Hui Wang <huwang at redhat.com> 2.7-11
- Remove JavadocReport.java.patch
- Disable javadoc temperately

* Thu Aug 26 2010 Weinan Li <weli at redhat.com> 2.7-10
- Patch our doxia from JavadocReport 

* Wed Aug 25 2010 Weinan Li <weli at redhat.com> 2.7-9
- Modify pom.xml
- Remove three sed scripts and migrate it into patch
- Patch JavadocReport.java 

* Wed Aug 25 2010 Weinan Li <weli at redhat.com> 2.7-8
- Patch out org.apache.maven.doxia.siterenderer.sink.SiteRendererSink in JavadocReport.java

* Wed Aug 25 2010 Weinan Li <weli at redhat.com> 2.7-7
- Patch JavadocReport.java to confirm the problem caused by doxia

* Tue Aug 24 2010 Weinan Li <weli at redhat.com> 2.7-6
- Change JavadocReport.java.patch

* Tue Aug 24 2010 Weinan Li <weli at redhat.com> 2.7-5
- Modify JavadocReport.java.patch

* Sat Aug 07 2010 Hui Wang <huwang at redhat.com> 2.7-4
- Change source tarball xz to bz2
- Add maven-toolchain.jar as source2 temperately until maven221 is ready
- Add JavadocReport.java.patch
- Disable javadoc temperately
 
* Sat Jul 24 2010 Alexander Kurtakov <akurtako at redhat.com> 2.7-3
- Add missing invoker requires.

* Wed Jul 21 2010 Alexander Kurtakov <akurtako at redhat.com> 2.7-2
- Add missing invoker BR.

* Wed Jul 21 2010 Alexander Kurtakov <akurtako at redhat.com> 2.7-1
- Update to 2.7.

* Fri May  7 2010 Mary Ellen Foster <mefoster at gmail.com> - 2.4-2
- Add jpackage-utils requirements
- Update requirements of javadoc subpackage

* Thu May  6 2010 Mary Ellen Foster <mefoster at gmail.com> - 2.4-1
- Initial version, based on akurtakov's initial spec

--- NEW FILE: maven-javadoc-plugin-jpp-depmap.xml ---
<dependencies>
	<dependency>
	  <maven>
		<groupId>asm</groupId>
		<artifactId>asm-commons</artifactId>
		<version>3.2</version>
	  </maven>
	  <jpp>
		<groupId>JPP/objectweb-asm</groupId>
		<artifactId>asm-commons</artifactId>
		<version>3.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>asm</groupId>
		<artifactId>asm</artifactId>
		<version>3.2</version>
	  </maven>
	  <jpp>
		<groupId>JPP/objectweb-asm</groupId>
		<artifactId>asm</artifactId>
		<version>3.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>org.jdom</groupId>
		<artifactId>jdom</artifactId>
		<version>1.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>jdom</artifactId>
		<version>1.0</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>commons-codec</groupId>
		<artifactId>commons-codec</artifactId>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>commons-codec</artifactId>
		<version>1.3</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>org.mortbay.jetty</groupId>
		<artifactId>servlet-api</artifactId>
                <version>2.5-20081211</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>servlet_2_5_api</artifactId>
		<version>2.5</version>
	  </jpp>
	</dependency>
	<!--<dependency>
	  <maven>
		<groupId>com.thoughtworks.qdox</groupId>
		<artifactId>qdox</artifactId>
                <version>1.9.2</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>qdox</artifactId>
		<version>1.6.1</version>
	  </jpp>
	</dependency>-->
</dependencies>




More information about the JPackage-commits mailing list