update dependencies: commons-io-2.2, commons-fileupload-1.3, commons-codec-1.6 and mvel-2.1.7.Final
git-svn-id: https://svn.apache.org/repos/asf/click/trunk/click@1542598 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.classpath b/.classpath
index 50dc378..6f2cca7 100644
--- a/.classpath
+++ b/.classpath
@@ -8,10 +8,10 @@
<classpathentry kind="src" path="framework/src"/>
<classpathentry kind="src" path="framework/test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/commons-codec-1.4.jar"/>
- <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
- <classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
+ <classpathentry kind="lib" path="lib/commons-codec-1.6.jar"/>
+ <classpathentry kind="lib" path="lib/junit-4.11.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
+ <classpathentry kind="lib" path="lib/commons-fileupload-1.3.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.5.jar"/>
<classpathentry kind="lib" path="lib/freemarker-2.3.16.jar"/>
<classpathentry kind="lib" path="lib/hibernate-3.2.6.ga.jar"/>
@@ -24,10 +24,10 @@
<classpathentry kind="lib" path="lib/cayenne-server-3.0.jar"/>
<classpathentry kind="lib" path="examples/webapp/WEB-INF/lib/spring-2.5.6.jar"/>
<classpathentry kind="lib" path="examples/webapp/WEB-INF/lib/spring-security-core-2.0.4.jar"/>
- <classpathentry kind="lib" path="lib/commons-io-2.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/commons-io-2.2.jar"/>
<classpathentry kind="lib" path="lib/velocity-1.7.jar"/>
<classpathentry kind="lib" path="lib/servlet-api-2.4.jar"/>
- <classpathentry kind="lib" path="lib/mvel2-2.0.19.jar"/>
+ <classpathentry kind="lib" path="lib/mvel2-2.1.7.Final.jar"/>
<classpathentry kind="lib" path="lib/ognl-2.6.9.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/build/build.properties b/build/build.properties
index f2c17e1..064d7f8 100644
--- a/build/build.properties
+++ b/build/build.properties
@@ -42,16 +42,16 @@
# Third-party library versions
cayenne.version=3.0
checkstyle.version=5.1
-commons-codec.version=1.4
+commons-codec.version=1.6
commons-collections.version=3.2.1
-commons-fileupload.version=1.2.1
-commons-io.version=2.0.1
+commons-fileupload.version=1.3
+commons-io.version=2.2
commons-lang.version=2.5
freemarker.version=2.3.16
hibernate.version=3.2.6.ga
junit.version=4.11
log4j.version=1.2.17
-mvel2.version=2.0.19
+mvel2.version=2.1.7.Final
ognl.version=2.6.9
servlet-api.version=2.4
spring.version=2.5.6
diff --git a/documentation/docs/developer-guide/building.html b/documentation/docs/developer-guide/building.html
index b87a548..448c505 100644
--- a/documentation/docs/developer-guide/building.html
+++ b/documentation/docs/developer-guide/building.html
@@ -230,13 +230,13 @@
<td>Velocity Tools</td>
<td>2.0</td>
<td>WebappResourceLoader source<span class="red">**</span></td>
- <td><a target="_blank" href="http://velocity.apache.org/tools/releases/2.0/">Jakarta Velocity Tools</a></td>
+ <td><a target="_blank" href="http://velocity.apache.org/tools/releases/2.0/">Apache Velocity Tools</a></td>
<td>Velocity Tools Utility Library</td>
</tr>
<tr>
<td>MVEL</td>
- <td>2.0.19</td>
- <td>mvel-2.0.19.jar <span class="red">*</span></td>
+ <td>2.1.7.Final</td>
+ <td>mvel-2.1.7.Final.jar <span class="red">*</span></td>
<td><a target="_blank" href="http://mvel.codehaus.org/">MVEL</a></td>
<td>MVEL Expression Language Library</td>
</tr>
@@ -244,35 +244,35 @@
<td>Common Language</td>
<td>2.5</td>
<td>commons-lang-2.5.jar <span class="red">*</span></td>
- <td><a target="_blank" href="http://jakarta.apache.org/commons/">Jakarta Commons</a></td>
+ <td><a target="_blank" href="http://commons.apache.org/">Apache Commons</a></td>
<td>General Language Utilities Library</td>
</tr>
<tr>
<td>Common FileUpload</td>
- <td>1.2.1</td>
- <td>commons-fileupload-1.2.1.jar <span class="red">*</span></td>
- <td><a target="_blank" href="http://jakarta.apache.org/commons/">Jakarta Commons</a></td>
+ <td>1.3</td>
+ <td>commons-fileupload-1.3.jar <span class="red">*</span></td>
+ <td><a target="_blank" href="http://commons.apache.org/">Apache Commons</a></td>
<td>HTTP File Upload Library</td>
</tr>
<tr>
<td>Commons Codec</td>
- <td>1.4</td>
- <td>commons-codec-1.4.jar <span class="red">*</span></td>
- <td><a target="_blank" href="http://jakarta.apache.org/commons/">Jakarta Commons</a></td>
+ <td>1.6</td>
+ <td>commons-codec-1.6.jar <span class="red">*</span></td>
+ <td><a target="_blank" href="http://commons.apache.org/">Apache Commons</a></td>
<td>Encoding Decoding Library</td>
</tr>
<tr>
<td>Commons Collections</td>
<td>3.2.1</td>
<td>commons-collections-3.2.1.jar <span class="red">*</span></td>
- <td><a target="_blank" href="http://jakarta.apache.org/commons/">Jakarta Commons</a></td>
+ <td><a target="_blank" href="http://commons.apache.org/">Apache Commons</a></td>
<td>Collection Utilities Library</td>
</tr>
<tr>
<td>Common IO</td>
- <td>2.0.1</td>
- <td>commons-io-2.0.1.jar <span class="red">*</span></td>
- <td><a target="_blank" href="http://jakarta.apache.org/commons/">Jakarta Commons</a></td>
+ <td>2.2</td>
+ <td>commons-io-2.2.jar <span class="red">*</span></td>
+ <td><a target="_blank" href="http://commons.apache.org/">Apache Commons</a></td>
<td>IO Utilities Library</td>
</tr>
</table>
@@ -330,7 +330,7 @@
<td>Log4J</td>
<td>1.2.17</td>
<td>log4j-1.2.17.jar</td>
- <td><a target="_blank" href="http://logging.apache.org/log4j/">Log4j</a></td>
+ <td><a target="_blank" href="http://logging.apache.org/log4j/1.2/">Log4j</a></td>
<td>Logging Framework</td>
</tr>
<tr>
diff --git a/documentation/docs/roadmap-changes.html b/documentation/docs/roadmap-changes.html
index 24d9a20..2544522 100644
--- a/documentation/docs/roadmap-changes.html
+++ b/documentation/docs/roadmap-changes.html
@@ -80,7 +80,9 @@
</div>
<ul style="padding: 0em; margin-left:0em;margin-bottom: 2em">
<li class="change">
- Updated JAR dependencies: log4j-1.2.17
+ Update some of the JARs dependencies to the latest version still compatible with Java 5:
+ log4j-1.2.17, commons-io-2.2, junit-4.11, commons-fileupload-1.3, commons-codec-1.6,
+ mvel-2.1.7.Final
</li>
<li class="change">
Added Page method getCharacterEncoding. The response character encoding
