svn commit: r1907085 [1/3] - in /cocoon/branches/cocoon-2.2.1: blocks/ blocks/cocoon-ajax/cocoon-ajax-impl/ blocks/cocoon-ajax/cocoon-ajax-sample/ blocks/cocoon-apples/cocoon-apples-impl/ blocks/cocoon-apples/cocoon-apples-sample/ blocks/cocoon-asciiar...

[email protected] Sun, 29 Jan 2023 21:38:10 -0000
Newsgroups gmane.text.xml.cocoon.cvs
Message-ID <[email protected]>
Author: javier
Date: Sun Jan 29 21:38:09 2023
New Revision: 1907085

URL: http://svn.apache.org/viewvc?rev=1907085&view=rev
Log:
* Add rat plugin exclusion for sample files.
* Comment daisy plugin project as it is obsolete.
* Bump cocoon-blocks-modules to version 7-SNAPSHOT as version 6 has been released already.

Modified:
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-api/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-additional-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-it/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-itext/cocoon-itext-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-itext/cocoon-itext-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-jcr/cocoon-jcr-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-jcr/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-jfor/cocoon-jfor-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-mail/cocoon-mail-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-midi/cocoon-midi-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-midi/cocoon-midi-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-naming/cocoon-naming-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-naming/cocoon-naming-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-poi/cocoon-poi-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-poi/cocoon-poi-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-portal/cocoon-portal-portlet-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-portal/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-python/cocoon-python-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-python/cocoon-python-mocks/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-samples-style/cocoon-samples-style-default/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-serializers/cocoon-serializers-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-slide/cocoon-slide-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-slop/cocoon-slop-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-slop/cocoon-slop-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-stx/cocoon-stx-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-stx/cocoon-stx-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-template/cocoon-template-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-template/cocoon-template-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-tour/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-validation/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-velocity/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-web3/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-webdav/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-welcome/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-xmldb/cocoon-xmldb-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-xmldb/cocoon-xmldb-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml
    cocoon/branches/cocoon-2.2.1/blocks/pom.xml
    cocoon/branches/cocoon-2.2.1/commons/legal/pom.xml
    cocoon/branches/cocoon-2.2.1/commons/pom.xml
    cocoon/branches/cocoon-2.2.1/core/cocoon-core/pom.xml
    cocoon/branches/cocoon-2.2.1/core/cocoon-webapp/pom.xml
    cocoon/branches/cocoon-2.2.1/core/cocoon-xml/cocoon-xml-resolver/pom.xml
    cocoon/branches/cocoon-2.2.1/core/pom.xml
    cocoon/branches/cocoon-2.2.1/site/cocoon-22-site/pom.xml
    cocoon/branches/cocoon-2.2.1/site/cocoon-blocks-site/pom.xml
    cocoon/branches/cocoon-2.2.1/tools/pom.xml

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -23,16 +23,16 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-ajax-impl</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Cocoon Ajax Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.ajax.relPath}</url>    
-  
+  <url>http://cocoon.apache.org/${docs.m.ajax.relPath}</url>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -52,19 +52,19 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.ajax.relPath}</url>
     </site>
-  </distributionManagement>  
-  
+  </distributionManagement>
+
   <properties>
-    <docs.name>Cocoon Ajax</docs.name>    
+    <docs.name>Cocoon Ajax</docs.name>
     <docs.version>1.0</docs.version>
-  </properties>    
-  
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -100,7 +100,7 @@
       </plugin>
     </plugins>
   </build>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -116,7 +116,7 @@
             </configuration>
           </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-ajax/cocoon-ajax-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -28,8 +28,8 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-ajax-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -22,37 +22,37 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-apples-impl</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon Apples Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.apples.relPath}</url>      
-  
+  <url>http://cocoon.apache.org/${docs.m.apples.relPath}</url>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.apples.relPath}</url>
     </site>
-  </distributionManagement>  
-  
+  </distributionManagement>
+
   <properties>
-    <docs.name>Cocoon Apples</docs.name>    
+    <docs.name>Cocoon Apples</docs.name>
     <docs.version>1.0</docs.version>
-  </properties>      
-    
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -68,7 +68,7 @@
             </configuration>
           </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
-  </profiles>    
+  </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-apples/cocoon-apples-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -22,17 +22,17 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-apples-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <name>Cocoon Apples Block Samples</name>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -60,5 +60,5 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -40,12 +40,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      
+
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -50,4 +50,23 @@
       <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>src/main/resources/COB-INF/data/*.txt</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-acegisecurity-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -51,7 +51,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
@@ -73,7 +73,7 @@
           </systemProperties>
         </configuration>
       </plugin>
-      
+
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.1</version>
@@ -85,7 +85,7 @@
           </archive>
         </configuration>
       </plugin>
-      
+
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
         <version>2.3</version>
@@ -125,7 +125,7 @@
     	</plugins>
     </pluginManagement>
   </build>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-api/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-api/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-api/pom.xml Sun Jan 29 21:38:09 2023
@@ -22,17 +22,17 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-auth-api</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon Authentication Block API</name>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -23,28 +23,28 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-auth-impl</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Cocoon Authentication Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.auth.relPath}</url>      
-  
+  <url>http://cocoon.apache.org/${docs.m.auth.relPath}</url>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.auth.relPath}</url>
     </site>
-  </distributionManagement>  
-  
+  </distributionManagement>
+
   <properties>
-    <docs.name>Cocoon Authentication</docs.name>    
+    <docs.name>Cocoon Authentication</docs.name>
     <docs.version>${docs.m.auth.version}</docs.version>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -60,7 +60,7 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -69,14 +69,14 @@
           <plugin>
             <groupId>org.daisycms</groupId>
             <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>        
+            <configuration>
               <navDocId>1227</navDocId>
-              <collection>cdocs-auth</collection>          
+              <collection>cdocs-auth</collection>
               <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
             </configuration>
-          </plugin>   
+          </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-auth/cocoon-auth-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -21,14 +21,14 @@
     | @version $Id$
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
+
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-auth-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
@@ -38,17 +38,17 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-auth-impl</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
+
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-axis/cocoon-axis-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -22,29 +22,29 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-    
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-batik-impl</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon Batik Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.batik.relPath}</url>  
+  <url>http://cocoon.apache.org/${docs.m.batik.relPath}</url>
 
   <properties>
-    <docs.name>Cocoon Batik Block</docs.name>    
+    <docs.name>Cocoon Batik Block</docs.name>
     <docs.version>${docs.m.batik.version}</docs.version>
-  </properties>  
-  
+  </properties>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.batik.relPath}</url>
     </site>
-  </distributionManagement>  
+  </distributionManagement>
 
   <dependencies>
     <dependency>
@@ -177,7 +177,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -186,14 +186,14 @@
           <plugin>
             <groupId>org.daisycms</groupId>
             <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>        
+            <configuration>
               <navDocId>1349</navDocId>
-              <collection>cdocs-batik</collection>     
-              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>               
+              <collection>cdocs-batik</collection>
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
             </configuration>
-          </plugin>    
+          </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-batik/cocoon-batik-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -23,12 +23,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>jar</packaging>  
+  <packaging>jar</packaging>
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-batik-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
@@ -48,5 +48,5 @@
       <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
-  
+
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -40,12 +40,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>bsf</groupId>
       <artifactId>bsf</artifactId>
-      
+
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -60,5 +60,5 @@
         </exclusion>
       </exclusions>
     </dependency>
-  </dependencies>  
+  </dependencies>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -24,14 +24,14 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>cocoon-captcha-impl</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon Captcha Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.captcha.relPath}</url>    
+  <url>http://cocoon.apache.org/${docs.m.captcha.relPath}</url>
   <packaging>jar</packaging>
 
   <distributionManagement>
@@ -39,20 +39,20 @@
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.captcha.relPath}</url>
     </site>
-  </distributionManagement>  
-  
+  </distributionManagement>
+
   <properties>
-    <docs.name>Cocoon Captcha</docs.name>    
+    <docs.name>Cocoon Captcha</docs.name>
     <docs.version>${docs.m.captcha.version}</docs.version>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -61,14 +61,14 @@
           <plugin>
             <groupId>org.daisycms</groupId>
             <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>        
+            <configuration>
               <navDocId>1230</navDocId>
-              <collection>cdocs-captcha</collection>          
+              <collection>cdocs-captcha</collection>
               <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
             </configuration>
-          </plugin>  
+          </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -23,12 +23,12 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>cocoon-captcha-sample</artifactId>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -43,7 +43,7 @@
       <name>Apache Maven 1 Repository</name>
       <url>http://people.apache.org/repo/m1-snapshot-repository</url>
       <layout>legacy</layout>
-    </repository>  
+    </repository>
   </repositories>
 
   <dependencies>
@@ -106,5 +106,5 @@
       <type>test-jar</type>
     </dependency>
   </dependencies>
-  
+
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-additional-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-additional-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-additional-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-additional-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -25,12 +25,12 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-core-additional-sample</artifactId>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-core-sample/cocoon-core-main-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -24,13 +24,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>jar</packaging>  
+  <packaging>jar</packaging>
 
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-core-main-sample</artifactId>
@@ -66,4 +66,23 @@
     </dependency-->
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>src/main/resources/COB-INF/catalog/testovr.txt</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -25,14 +25,14 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>cocoon-cron-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <name>Cron block implementation</name>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -44,7 +44,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-datasource</artifactId>    
+      <artifactId>excalibur-datasource</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-cron/cocoon-cron-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-bridge/pom.xml Sun Jan 29 21:38:09 2023
@@ -22,30 +22,30 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-databases-bridge</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon Database Block Bridge for Avalon components</name>
-  <url>http://cocoon.apache.org/${docs.m.databases-bridge.relPath}</url>  
+  <url>http://cocoon.apache.org/${docs.m.databases-bridge.relPath}</url>
 
   <properties>
     <docs.name>Cocoon Databases Block</docs.name>
     <docs.version>${docs.m.databases.version}</docs.version>
-  </properties>  
-  
+  </properties>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.databases-bridge.relPath}</url>
     </site>
   </distributionManagement>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -53,7 +53,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-datasource</artifactId>    
+      <artifactId>excalibur-datasource</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -72,7 +72,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -83,7 +83,7 @@
             <artifactId>daisy-maven-plugin</artifactId>
             <configuration>
               <navDocId>1423</navDocId>
-              <collection>cdocs-databases-bridge</collection>   
+              <collection>cdocs-databases-bridge</collection>
               <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
             </configuration>
           </plugin>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml Sun Jan 29 21:38:09 2023
@@ -22,34 +22,34 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-databases-hsqldb-client</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon Hsqldb Client Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.hsqldb-client.relPath}</url>  
+  <url>http://cocoon.apache.org/${docs.m.hsqldb-client.relPath}</url>
   <description>
     JDBC access of a Hsql database.
   </description>
 
   <properties>
-    <docs.name>${project.name}</docs.name>    
+    <docs.name>${project.name}</docs.name>
     <docs.version>${docs.m.hsqldb-client.version}</docs.version>
-  </properties>  
-  
+  </properties>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.hsqldb-client.relPath}</url>
     </site>
-  </distributionManagement>  
-  
+  </distributionManagement>
+
   <reporting>
     <plugins>
       <plugin>
@@ -68,7 +68,7 @@
         </reportSets>
       </plugin>
     </plugins>
-  </reporting>    
+  </reporting>
 
   <dependencies>
     <dependency>
@@ -80,7 +80,7 @@
       <artifactId>hsqldb</artifactId>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -89,12 +89,12 @@
           <plugin>
             <groupId>org.daisycms</groupId>
             <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>        
+            <configuration>
               <createSiteXmlOnly>true</createSiteXmlOnly>
             </configuration>
-          </plugin>  
+          </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml Sun Jan 29 21:38:09 2023
@@ -26,29 +26,29 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-databases-hsqldb-server</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon Hsqldb Server Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.hsqldb-server.relPath}</url>  
+  <url>http://cocoon.apache.org/${docs.m.hsqldb-server.relPath}</url>
   <description>
     Start a Hsql database server as part of your Cocoon application.
   </description>
-  
+
   <properties>
-    <docs.name>${project.name}</docs.name>    
+    <docs.name>${project.name}</docs.name>
     <docs.version>${docs.m.hsqldb-server.version}</docs.version>
-  </properties>  
-  
+  </properties>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.hsqldb-server.relPath}</url>
     </site>
-  </distributionManagement>    
-  
+  </distributionManagement>
+
   <reporting>
     <plugins>
       <plugin>
@@ -67,7 +67,7 @@
         </reportSets>
       </plugin>
     </plugins>
-  </reporting>  
+  </reporting>
 
   <dependencies>
     <dependency>
@@ -88,7 +88,7 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -97,12 +97,12 @@
           <plugin>
             <groupId>org.daisycms</groupId>
             <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>        
+            <configuration>
               <createSiteXmlOnly>true</createSiteXmlOnly>
             </configuration>
-          </plugin>  
+          </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -22,30 +22,30 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-databases-impl</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon Database Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.databases.relPath}</url>  
+  <url>http://cocoon.apache.org/${docs.m.databases.relPath}</url>
 
   <properties>
-    <docs.name>Cocoon Databases Block</docs.name>    
+    <docs.name>Cocoon Databases Block</docs.name>
     <docs.version>${docs.m.databases.version}</docs.version>
-  </properties>  
-  
+  </properties>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.databases.relPath}</url>
     </site>
-  </distributionManagement>  
-  
+  </distributionManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -62,7 +62,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-datasource</artifactId>    
+      <artifactId>excalibur-datasource</artifactId>
     </dependency>
     <!-- Specify transitive dependencies to avoid MNG-2782 with JDK1.4.2. -->
     <dependency>
@@ -75,7 +75,7 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -84,14 +84,14 @@
           <plugin>
             <groupId>org.daisycms</groupId>
             <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>        
+            <configuration>
               <navDocId>1357</navDocId>
-              <collection>cdocs-databases</collection>   
-              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>                    
+              <collection>cdocs-databases</collection>
+              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
             </configuration>
           </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml Sun Jan 29 21:38:09 2023
@@ -21,12 +21,12 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-databases-mocks</artifactId>
   <version>1.1.0-SNAPSHOT</version>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml Sun Jan 29 21:38:09 2023
@@ -25,12 +25,12 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-    
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-databases-odbc-client</artifactId>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      
+
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml Sun Jan 29 21:38:09 2023
@@ -24,12 +24,12 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-databases-oracle-client</artifactId>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      
+
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml Sun Jan 29 21:38:09 2023
@@ -25,12 +25,12 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-databases-postgresql-client</artifactId>
@@ -41,8 +41,8 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
-      
+
     </dependency>
   </dependencies>
-  
+
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-databases/cocoon-databases-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -24,17 +24,17 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-databases-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <name>Cocoon Databases Block Samples</name>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -57,5 +57,5 @@
       <artifactId>cocoon-xsp-impl</artifactId>
     </dependency>
   </dependencies>
-  
+
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -35,7 +35,7 @@
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Deli Block Implementation</name>
-  
+
   <repositories>
     <!-- Repository for the deli -->
     <repository>
@@ -43,19 +43,19 @@
       <name>Apache Maven 1 Repository</name>
       <url>http://people.apache.org/repo/m1-snapshot-repository</url>
       <layout>legacy</layout>
-    </repository>  
-  </repositories>    
+    </repository>
+  </repositories>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>net.sourceforge.jena</groupId>
       <artifactId>jena</artifactId>
-      
+
       <exclusions>
         <exclusion>
           <groupId>avalon-framework</groupId>
@@ -70,14 +70,14 @@
     <dependency>
       <groupId>deli</groupId>
       <artifactId>deli</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
+
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-deli/cocoon-deli-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -26,26 +26,26 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>cocoon-eventcache-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <name>Cocoon Eventcache Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.eventcache.relPath}</url>      
-  
+  <url>http://cocoon.apache.org/${docs.m.eventcache.relPath}</url>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.eventcache.relPath}</url>
     </site>
-  </distributionManagement>  
-  
+  </distributionManagement>
+
   <properties>
-    <docs.name>Cocoon Eventcache</docs.name>    
+    <docs.name>Cocoon Eventcache</docs.name>
     <docs.version>1.0</docs.version>
-  </properties>      
+  </properties>
 
   <dependencies>
     <dependency>
@@ -62,7 +62,7 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -78,7 +78,7 @@
             </configuration>
           </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
-  </profiles>  
+  </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -50,10 +50,10 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-    </dependency> 
+    </dependency>
   </dependencies>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -43,34 +43,34 @@
       <name>Apache Maven 1 Repository</name>
       <url>http://people.apache.org/repo/m1-snapshot-repository</url>
       <layout>legacy</layout>
-    </repository>  
-  </repositories>  
+    </repository>
+  </repositories>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>myfaces</groupId>
       <artifactId>myfaces-api</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>myfaces</groupId>
       <artifactId>myfaces-impl</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-taglib-impl</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-portal-impl</artifactId>
-      
+
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-faces/cocoon-faces-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -46,4 +46,23 @@
       <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>src/main/resources/COB-INF/cardemo/**</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-flowscript/cocoon-flowscript-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -26,26 +26,26 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>    
+    <version>7-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-flowscript-impl</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon Flowscript Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.flowscript.relPath}</url>  
+  <url>http://cocoon.apache.org/${docs.m.flowscript.relPath}</url>
 
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.flowscript.relPath}</url>
     </site>
-  </distributionManagement>  
-  
+  </distributionManagement>
+
   <properties>
-    <docs.name>Cocoon FlowScript</docs.name>    
+    <docs.name>Cocoon FlowScript</docs.name>
     <docs.version>${docs.m.flowscript.version}</docs.version>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>rhino</groupId>
@@ -67,7 +67,7 @@
       <version>1.0.0</version>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -76,14 +76,14 @@
           <plugin>
             <groupId>org.daisycms</groupId>
             <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>        
+            <configuration>
               <navDocId>1229</navDocId>
-              <collection>cdocs-flowscript</collection>          
+              <collection>cdocs-flowscript</collection>
               <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
             </configuration>
-          </plugin>    
+          </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -19,33 +19,33 @@
 -->
 <!-- $Id$ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
+
   <modelVersion>4.0.0</modelVersion>
-  <packaging>jar</packaging>  
+  <packaging>jar</packaging>
 
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-fop-impl</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon FOP Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.fop.relPath}</url>    
-  
+  <url>http://cocoon.apache.org/${docs.m.fop.relPath}</url>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.fop.relPath}</url>
     </site>
-  </distributionManagement>  
-  
+  </distributionManagement>
+
   <properties>
-    <docs.name>Cocoon FOP</docs.name>    
+    <docs.name>Cocoon FOP</docs.name>
     <docs.version>${docs.m.fop.version}</docs.version>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -78,7 +78,7 @@
       <artifactId>cocoon-batik-impl</artifactId>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -94,7 +94,7 @@
             </configuration>
           </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -24,27 +24,27 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-fop-ng-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <name>Cocoon FOP 0.9x Block Implementation</name>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>fop</artifactId>
-      
+
       <exclusions>
         <exclusion>
           <groupId>org.apache.avalon.framework</groupId>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-batik-impl</artifactId>
-      
+
       <exclusions>
         <exclusion>
           <groupId>fop</groupId>
@@ -72,5 +72,5 @@
       </exclusions>
     </dependency>
   </dependencies>
-  
+
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -21,18 +21,18 @@
     | @version $Id$
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
+
   <modelVersion>4.0.0</modelVersion>
-  <packaging>jar</packaging>  
-  
+  <packaging>jar</packaging>
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-fop-ng-sample</artifactId>
-  <version>1.0.0-SNAPSHOT</version>  
+  <version>1.0.0-SNAPSHOT</version>
   <name>Cocoon FOP 0.9x Block Samples</name>
 
   <dependencies>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-fop/cocoon-fop-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -24,11 +24,11 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-    
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.cocoon</groupId>
@@ -50,5 +50,5 @@
       <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
-  
+
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-forms-impl</artifactId>
@@ -155,6 +155,22 @@
             </configuration>
           </plugin>
         </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>src/main/resources/org/apache/cocoon/forms/resources/**</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
       </build>
     </profile>
   </profiles>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-forms/cocoon-forms-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -29,7 +29,7 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -22,30 +22,30 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-html-impl</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>Cocoon HTML Block Implementation</name>
-  <url>http://cocoon.apache.org/${docs.m.html.relPath}</url>  
+  <url>http://cocoon.apache.org/${docs.m.html.relPath}</url>
 
   <properties>
-    <docs.name>Cocoon HTML Block</docs.name>    
+    <docs.name>Cocoon HTML Block</docs.name>
     <docs.version>${docs.m.html.version}</docs.version>
-  </properties>  
-  
+  </properties>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.html.relPath}</url>
     </site>
   </distributionManagement>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -65,7 +65,7 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>daisy</id>
@@ -74,13 +74,29 @@
           <plugin>
             <groupId>org.daisycms</groupId>
             <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>        
+            <configuration>
               <navDocId>1353</navDocId>
-              <collection>cdocs-html</collection>             
+              <collection>cdocs-html</collection>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>src/main/resources/org/apache/cocoon/html/*.properties</exclude>
+              </excludes>
             </configuration>
-          </plugin>  
+          </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
   </profiles>
 </project>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-html/cocoon-html-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -21,14 +21,14 @@
     | @version $Id$
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
+
   <modelVersion>4.0.0</modelVersion>
-  <packaging>jar</packaging>  
-  
+  <packaging>jar</packaging>
+
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-html-sample</artifactId>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-it/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-it/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-it/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-it/pom.xml Sun Jan 29 21:38:09 2023
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
   </parent>
   <name>Cocoon Integration Tests Block</name>
   <artifactId>cocoon-it</artifactId>

Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-itext/cocoon-itext-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-itext/cocoon-itext-impl/pom.xml?rev=1907085&r1=1907084&r2=1907085&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-itext/cocoon-itext-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-itext/cocoon-itext-impl/pom.xml Sun Jan 29 21:38:09 2023
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-blocks-modules</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -40,12 +40,12 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
+
     </dependency>
     <dependency>
       <groupId>com.lowagie</groupId>
       <artifactId>itext</artifactId>
-      
+
     </dependency>
   </dependencies>
 </project>