rpms/maven-javadoc-plugin/devel remove-test-deps.patch, NONE, 1.1 sources, 1.2, 1.3 pom.patch, 1.1, 1.2 maven-javadoc-plugin.spec, 1.1, 1.2 .cvsignore, 1.2, 1.3 doxia-update.patch, 1.1, NONE

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/maven-javadoc-plugin/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30971/devel

Modified Files:
	sources pom.patch maven-javadoc-plugin.spec .cvsignore 
Added Files:
	remove-test-deps.patch 
Removed Files:
	doxia-update.patch 
Log Message:
Update to 2.7.

remove-test-deps.patch:
 pom.xml |   12 ------------
 1 file changed, 12 deletions(-)

--- NEW FILE remove-test-deps.patch ---
--- pom.xml.sav	2010-07-19 17:00:50.000000000 +0300
+++ pom.xml	2010-07-19 17:24:35.896986800 +0300
@@ -212,12 +212,6 @@ under the License.
       <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>
@@ -230,12 +224,6 @@ under the License.
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-client</artifactId>
-      <version>6.1.19</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-common-artifact-filters</artifactId>
       <version>1.2</version>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-javadoc-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 May 2010 09:03:28 -0000	1.2
+++ sources	21 Jul 2010 15:27:19 -0000	1.3
@@ -1 +1 @@
-933ed96b0980038b0b43583790610a09  maven-javadoc-plugin-2.4.tar.lzma
+bc81f1aa7bf6e6c25f821de3cf62536e  maven-javadoc-plugin-2.7.tar.xz

pom.patch:
 pom.xml |    5 +++++
 1 file changed, 5 insertions(+)

Index: pom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/maven-javadoc-plugin/devel/pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pom.patch	10 May 2010 09:03:28 -0000	1.1
+++ pom.patch	21 Jul 2010 15:27:19 -0000	1.2
@@ -1,24 +1,14 @@
-Index: pom.xml
-===================================================================
---- pom.xml	(revision 927422)
-+++ pom.xml	(working copy)
-@@ -112,6 +112,11 @@
-       <artifactId>doxia-sink-api</artifactId>
-       <version>${doxiaVersion}</version>
+--- pom.xml.sav	2010-07-21 15:03:28.000000000 +0300
++++ pom.xml	2010-07-21 15:07:09.415984958 +0300
+@@ -203,6 +203,11 @@ under the License.
+       <artifactId>plexus-utils</artifactId>
+       <version>1.5.8</version>
      </dependency>
 +    <dependency>
-+      <groupId>org.apache.maven.doxia</groupId>
-+      <artifactId>doxia-logging-api</artifactId>
-+      <version>${doxiaVersion}</version>
++      <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-interactivity-api</artifactId>
++      <version>1.0</version>
 +    </dependency>
  
-     <!-- Doxia-sitetools -->
-     <dependency>
-@@ -134,6 +139,7 @@
-         </exclusion>
-       </exclusions>
-     </dependency>
-+    
- 
-     <!-- wagon -->
+     <!-- test -->
      <dependency>


Index: maven-javadoc-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-javadoc-plugin/devel/maven-javadoc-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-javadoc-plugin.spec	10 May 2010 09:03:28 -0000	1.1
+++ maven-javadoc-plugin.spec	21 Jul 2010 15:27:19 -0000	1.2
@@ -1,35 +1,38 @@
-%global bootstrap 1
+%global bootstrap 0
 
 Name:           maven-javadoc-plugin
-Version:        2.4
-Release:        2%{?dist}
+Version:        2.7
+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.4
-# tar --lzma cvf maven-javadoc-plugin-2.4.tar.lzma maven-javadoc-plugin-2.4/
-Source0:        %{name}-%{version}.tar.lzma
-Patch0:         doxia-update.patch
+# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.7
+# tar caf maven-javadoc-plugin-2.7.tar.xz maven-javadoc-plugin-2.7/
+Source0:        %{name}-%{version}.tar.xz
+Patch0:         remove-test-deps.patch
 Patch1:         pom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  maven2
-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:  maven2-plugin-surefire
+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-doxia-sitetools
 BuildRequires:  maven-shared-plugin-testing-harness
+BuildRequires:  maven-shade-plugin
+BuildRequires:  plexus-interactivity
 %if ! %{bootstrap}
-BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven-javadoc-plugin
 %endif        
 
 Requires:       jpackage-utils
+Requires:       maven2
 Requires(post): jpackage-utils
 Requires(postun): jpackage-utils
 
@@ -55,11 +58,14 @@ API documentation for %{name}.
 
 %prep
 %setup -q 
-# Add doxia-logging-api to the dependencies
 %patch0
 # Update source for use with newer doxia
 %patch1
 
+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
+
+sed -i -e "s|model>|models>|g" pom.xml
+
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mvn-jpp \
@@ -125,6 +131,9 @@ rm -rf target/site/api*
 %endif
 
 %changelog
+* 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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-javadoc-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 May 2010 09:03:28 -0000	1.2
+++ .cvsignore	21 Jul 2010 15:27:19 -0000	1.3
@@ -1 +1 @@
-maven-javadoc-plugin-2.4.tar.lzma
+maven-javadoc-plugin-2.7.tar.xz


--- doxia-update.patch DELETED ---