rpms/maven-doxia/devel maven-doxia-assert.patch, NONE, 1.1 maven-doxia-helpmojo.patch, NONE, 1.1 maven-doxia-modello-1.0.patch, NONE, 1.1 maven-doxia-remove-clirr.patch, NONE, 1.1 maven-doxia-skip-plugin.patch, NONE, 1.1 maven-doxia-xdoc.patch, NONE, 1.1 maven-doxia.spec, 1.24, 1.25
mef
mef at fedoraproject.org
Wed May 5 15:52:50 UTC 2010
Author: mef
Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21731
Modified Files:
maven-doxia.spec
Added Files:
maven-doxia-assert.patch maven-doxia-helpmojo.patch
maven-doxia-modello-1.0.patch maven-doxia-remove-clirr.patch
maven-doxia-skip-plugin.patch maven-doxia-xdoc.patch
Log Message:
Add all patches
maven-doxia-assert.patch:
doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java | 2 +-
doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java | 2 +-
doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE maven-doxia-assert.patch ---
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[] {} ) );
}
maven-doxia-helpmojo.patch:
pom.xml | 12 ------------
1 file changed, 12 deletions(-)
--- NEW FILE maven-doxia-helpmojo.patch ---
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 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>generated-helpmojo</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
maven-doxia-modello-1.0.patch:
doxia-book/pom.xml | 4 +---
doxia-core/pom.xml | 2 --
doxia-modules/doxia-module-fml/pom.xml | 2 --
3 files changed, 1 insertion(+), 7 deletions(-)
--- NEW FILE maven-doxia-modello-1.0.patch ---
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 @@
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <models>
<model>src/main/modello/book.mdo</model>
- </models>
<version>1.0.0</version>
</configuration>
<executions>
@@ -148,4 +146,4 @@
</reporting>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
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 @@
</executions>
<configuration>
<version>1.0.1</version>
- <models>
<model>src/main/mdo/document.mdo</model>
- </models>
</configuration>
</plugin>
</plugins>
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 @@
<goal>java</goal>
</goals>
<configuration>
- <models>
<model>src/main/mdo/fml.mdo</model>
- </models>
<version>1.0.0</version>
</configuration>
</execution>
maven-doxia-remove-clirr.patch:
doxia-maven-plugin/pom.xml | 13 -------------
pom.xml | 24 ------------------------
2 files changed, 37 deletions(-)
--- NEW FILE maven-doxia-remove-clirr.patch ---
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 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <comparisonVersion>1.1</comparisonVersion>
- <excludes>
- <!-- exclude shaded packages -->
- <exclude>org/apache/maven/doxia/logging/**</exclude>
- <exclude>org/apache/maven/doxia/sink/**</exclude>
- <exclude>org/codehaus/doxia/sink/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<executions>
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 @@
<version>2.1.2</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>2.2.2</version>
- <configuration>
- <comparisonVersion>1.1</comparisonVersion>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
@@ -331,18 +323,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -437,10 +417,6 @@
<configLocation>http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/src/main/resources/config/doxia_checkstyle.xml</configLocation>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- </plugin>
</plugins>
</reporting>
</profile>
maven-doxia-skip-plugin.patch:
pom.xml | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE maven-doxia-skip-plugin.patch ---
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 @@
<module>doxia-core</module>
<module>doxia-modules</module>
<module>doxia-book</module>
- <module>doxia-maven-plugin</module>
</modules>
<scm>
maven-doxia-xdoc.patch:
doxia-book/pom.xml | 4 ----
doxia-maven-plugin/pom.xml | 5 -----
doxia-modules/pom.xml | 1 -
pom.xml | 5 -----
4 files changed, 15 deletions(-)
--- NEW FILE maven-doxia-xdoc.patch ---
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 @@
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xdoc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xhtml</artifactId>
</dependency>
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 @@
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xdoc</artifactId>
- <version>${projectVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xhtml</artifactId>
<version>${projectVersion}</version>
</dependency>
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 @@
<module>doxia-module-latex</module>
<module>doxia-module-rtf</module>
<module>doxia-module-twiki</module>
- <module>doxia-module-xdoc</module>
<module>doxia-module-xhtml</module>
</modules>
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 @@
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xdoc</artifactId>
- <version>${projectVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xhtml</artifactId>
<version>${projectVersion}</version>
</dependency>
Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- maven-doxia.spec 5 May 2010 14:01:40 -0000 1.24
+++ maven-doxia.spec 5 May 2010 15:52:50 -0000 1.25
@@ -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 <mefoster at gmail.com> 0:1.1.2-3
+- Include all patches
+
* Wed May 5 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.1.2-2
- Add BuildRequirement on fop
More information about the scm-commits
mailing list