svn commit: r1907080 - in /cocoon/branches/cocoon-2.2.1: ./ blocks/ commons/ commons/legal/ core/ core/cocoon-servlet-service/cocoon-servlet-service-components-sample/ core/cocoon-servlet-service/cocoon-servlet-service-components/ core/cocoon-webapp/ d...
[email protected] Sun, 29 Jan 2023 18:59:24 -0000
| Newsgroups | gmane.text.xml.cocoon.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: javier
Date: Sun Jan 29 18:59:24 2023
New Revision: 1907080
URL: http://svn.apache.org/viewvc?rev=1907080&view=rev
Log:
Revert from r1907079 to r1906426. Prepare for clean release.
Modified:
cocoon/branches/cocoon-2.2.1/ (props changed)
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-servlet-service/cocoon-servlet-service-components-sample/pom.xml
cocoon/branches/cocoon-2.2.1/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
cocoon/branches/cocoon-2.2.1/core/cocoon-webapp/pom.xml
cocoon/branches/cocoon-2.2.1/core/pom.xml
cocoon/branches/cocoon-2.2.1/dists/pom.xml
cocoon/branches/cocoon-2.2.1/parent/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/site/cocoon-configuration-site/pom.xml
cocoon/branches/cocoon-2.2.1/site/cocoon-core-site/pom.xml
cocoon/branches/cocoon-2.2.1/site/cocoon-main-site/pom.xml
cocoon/branches/cocoon-2.2.1/site/cocoon-maven-plugins-site/pom.xml
cocoon/branches/cocoon-2.2.1/site/cocoon-subprojects-site/pom.xml
cocoon/branches/cocoon-2.2.1/site/cocoon-thien-maven-site-skin/pom.xml
cocoon/branches/cocoon-2.2.1/tools/pom.xml
Propchange: cocoon/branches/cocoon-2.2.1/
------------------------------------------------------------------------------
Merged /cocoon/trunk:r1906072-1906426
Modified: cocoon/branches/cocoon-2.2.1/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/pom.xml Sun Jan 29 18:59:24 2023
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>cocoon-blocks-modules</artifactId>
Modified: cocoon/branches/cocoon-2.2.1/commons/legal/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/commons/legal/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/commons/legal/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/commons/legal/pom.xml Sun Jan 29 18:59:24 2023
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>9</version>
<relativePath/>
</parent>
<artifactId>cocoon-licenses</artifactId>
Modified: cocoon/branches/cocoon-2.2.1/commons/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/commons/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/commons/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/commons/pom.xml Sun Jan 29 18:59:24 2023
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/branches/cocoon-2.2.1/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml Sun Jan 29 18:59:24 2023
@@ -23,7 +23,7 @@
<parent>
<artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>10</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<artifactId>cocoon-servlet-service-components-sample</artifactId>
Modified: cocoon/branches/cocoon-2.2.1/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml Sun Jan 29 18:59:24 2023
@@ -24,7 +24,7 @@
<parent>
<artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>10</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<artifactId>cocoon-servlet-service-components</artifactId>
Modified: cocoon/branches/cocoon-2.2.1/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/core/cocoon-webapp/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/core/cocoon-webapp/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/core/cocoon-webapp/pom.xml Sun Jan 29 18:59:24 2023
@@ -32,7 +32,7 @@
<version>6-SNAPSHOT</version>
</parent>
<artifactId>cocoon-webapp</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0-M2-SNAPSHOT</version>
<packaging>war</packaging>
<name>Cocoon Webapp</name>
Modified: cocoon/branches/cocoon-2.2.1/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/core/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/core/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/core/pom.xml Sun Jan 29 18:59:24 2023
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: cocoon/branches/cocoon-2.2.1/dists/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/dists/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/dists/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/dists/pom.xml Sun Jan 29 18:59:24 2023
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>cocoon-dists-modules</artifactId>
Modified: cocoon/branches/cocoon-2.2.1/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/parent/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/parent/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/parent/pom.xml Sun Jan 29 18:59:24 2023
@@ -25,12 +25,12 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>21</version>
- <relativePath />
+ <relativePath/>
</parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<name>Apache Cocoon</name>
<inceptionYear>1999</inceptionYear>
<url>http://cocoon.apache.org</url>
@@ -3302,7 +3302,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>release</id>
<build>
<plugins>
<plugin>
Modified: cocoon/branches/cocoon-2.2.1/site/cocoon-22-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/site/cocoon-22-site/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/site/cocoon-22-site/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/site/cocoon-22-site/pom.xml Sun Jan 29 18:59:24 2023
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>9</version>
<relativePath/>
</parent>
Modified: cocoon/branches/cocoon-2.2.1/site/cocoon-blocks-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/site/cocoon-blocks-site/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/site/cocoon-blocks-site/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/site/cocoon-blocks-site/pom.xml Sun Jan 29 18:59:24 2023
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>9</version>
<relativePath/>
</parent>
Modified: cocoon/branches/cocoon-2.2.1/site/cocoon-configuration-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/site/cocoon-configuration-site/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/site/cocoon-configuration-site/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/site/cocoon-configuration-site/pom.xml Sun Jan 29 18:59:24 2023
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>9</version>
<relativePath/>
</parent>
Modified: cocoon/branches/cocoon-2.2.1/site/cocoon-core-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/site/cocoon-core-site/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/site/cocoon-core-site/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/site/cocoon-core-site/pom.xml Sun Jan 29 18:59:24 2023
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>9</version>
<relativePath/>
</parent>
Modified: cocoon/branches/cocoon-2.2.1/site/cocoon-main-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/site/cocoon-main-site/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/site/cocoon-main-site/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/site/cocoon-main-site/pom.xml Sun Jan 29 18:59:24 2023
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>10-SNAPSHOT</version>
<relativePath/>
</parent>
Modified: cocoon/branches/cocoon-2.2.1/site/cocoon-maven-plugins-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/site/cocoon-maven-plugins-site/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/site/cocoon-maven-plugins-site/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/site/cocoon-maven-plugins-site/pom.xml Sun Jan 29 18:59:24 2023
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>9</version>
<relativePath/>
</parent>
Modified: cocoon/branches/cocoon-2.2.1/site/cocoon-subprojects-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/site/cocoon-subprojects-site/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/site/cocoon-subprojects-site/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/site/cocoon-subprojects-site/pom.xml Sun Jan 29 18:59:24 2023
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>9</version>
<relativePath/>
</parent>
Modified: cocoon/branches/cocoon-2.2.1/site/cocoon-thien-maven-site-skin/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/site/cocoon-thien-maven-site-skin/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/site/cocoon-thien-maven-site-skin/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/site/cocoon-thien-maven-site-skin/pom.xml Sun Jan 29 18:59:24 2023
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>8</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: cocoon/branches/cocoon-2.2.1/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/tools/pom.xml?rev=1907080&r1=1907079&r2=1907080&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/tools/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/tools/pom.xml Sun Jan 29 18:59:24 2023
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>10</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<artifactId>cocoon-tools-modules</artifactId>
@@ -35,12 +35,12 @@
<modules>
<module>archetypes/cocoon-22-archetype-block</module>
- <module>archetypes/cocoon-22-archetype-block-plain</module>
- <module>archetypes/cocoon-22-archetype-webapp</module>
+ <module>archetypes/cocoon-22-archetype-block-plain</module>
+ <module>archetypes/cocoon-22-archetype-webapp</module>
<module>cocoon-maven-reports</module>
<module>cocoon-maven-docs-cleaner-plugin</module>
<module>cocoon-maven-javadocs-script-report</module>
-<!-- <module>cocoon-sitemaptags2daisy-plugin</module> -->
+ <module>cocoon-sitemaptags2daisy-plugin</module>
</modules>
<scm>