diff --git a/maven-doxia-assert.patch b/maven-doxia-assert.patch new file mode 100644 index 0000000..e224a0d --- /dev/null +++ b/maven-doxia-assert.patch @@ -0,0 +1,36 @@ +diff -ur maven-doxia-1.1.2.orig/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java maven-doxia-1.1.2.asserts/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java +--- maven-doxia-1.1.2.orig/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java 2010-02-12 14:09:50.441027897 +0000 ++++ maven-doxia-1.1.2.asserts/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java 2010-02-12 14:36:41.955027689 +0000 +@@ -138,7 +138,7 @@ + + while ( ( l = source.getNextLine() ) != null && accept( l, source ) ); + +- assert rows.size() >= 1; ++ // assert rows.size() >= 1; + + return new TableBlock( rows ); + } +diff -ur maven-doxia-1.1.2.orig/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java maven-doxia-1.1.2.asserts/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java +--- maven-doxia-1.1.2.orig/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java 2010-02-12 14:09:50.437027866 +0000 ++++ maven-doxia-1.1.2.asserts/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java 2010-02-12 14:36:37.211743449 +0000 +@@ -97,7 +97,7 @@ + { + final int numberOfSpaces = 3; + final int textGroup = 3; +- assert m.group( 1 ).length() % numberOfSpaces == 0; ++ // assert m.group( 1 ).length() % numberOfSpaces == 0; + final int level = m.group( 1 ).length() / numberOfSpaces; + treeListBuilder.feedEntry( TYPES[i], level, m.group( textGroup ).trim() ); + break; +diff -ur maven-doxia-1.1.2.orig/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java maven-doxia-1.1.2.asserts/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java +--- maven-doxia-1.1.2.orig/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java 2010-02-12 14:09:50.437027866 +0000 ++++ maven-doxia-1.1.2.asserts/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java 2010-02-12 14:36:38.995942583 +0000 +@@ -93,7 +93,7 @@ + } + while ( ( l = source.getNextLine() ) != null && accept( l ) ); + +- assert rows.size() >= 1; ++ // assert rows.size() >= 1; + + return new TableBlock( (Block[]) rows.toArray( new Block[] {} ) ); + } diff --git a/maven-doxia-helpmojo.patch b/maven-doxia-helpmojo.patch new file mode 100644 index 0000000..e496133 --- /dev/null +++ b/maven-doxia-helpmojo.patch @@ -0,0 +1,22 @@ +diff -ur maven-doxia-1.1.2/doxia-maven-plugin/pom.xml maven-doxia-1.1.2.helpmojo/doxia-maven-plugin/pom.xml +--- maven-doxia-1.1.2/doxia-maven-plugin/pom.xml 2010-02-12 14:50:22.427028744 +0000 ++++ maven-doxia-1.1.2.helpmojo/doxia-maven-plugin/pom.xml 2010-02-12 14:51:26.776029108 +0000 +@@ -153,18 +153,6 @@ + + + +- +- org.apache.maven.plugins +- maven-plugin-plugin +- +- +- generated-helpmojo +- +- helpmojo +- +- +- +- + + + diff --git a/maven-doxia-modello-1.0.patch b/maven-doxia-modello-1.0.patch new file mode 100644 index 0000000..b98613d --- /dev/null +++ b/maven-doxia-modello-1.0.patch @@ -0,0 +1,46 @@ +diff -ur maven-doxia-1.1.2/doxia-book/pom.xml maven-doxia-1.1.2.modello/doxia-book/pom.xml +--- maven-doxia-1.1.2/doxia-book/pom.xml 2009-11-30 12:28:19.060200000 +0000 ++++ maven-doxia-1.1.2.modello/doxia-book/pom.xml 2010-02-12 14:18:22.193090355 +0000 +@@ -100,9 +100,7 @@ + org.codehaus.modello + modello-maven-plugin + +- + src/main/modello/book.mdo +- + 1.0.0 + + +@@ -148,4 +146,4 @@ + + + +- +\ No newline at end of file ++ +diff -ur maven-doxia-1.1.2/doxia-core/pom.xml maven-doxia-1.1.2.modello/doxia-core/pom.xml +--- maven-doxia-1.1.2/doxia-core/pom.xml 2009-11-30 12:28:19.060200000 +0000 ++++ maven-doxia-1.1.2.modello/doxia-core/pom.xml 2010-02-12 14:18:33.648164906 +0000 +@@ -107,9 +107,7 @@ + + + 1.0.1 +- + src/main/mdo/document.mdo +- + + + +diff -ur maven-doxia-1.1.2/doxia-modules/doxia-module-fml/pom.xml maven-doxia-1.1.2.modello/doxia-modules/doxia-module-fml/pom.xml +--- maven-doxia-1.1.2/doxia-modules/doxia-module-fml/pom.xml 2009-11-30 12:28:19.060200000 +0000 ++++ maven-doxia-1.1.2.modello/doxia-modules/doxia-module-fml/pom.xml 2010-02-12 14:18:29.555027652 +0000 +@@ -67,9 +67,7 @@ + java + + +- + src/main/mdo/fml.mdo +- + 1.0.0 + + diff --git a/maven-doxia-remove-clirr.patch b/maven-doxia-remove-clirr.patch new file mode 100644 index 0000000..a325b0c --- /dev/null +++ b/maven-doxia-remove-clirr.patch @@ -0,0 +1,71 @@ +diff -ur maven-doxia-1.1.2.orig/doxia-maven-plugin/pom.xml maven-doxia-1.1.2/doxia-maven-plugin/pom.xml +--- maven-doxia-1.1.2.orig/doxia-maven-plugin/pom.xml 2010-02-12 14:09:50.422028368 +0000 ++++ maven-doxia-1.1.2/doxia-maven-plugin/pom.xml 2010-02-12 14:12:54.807362542 +0000 +@@ -159,19 +159,6 @@ + + + +- org.codehaus.mojo +- clirr-maven-plugin +- +- 1.1 +- +- +- org/apache/maven/doxia/logging/** +- org/apache/maven/doxia/sink/** +- org/codehaus/doxia/sink/** +- +- +- +- + org.apache.maven.plugins + maven-plugin-plugin + +diff -ur maven-doxia-1.1.2.orig/pom.xml maven-doxia-1.1.2/pom.xml +--- maven-doxia-1.1.2.orig/pom.xml 2010-02-12 14:09:50.462027911 +0000 ++++ maven-doxia-1.1.2/pom.xml 2010-02-12 14:13:06.637028412 +0000 +@@ -290,14 +290,6 @@ + 2.1.2 + + +- org.codehaus.mojo +- clirr-maven-plugin +- 2.2.2 +- +- 1.1 +- +- +- + org.apache.maven.plugins + maven-javadoc-plugin + 2.6.1 +@@ -331,18 +323,6 @@ + + + +- +- org.codehaus.mojo +- clirr-maven-plugin +- +- +- verify +- +- check +- +- +- +- + + + +@@ -437,10 +417,6 @@ + http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/src/main/resources/config/doxia_checkstyle.xml + + +- +- org.codehaus.mojo +- clirr-maven-plugin +- + + + diff --git a/maven-doxia-skip-plugin.patch b/maven-doxia-skip-plugin.patch new file mode 100644 index 0000000..22872a0 --- /dev/null +++ b/maven-doxia-skip-plugin.patch @@ -0,0 +1,11 @@ +diff -ur maven-doxia-1.1.2/pom.xml maven-doxia-1.1.2.maven/pom.xml +--- maven-doxia-1.1.2/pom.xml 2010-02-12 14:52:40.008028290 +0000 ++++ maven-doxia-1.1.2.maven/pom.xml 2010-02-12 15:02:47.458028536 +0000 +@@ -98,7 +98,6 @@ + doxia-core + doxia-modules + doxia-book +- doxia-maven-plugin + + + diff --git a/maven-doxia-xdoc.patch b/maven-doxia-xdoc.patch new file mode 100644 index 0000000..de52b6c --- /dev/null +++ b/maven-doxia-xdoc.patch @@ -0,0 +1,55 @@ +diff -ur maven-doxia-1.1.2/doxia-book/pom.xml maven-doxia-1.1.2.xdoc/doxia-book/pom.xml +--- maven-doxia-1.1.2/doxia-book/pom.xml 2010-02-12 14:47:20.357029016 +0000 ++++ maven-doxia-1.1.2.xdoc/doxia-book/pom.xml 2010-02-12 14:48:12.325174945 +0000 +@@ -63,10 +63,6 @@ + + + org.apache.maven.doxia +- doxia-module-xdoc +- +- +- org.apache.maven.doxia + doxia-module-xhtml + + +diff -ur maven-doxia-1.1.2/doxia-maven-plugin/pom.xml maven-doxia-1.1.2.xdoc/doxia-maven-plugin/pom.xml +--- maven-doxia-1.1.2/doxia-maven-plugin/pom.xml 2010-02-12 14:47:20.340028704 +0000 ++++ maven-doxia-1.1.2.xdoc/doxia-maven-plugin/pom.xml 2010-02-12 14:48:21.610744328 +0000 +@@ -84,11 +84,6 @@ + + + org.apache.maven.doxia +- doxia-module-xdoc +- ${projectVersion} +- +- +- org.apache.maven.doxia + doxia-module-xhtml + ${projectVersion} + +diff -ur maven-doxia-1.1.2/doxia-modules/pom.xml maven-doxia-1.1.2.xdoc/doxia-modules/pom.xml +--- maven-doxia-1.1.2/doxia-modules/pom.xml 2009-11-30 12:28:19.000000000 +0000 ++++ maven-doxia-1.1.2.xdoc/doxia-modules/pom.xml 2010-02-12 14:48:26.303028489 +0000 +@@ -43,7 +43,6 @@ + doxia-module-latex + doxia-module-rtf + doxia-module-twiki +- doxia-module-xdoc + doxia-module-xhtml + + +diff -ur maven-doxia-1.1.2/pom.xml maven-doxia-1.1.2.xdoc/pom.xml +--- maven-doxia-1.1.2/pom.xml 2010-02-12 14:47:20.341028649 +0000 ++++ maven-doxia-1.1.2.xdoc/pom.xml 2010-02-12 14:48:33.914028744 +0000 +@@ -199,11 +199,6 @@ + + + org.apache.maven.doxia +- doxia-module-xdoc +- ${projectVersion} +- +- +- org.apache.maven.doxia + doxia-module-xhtml + ${projectVersion} + diff --git a/maven-doxia.spec b/maven-doxia.spec index 5827876..4d93473 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -30,7 +30,7 @@ Name: maven-doxia Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Content generation framework License: ASL 2.0 @@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT # %doc %{_javadocdir}/* %changelog +* Wed May 5 2010 Mary Ellen Foster 0:1.1.2-3 +- Include all patches + * Wed May 5 2010 Mary Ellen Foster 0:1.1.2-2 - Add BuildRequirement on fop