diff --git a/client/.classpath b/client/.classpath
index 82c3d85e47..6c129ead4d 100644
--- a/client/.classpath
+++ b/client/.classpath
@@ -120,9 +120,9 @@
-
+
-
+
@@ -140,11 +140,11 @@
-
+
-
-
+
+
@@ -175,14 +175,14 @@
-
-
+
+
-
+
diff --git a/client/lib/activation-1.1.jar b/client/lib/activation-1.1.jar
new file mode 100644
index 0000000000..53f82a1c4c
Binary files /dev/null and b/client/lib/activation-1.1.jar differ
diff --git a/client/lib/commons-beanutils-1.11.0.jar b/client/lib/commons-beanutils-1.11.0.jar
new file mode 100644
index 0000000000..6b7b993661
Binary files /dev/null and b/client/lib/commons-beanutils-1.11.0.jar differ
diff --git a/client/lib/commons-beanutils-1.9.4.jar b/client/lib/commons-beanutils-1.9.4.jar
deleted file mode 100644
index b73543cbac..0000000000
Binary files a/client/lib/commons-beanutils-1.9.4.jar and /dev/null differ
diff --git a/client/lib/commons-codec-1.16.0.jar b/client/lib/commons-codec-1.16.0.jar
deleted file mode 100644
index 854fc7eb34..0000000000
Binary files a/client/lib/commons-codec-1.16.0.jar and /dev/null differ
diff --git a/client/lib/commons-codec-1.21.0.jar b/client/lib/commons-codec-1.21.0.jar
new file mode 100644
index 0000000000..99989eb59b
Binary files /dev/null and b/client/lib/commons-codec-1.21.0.jar differ
diff --git a/client/lib/commons-compress-1.24.0.jar b/client/lib/commons-compress-1.24.0.jar
deleted file mode 100644
index cb2950e2b5..0000000000
Binary files a/client/lib/commons-compress-1.24.0.jar and /dev/null differ
diff --git a/client/lib/commons-compress-1.28.0.jar b/client/lib/commons-compress-1.28.0.jar
new file mode 100644
index 0000000000..ff7e6aad05
Binary files /dev/null and b/client/lib/commons-compress-1.28.0.jar differ
diff --git a/client/lib/commons-configuration2-2.13.0.jar b/client/lib/commons-configuration2-2.13.0.jar
new file mode 100644
index 0000000000..1809bc354d
Binary files /dev/null and b/client/lib/commons-configuration2-2.13.0.jar differ
diff --git a/client/lib/commons-configuration2-2.8.0.jar b/client/lib/commons-configuration2-2.8.0.jar
deleted file mode 100644
index bd3d8d83b2..0000000000
Binary files a/client/lib/commons-configuration2-2.8.0.jar and /dev/null differ
diff --git a/client/lib/commons-email-1.5.jar b/client/lib/commons-email-1.5.jar
new file mode 100644
index 0000000000..291bd194f4
Binary files /dev/null and b/client/lib/commons-email-1.5.jar differ
diff --git a/client/lib/commons-fileupload-1.6.0.jar b/client/lib/commons-fileupload-1.6.0.jar
new file mode 100644
index 0000000000..63af9e1294
Binary files /dev/null and b/client/lib/commons-fileupload-1.6.0.jar differ
diff --git a/client/lib/commons-io-2.13.0.jar b/client/lib/commons-io-2.13.0.jar
deleted file mode 100644
index eb316f4020..0000000000
Binary files a/client/lib/commons-io-2.13.0.jar and /dev/null differ
diff --git a/client/lib/commons-io-2.21.0.jar b/client/lib/commons-io-2.21.0.jar
new file mode 100644
index 0000000000..7f1688194e
Binary files /dev/null and b/client/lib/commons-io-2.21.0.jar differ
diff --git a/client/lib/commons-logging-1.2.jar b/client/lib/commons-logging-1.2.jar
deleted file mode 100644
index 93a3b9f6db..0000000000
Binary files a/client/lib/commons-logging-1.2.jar and /dev/null differ
diff --git a/client/lib/commons-logging-1.3.5.jar b/client/lib/commons-logging-1.3.5.jar
new file mode 100644
index 0000000000..75d93a15cf
Binary files /dev/null and b/client/lib/commons-logging-1.3.5.jar differ
diff --git a/client/lib/javax.activation-1.2.0.jar b/client/lib/javax.activation-1.2.0.jar
deleted file mode 100644
index 60cc72177b..0000000000
Binary files a/client/lib/javax.activation-1.2.0.jar and /dev/null differ
diff --git a/client/lib/javax.mail-1.5.0.jar b/client/lib/javax.mail-1.5.0.jar
deleted file mode 100644
index f27414b9a3..0000000000
Binary files a/client/lib/javax.mail-1.5.0.jar and /dev/null differ
diff --git a/client/lib/javax.mail-1.5.6.jar b/client/lib/javax.mail-1.5.6.jar
new file mode 100644
index 0000000000..b10788ec64
Binary files /dev/null and b/client/lib/javax.mail-1.5.6.jar differ
diff --git a/command/.classpath b/command/.classpath
index 201d91e87d..1cbd96d53d 100644
--- a/command/.classpath
+++ b/command/.classpath
@@ -49,7 +49,7 @@
-
+
@@ -70,18 +70,18 @@
-
+
-
+
-
+
diff --git a/command/build.xml b/command/build.xml
index a591dabc10..c45f1dd774 100644
--- a/command/build.xml
+++ b/command/build.xml
@@ -59,7 +59,7 @@
-
+
diff --git a/command/lib/activation-1.1.jar b/command/lib/activation-1.1.jar
new file mode 100644
index 0000000000..53f82a1c4c
Binary files /dev/null and b/command/lib/activation-1.1.jar differ
diff --git a/command/lib/commons-beanutils-1.11.0.jar b/command/lib/commons-beanutils-1.11.0.jar
new file mode 100644
index 0000000000..6b7b993661
Binary files /dev/null and b/command/lib/commons-beanutils-1.11.0.jar differ
diff --git a/command/lib/commons-beanutils-1.9.4.jar b/command/lib/commons-beanutils-1.9.4.jar
deleted file mode 100644
index b73543cbac..0000000000
Binary files a/command/lib/commons-beanutils-1.9.4.jar and /dev/null differ
diff --git a/command/lib/commons-codec-1.16.0.jar b/command/lib/commons-codec-1.16.0.jar
deleted file mode 100644
index 854fc7eb34..0000000000
Binary files a/command/lib/commons-codec-1.16.0.jar and /dev/null differ
diff --git a/command/lib/commons-codec-1.21.0.jar b/command/lib/commons-codec-1.21.0.jar
new file mode 100644
index 0000000000..99989eb59b
Binary files /dev/null and b/command/lib/commons-codec-1.21.0.jar differ
diff --git a/command/lib/commons-configuration2-2.13.0.jar b/command/lib/commons-configuration2-2.13.0.jar
new file mode 100644
index 0000000000..1809bc354d
Binary files /dev/null and b/command/lib/commons-configuration2-2.13.0.jar differ
diff --git a/command/lib/commons-configuration2-2.8.0.jar b/command/lib/commons-configuration2-2.8.0.jar
deleted file mode 100644
index bd3d8d83b2..0000000000
Binary files a/command/lib/commons-configuration2-2.8.0.jar and /dev/null differ
diff --git a/command/lib/commons-email-1.5.jar b/command/lib/commons-email-1.5.jar
new file mode 100644
index 0000000000..291bd194f4
Binary files /dev/null and b/command/lib/commons-email-1.5.jar differ
diff --git a/command/lib/commons-fileupload-1.6.0.jar b/command/lib/commons-fileupload-1.6.0.jar
new file mode 100644
index 0000000000..63af9e1294
Binary files /dev/null and b/command/lib/commons-fileupload-1.6.0.jar differ
diff --git a/command/lib/commons-io-2.13.0.jar b/command/lib/commons-io-2.13.0.jar
deleted file mode 100644
index eb316f4020..0000000000
Binary files a/command/lib/commons-io-2.13.0.jar and /dev/null differ
diff --git a/command/lib/commons-io-2.21.0.jar b/command/lib/commons-io-2.21.0.jar
new file mode 100644
index 0000000000..7f1688194e
Binary files /dev/null and b/command/lib/commons-io-2.21.0.jar differ
diff --git a/command/lib/commons-logging-1.2.jar b/command/lib/commons-logging-1.2.jar
deleted file mode 100644
index 93a3b9f6db..0000000000
Binary files a/command/lib/commons-logging-1.2.jar and /dev/null differ
diff --git a/command/lib/commons-logging-1.3.5.jar b/command/lib/commons-logging-1.3.5.jar
new file mode 100644
index 0000000000..75d93a15cf
Binary files /dev/null and b/command/lib/commons-logging-1.3.5.jar differ
diff --git a/command/lib/javax.activation-1.2.0.jar b/command/lib/javax.activation-1.2.0.jar
deleted file mode 100644
index 60cc72177b..0000000000
Binary files a/command/lib/javax.activation-1.2.0.jar and /dev/null differ
diff --git a/command/lib/javax.mail-1.5.6.jar b/command/lib/javax.mail-1.5.6.jar
new file mode 100644
index 0000000000..b10788ec64
Binary files /dev/null and b/command/lib/javax.mail-1.5.6.jar differ
diff --git a/donkey/.classpath b/donkey/.classpath
index 65729a756a..ec31d229e5 100644
--- a/donkey/.classpath
+++ b/donkey/.classpath
@@ -11,7 +11,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
diff --git a/donkey/lib/commons/commons-beanutils-1.11.0.jar b/donkey/lib/commons/commons-beanutils-1.11.0.jar
new file mode 100644
index 0000000000..6b7b993661
Binary files /dev/null and b/donkey/lib/commons/commons-beanutils-1.11.0.jar differ
diff --git a/donkey/lib/commons/commons-beanutils-1.9.4.jar b/donkey/lib/commons/commons-beanutils-1.9.4.jar
deleted file mode 100644
index b73543cbac..0000000000
Binary files a/donkey/lib/commons/commons-beanutils-1.9.4.jar and /dev/null differ
diff --git a/donkey/lib/commons/commons-codec-1.16.0.jar b/donkey/lib/commons/commons-codec-1.16.0.jar
deleted file mode 100644
index 854fc7eb34..0000000000
Binary files a/donkey/lib/commons/commons-codec-1.16.0.jar and /dev/null differ
diff --git a/donkey/lib/commons/commons-codec-1.21.0.jar b/donkey/lib/commons/commons-codec-1.21.0.jar
new file mode 100644
index 0000000000..99989eb59b
Binary files /dev/null and b/donkey/lib/commons/commons-codec-1.21.0.jar differ
diff --git a/donkey/lib/commons/commons-configuration2-2.13.0.jar b/donkey/lib/commons/commons-configuration2-2.13.0.jar
new file mode 100644
index 0000000000..1809bc354d
Binary files /dev/null and b/donkey/lib/commons/commons-configuration2-2.13.0.jar differ
diff --git a/donkey/lib/commons/commons-email-1.5.jar b/donkey/lib/commons/commons-email-1.5.jar
new file mode 100644
index 0000000000..291bd194f4
Binary files /dev/null and b/donkey/lib/commons/commons-email-1.5.jar differ
diff --git a/donkey/lib/commons/commons-fileupload-1.6.0.jar b/donkey/lib/commons/commons-fileupload-1.6.0.jar
new file mode 100644
index 0000000000..63af9e1294
Binary files /dev/null and b/donkey/lib/commons/commons-fileupload-1.6.0.jar differ
diff --git a/donkey/lib/commons/commons-io-2.13.0.jar b/donkey/lib/commons/commons-io-2.13.0.jar
deleted file mode 100644
index eb316f4020..0000000000
Binary files a/donkey/lib/commons/commons-io-2.13.0.jar and /dev/null differ
diff --git a/donkey/lib/commons/commons-io-2.21.0.jar b/donkey/lib/commons/commons-io-2.21.0.jar
new file mode 100644
index 0000000000..7f1688194e
Binary files /dev/null and b/donkey/lib/commons/commons-io-2.21.0.jar differ
diff --git a/donkey/lib/commons/commons-logging-1.2.jar b/donkey/lib/commons/commons-logging-1.2.jar
deleted file mode 100644
index 93a3b9f6db..0000000000
Binary files a/donkey/lib/commons/commons-logging-1.2.jar and /dev/null differ
diff --git a/donkey/lib/commons/commons-logging-1.3.5.jar b/donkey/lib/commons/commons-logging-1.3.5.jar
new file mode 100644
index 0000000000..75d93a15cf
Binary files /dev/null and b/donkey/lib/commons/commons-logging-1.3.5.jar differ
diff --git a/donkey/lib/commons/commons-vfs2-2.10.0.jar b/donkey/lib/commons/commons-vfs2-2.10.0.jar
new file mode 100644
index 0000000000..cf5182ed13
Binary files /dev/null and b/donkey/lib/commons/commons-vfs2-2.10.0.jar differ
diff --git a/generator/.classpath b/generator/.classpath
index f7f903c27c..13623b1160 100644
--- a/generator/.classpath
+++ b/generator/.classpath
@@ -22,7 +22,7 @@
-
+
diff --git a/generator/lib/commons-io-2.13.0.jar b/generator/lib/commons-io-2.13.0.jar
deleted file mode 100644
index eb316f4020..0000000000
Binary files a/generator/lib/commons-io-2.13.0.jar and /dev/null differ
diff --git a/generator/lib/commons-io-2.21.0.jar b/generator/lib/commons-io-2.21.0.jar
new file mode 100644
index 0000000000..7f1688194e
Binary files /dev/null and b/generator/lib/commons-io-2.21.0.jar differ
diff --git a/server/.classpath b/server/.classpath
index 099f1c15b5..b70c09b04f 100644
--- a/server/.classpath
+++ b/server/.classpath
@@ -12,19 +12,19 @@
-
+
-
+
-
+
-
+
@@ -47,7 +47,7 @@
-
+
@@ -112,7 +112,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
@@ -201,8 +201,8 @@
-
-
+
+
@@ -267,7 +267,7 @@
-
+
diff --git a/server/build.xml b/server/build.xml
index 8e7a8e346e..2630c207db 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -1046,7 +1046,7 @@
-
+
@@ -1232,7 +1232,7 @@
-
+
diff --git a/server/lib/commons/commons-beanutils-1.11.0.jar b/server/lib/commons/commons-beanutils-1.11.0.jar
new file mode 100644
index 0000000000..6b7b993661
Binary files /dev/null and b/server/lib/commons/commons-beanutils-1.11.0.jar differ
diff --git a/server/lib/commons/commons-beanutils-1.9.4.jar b/server/lib/commons/commons-beanutils-1.9.4.jar
deleted file mode 100644
index b73543cbac..0000000000
Binary files a/server/lib/commons/commons-beanutils-1.9.4.jar and /dev/null differ
diff --git a/server/lib/commons/commons-codec-1.16.0.jar b/server/lib/commons/commons-codec-1.16.0.jar
deleted file mode 100644
index 854fc7eb34..0000000000
Binary files a/server/lib/commons/commons-codec-1.16.0.jar and /dev/null differ
diff --git a/server/lib/commons/commons-codec-1.21.0.jar b/server/lib/commons/commons-codec-1.21.0.jar
new file mode 100644
index 0000000000..99989eb59b
Binary files /dev/null and b/server/lib/commons/commons-codec-1.21.0.jar differ
diff --git a/server/lib/commons/commons-compress-1.24.0.jar b/server/lib/commons/commons-compress-1.24.0.jar
deleted file mode 100644
index cb2950e2b5..0000000000
Binary files a/server/lib/commons/commons-compress-1.24.0.jar and /dev/null differ
diff --git a/server/lib/commons/commons-compress-1.28.0.jar b/server/lib/commons/commons-compress-1.28.0.jar
new file mode 100644
index 0000000000..ff7e6aad05
Binary files /dev/null and b/server/lib/commons/commons-compress-1.28.0.jar differ
diff --git a/server/lib/commons/commons-configuration2-2.13.0.jar b/server/lib/commons/commons-configuration2-2.13.0.jar
new file mode 100644
index 0000000000..1809bc354d
Binary files /dev/null and b/server/lib/commons/commons-configuration2-2.13.0.jar differ
diff --git a/server/lib/commons/commons-configuration2-2.8.0.jar b/server/lib/commons/commons-configuration2-2.8.0.jar
deleted file mode 100644
index bd3d8d83b2..0000000000
Binary files a/server/lib/commons/commons-configuration2-2.8.0.jar and /dev/null differ
diff --git a/server/lib/commons/commons-email-1.5.jar b/server/lib/commons/commons-email-1.5.jar
new file mode 100644
index 0000000000..291bd194f4
Binary files /dev/null and b/server/lib/commons/commons-email-1.5.jar differ
diff --git a/server/lib/commons/commons-email-1.6.0.jar b/server/lib/commons/commons-email-1.6.0.jar
deleted file mode 100644
index c520d58430..0000000000
Binary files a/server/lib/commons/commons-email-1.6.0.jar and /dev/null differ
diff --git a/server/lib/commons/commons-fileupload-1.5.jar b/server/lib/commons/commons-fileupload-1.5.jar
deleted file mode 100644
index 5e608753c1..0000000000
Binary files a/server/lib/commons/commons-fileupload-1.5.jar and /dev/null differ
diff --git a/server/lib/commons/commons-fileupload-1.6.0.jar b/server/lib/commons/commons-fileupload-1.6.0.jar
new file mode 100644
index 0000000000..63af9e1294
Binary files /dev/null and b/server/lib/commons/commons-fileupload-1.6.0.jar differ
diff --git a/server/lib/commons/commons-io-2.13.0.jar b/server/lib/commons/commons-io-2.13.0.jar
deleted file mode 100644
index eb316f4020..0000000000
Binary files a/server/lib/commons/commons-io-2.13.0.jar and /dev/null differ
diff --git a/server/lib/commons/commons-io-2.21.0.jar b/server/lib/commons/commons-io-2.21.0.jar
new file mode 100644
index 0000000000..7f1688194e
Binary files /dev/null and b/server/lib/commons/commons-io-2.21.0.jar differ
diff --git a/server/lib/commons/commons-logging-1.2.jar b/server/lib/commons/commons-logging-1.2.jar
deleted file mode 100644
index 93a3b9f6db..0000000000
Binary files a/server/lib/commons/commons-logging-1.2.jar and /dev/null differ
diff --git a/server/lib/commons/commons-logging-1.3.5.jar b/server/lib/commons/commons-logging-1.3.5.jar
new file mode 100644
index 0000000000..75d93a15cf
Binary files /dev/null and b/server/lib/commons/commons-logging-1.3.5.jar differ
diff --git a/server/lib/javax/activation-1.1.jar b/server/lib/javax/activation-1.1.jar
new file mode 100644
index 0000000000..53f82a1c4c
Binary files /dev/null and b/server/lib/javax/activation-1.1.jar differ
diff --git a/server/lib/javax/javax.activation-1.2.0.jar b/server/lib/javax/javax.activation-1.2.0.jar
deleted file mode 100644
index 60cc72177b..0000000000
Binary files a/server/lib/javax/javax.activation-1.2.0.jar and /dev/null differ
diff --git a/server/lib/javax/javax.mail-1.5.0.jar b/server/lib/javax/javax.mail-1.5.0.jar
deleted file mode 100644
index f27414b9a3..0000000000
Binary files a/server/lib/javax/javax.mail-1.5.0.jar and /dev/null differ
diff --git a/server/lib/javax/javax.mail-1.5.6.jar b/server/lib/javax/javax.mail-1.5.6.jar
new file mode 100644
index 0000000000..b10788ec64
Binary files /dev/null and b/server/lib/javax/javax.mail-1.5.6.jar differ