[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia-1.0-pom.patch, 1.1, 1.2 maven-doxia-assert.patch, NONE, 1.1 maven-doxia.spec, 1.18, 1.19

David Walluck david at ryu.zarb.org
Wed Oct 12 02:59:04 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv21931

Modified Files:
	maven-doxia-1.0-pom.patch maven-doxia.spec 
Added Files:
	maven-doxia-assert.patch 
Log Message:
- apply patches

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** maven-doxia.spec	12 Oct 2011 00:32:32 -0000	1.18
--- maven-doxia.spec	12 Oct 2011 00:59:02 -0000	1.19
***************
*** 165,171 ****
  %endif
  
- %if 0
  %patch0 -p0 -b .sav0
- %endif
  %patch1 -p0 -b .sav1
  %patch2 -p0 -b .sav2
--- 165,169 ----

--- NEW FILE: maven-doxia-assert.patch ---
--- maven-doxia-1.1/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java~	2008-03-18 05:45:22.000000000 -0400
+++ maven-doxia-1.1/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java	2011-10-11 20:55:42.183758481 -0400
@@ -103,7 +103,7 @@
 
         while ( ( l = source.getNextLine() ) != null && accept( l, source ) );
 
-        assert rows.size() >= 1;
+        //assert rows.size() >= 1;
 
         return new TableBlock( rows );
     }
--- maven-doxia-1.1/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java~	2009-02-23 07:35:46.000000000 -0500
+++ maven-doxia-1.1/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java	2011-10-11 20:55:47.911317623 -0400
@@ -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;
--- maven-doxia-1.1/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java~	2009-02-23 07:35:46.000000000 -0500
+++ maven-doxia-1.1/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java	2011-10-11 20:56:06.933853438 -0400
@@ -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[] {} ) );
     }

Index: maven-doxia-1.0-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia-1.0-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-doxia-1.0-pom.patch	5 Dec 2010 11:27:52 -0000	1.1
--- maven-doxia-1.0-pom.patch	12 Oct 2011 00:59:02 -0000	1.2
***************
*** 1,9 ****
! --- pom.xml.sav	2010-11-28 21:23:35.000000000 +0100
! +++ pom.xml	2010-11-28 21:23:56.000000000 +0100
! @@ -168,6 +168,14 @@
!            </execution>
!          </executions>
!        </plugin>
! +      <plugin>
  +        <groupId>org.apache.maven.plugins</groupId>
  +        <artifactId>maven-compiler-plugin</artifactId>
--- 1,8 ----
! --- pom.xml.sav0	2009-03-03 13:32:44.000000000 -0500
! +++ pom.xml	2011-10-11 20:58:30.189826808 -0400
! @@ -288,6 +288,14 @@
!      </pluginManagement>
!      <plugins>
!        <plugin>
  +        <groupId>org.apache.maven.plugins</groupId>
  +        <artifactId>maven-compiler-plugin</artifactId>
***************
*** 13,17 ****
  +        </configuration>
  +      </plugin>
!      </plugins>
!      <pluginManagement>
!        <plugins>
--- 12,17 ----
  +        </configuration>
  +      </plugin>
! +      <plugin>
!          <groupId>org.codehaus.plexus</groupId>
!          <artifactId>plexus-maven-plugin</artifactId>
!          <executions>




More information about the JPackage-commits mailing list