svn commit: r1421684 - in /cocoon/branches/BRANCH_2_1_X: ./ legal/ lib/ lib/optional/ tools/lib/

Author: crossley
Date: Fri Dec 14 06:18:33 2012
New Revision: 1421684

URL: http://svn.apache.org/viewvc?rev=1421684&view=rev
Log:
Reverting r1418172 and r1418558. The newer Jing needs Java 5, so going back to jing-20030619

Added:
    cocoon/branches/BRANCH_2_1_X/legal/jing-20030619.jar.license.txt
      - copied unchanged from r1418171, cocoon/branches/BRANCH_2_1_X/legal/jing-20030619.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/lib/optional/jing-20030619.jar
      - copied unchanged from r1418171, cocoon/branches/BRANCH_2_1_X/lib/optional/jing-20030619.jar
    cocoon/branches/BRANCH_2_1_X/tools/lib/jing-20030619.jar
      - copied unchanged from r1418557, cocoon/branches/BRANCH_2_1_X/tools/lib/jing-20030619.jar
Removed:
    cocoon/branches/BRANCH_2_1_X/legal/jing-20091111.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/lib/optional/jing-20091111.jar
    cocoon/branches/BRANCH_2_1_X/tools/lib/jing-20091111.jar
Modified:
    cocoon/branches/BRANCH_2_1_X/lib/jars.xml
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?rev=1421684&r1=1421683&r2=1421684&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Fri Dec 14 06:18:33 2012
@@ -754,12 +754,12 @@
     <homepage>http://castor.codehaus.org/</homepage>
   </file>
 
-  <!-- Build also uses this jar from tools/lib/jing-*.jar -->
+  <!-- Build uses this jar from tools/lib/jing-20030619.jar -->
   <file>
     <title>Jing</title>
     <description>RELAX NG validator</description>
-    <used-by>JARV transformer (validation block) and core build</used-by>
-    <lib>optional/jing-20091111.jar</lib>
+    <used-by>JARV transformer (validation block) and build</used-by>
+    <lib>optional/jing-20030619.jar</lib>
     <homepage>http://www.thaiopensource.com/relaxng/jing.html</homepage>
   </file>
 

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=1421684&r1=1421683&r2=1421684&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Fri Dec 14 06:18:33 2012
@@ -188,9 +188,6 @@
     <action dev="all" type="update">
       Starting with 2.1.12 the minimum required Java version will be 1.4.2.
     </action>
-    <action dev="DC" type="update">
-      Upgrade Jing from jing-20030619 to jing-20091111
-    </action>
     <action dev="CD" type="add" fixes-bug="COCOON-2288" due-to="Laurent Medioni" due-to-email="[email protected]">
       Allow usage of SLF4J for traces
     </action>