Author: crossley
Date: Tue Mar 5 14:57:31 2013
New Revision: 1452826
URL: http://svn.apache.org/r1452826
Log:
Updated our packaged Cocoon and blocks to the latest Cocoon-2.1.12-dev version.
Updated Xerces to 2.11.0 and xml-apis to 1.4.01 and Batik to 1.7
Issue: FOR-1240
Added:
forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.7.jar (with
props)
forrest/branches/update_cocoon_2.1.12/lib/core/batik-license.txt
- copied unchanged from r1452765,
forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.6.jar.license.txt
forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2.jar
(with props)
forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.5.jar
(with props)
forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.11.0.jar
(with props)
forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.4.01.jar
(with props)
forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-ext-1.4.01.jar
(with props)
Removed:
forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.6.jar
forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.6.jar.license.txt
forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.13.jar
forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.13.jar.license.txt
forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.5.11.jar
forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.5.11.jar
forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2-dev-r395116.jar
forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.3.1.jar
forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.9.1.jar
forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.3.04.jar
Modified:
forrest/branches/update_cocoon_2.1.12/LICENSE.txt
forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.12-dev.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-asciiart-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-auth-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-batik-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-chaperon-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-fop-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-html-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-linkrewriter-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-lucene-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-profiler-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-template-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-validation-block.jar
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-xsp-block.jar
forrest/branches/update_cocoon_2.1.12/site-author/status.xml
Modified: forrest/branches/update_cocoon_2.1.12/LICENSE.txt
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/LICENSE.txt?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/LICENSE.txt (original)
+++ forrest/branches/update_cocoon_2.1.12/LICENSE.txt Tue Mar 5 14:57:31 2013
@@ -210,7 +210,7 @@ licenses. For more information, see: htt
----------------
These supporting products are licensed: Apache License, Version 2.0
license: lib/core/avalon-logkit-2.1.jar.license.txt
-license: lib/core/batik-all-1.6.jar.license.txt
+license: lib/core/batik-license.txt
license: lib/core/cocoon.license.txt
license: lib/core/commons-cli.license.txt
license: lib/core/commons-collections.license.txt
Modified: forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt
(original)
+++ forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt Tue
Mar 5 14:57:31 2013
@@ -32,7 +32,7 @@ org.apache.forrest.plugin.input.simplifi
org.apache.forrest.plugin.input.wiki | y 8 y
6 n y
org.apache.forrest.plugin.output.POD | y 8 y y
6 n y y
org.apache.forrest.plugin.output.Text | y 8 y y
6 n y y
-org.apache.forrest.plugin.output.pdf | y 9 9 y y
6 y y y
+org.apache.forrest.plugin.output.pdf | y 9 10 y y
6 y y y
| 1 2 3 4 5 6 7 8 9
10 11 12 13 14 20
whiteboard/plugins/ (34)
Added: forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.7.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.7.jar?rev=1452826&view=auto
==============================================================================
Binary file - no diff available.
Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.7.jar
------------------------------------------------------------------------------
svn:mime-type = application/jar
Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.12-dev.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.12-dev.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-asciiart-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-asciiart-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-auth-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-auth-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-batik-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-batik-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-chaperon-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-chaperon-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-fop-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-fop-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-html-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-html-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-linkrewriter-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-linkrewriter-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-lucene-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-lucene-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-profiler-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-profiler-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-template-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-template-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-validation-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-validation-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-xsp-block.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-xsp-block.jar?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
Binary files - no diff available.
Added:
forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2.jar?rev=1452826&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/jar
Added:
forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.5.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.5.jar?rev=1452826&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/jar
Added: forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.11.0.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.11.0.jar?rev=1452826&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.11.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/jar
Added: forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.4.01.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.4.01.jar?rev=1452826&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.4.01.jar
------------------------------------------------------------------------------
svn:mime-type = application/jar
Added:
forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-ext-1.4.01.jar
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-ext-1.4.01.jar?rev=1452826&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-ext-1.4.01.jar
------------------------------------------------------------------------------
svn:mime-type = application/jar
Modified: forrest/branches/update_cocoon_2.1.12/site-author/status.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/site-author/status.xml?rev=1452826&r1=1452825&r2=1452826&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/site-author/status.xml (original)
+++ forrest/branches/update_cocoon_2.1.12/site-author/status.xml Tue Mar 5
14:57:31 2013
@@ -154,7 +154,11 @@
<link href="site:upgrading_010">upgrading to v0.10-dev</link>
</action>
<!-- 2013-03 -->
- <action context="code" type="update" dev="AG">
+ <action context="code" type="update" dev="DC" fixes-bug="FOR-1240"
importance="high">
+ Updated our packaged Cocoon and blocks to the latest Cocoon-2.1.12-dev
version.
+ Updated Xerces to 2.11.0 and xml-apis to 1.4.01 and Batik to 1.7
+ </action>
+ <action context="code" type="update" dev="DC">
Updated log4j to 1.2.17 and slf4j to 1.7.2
</action>
<!-- 2012-01 -->
