diff --git a/client/.classpath b/client/.classpath
index 8ea7380e16..543d56aed2 100644
--- a/client/.classpath
+++ b/client/.classpath
@@ -124,7 +124,7 @@
-
+
@@ -141,10 +141,10 @@
-
+
-
+
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-configuration2-2.10.1.jar b/client/lib/commons-configuration2-2.10.1.jar
new file mode 100644
index 0000000000..272b62517a
Binary files /dev/null and b/client/lib/commons-configuration2-2.10.1.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-lang3-3.13.0.jar b/client/lib/commons-lang3-3.13.0.jar
deleted file mode 100644
index 891540f404..0000000000
Binary files a/client/lib/commons-lang3-3.13.0.jar and /dev/null differ
diff --git a/client/lib/commons-lang3-3.18.0.jar b/client/lib/commons-lang3-3.18.0.jar
new file mode 100644
index 0000000000..9359e524af
Binary files /dev/null and b/client/lib/commons-lang3-3.18.0.jar differ
diff --git a/command/.classpath b/command/.classpath
index 597d21a233..10435423c4 100644
--- a/command/.classpath
+++ b/command/.classpath
@@ -48,7 +48,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
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-configuration2-2.10.1.jar b/command/lib/commons-configuration2-2.10.1.jar
new file mode 100644
index 0000000000..272b62517a
Binary files /dev/null and b/command/lib/commons-configuration2-2.10.1.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-lang3-3.13.0.jar b/command/lib/commons-lang3-3.13.0.jar
deleted file mode 100644
index 891540f404..0000000000
Binary files a/command/lib/commons-lang3-3.13.0.jar and /dev/null differ
diff --git a/command/lib/commons-lang3-3.18.0.jar b/command/lib/commons-lang3-3.18.0.jar
new file mode 100644
index 0000000000..9359e524af
Binary files /dev/null and b/command/lib/commons-lang3-3.18.0.jar differ
diff --git a/donkey/.classpath b/donkey/.classpath
index cd4e567372..50783fc159 100644
--- a/donkey/.classpath
+++ b/donkey/.classpath
@@ -16,7 +16,7 @@
-
+
@@ -52,7 +52,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-lang3-3.13.0.jar b/donkey/lib/commons/commons-lang3-3.13.0.jar
deleted file mode 100644
index 891540f404..0000000000
Binary files a/donkey/lib/commons/commons-lang3-3.13.0.jar and /dev/null differ
diff --git a/donkey/lib/commons/commons-lang3-3.18.0.jar b/donkey/lib/commons/commons-lang3-3.18.0.jar
new file mode 100644
index 0000000000..9359e524af
Binary files /dev/null and b/donkey/lib/commons/commons-lang3-3.18.0.jar differ
diff --git a/generator/.classpath b/generator/.classpath
index cb075c277e..8c14b188d4 100644
--- a/generator/.classpath
+++ b/generator/.classpath
@@ -21,7 +21,7 @@
-
+
diff --git a/generator/lib/commons-lang3-3.13.0.jar b/generator/lib/commons-lang3-3.13.0.jar
deleted file mode 100644
index 891540f404..0000000000
Binary files a/generator/lib/commons-lang3-3.13.0.jar and /dev/null differ
diff --git a/generator/lib/commons-lang3-3.18.0.jar b/generator/lib/commons-lang3-3.18.0.jar
new file mode 100644
index 0000000000..9359e524af
Binary files /dev/null and b/generator/lib/commons-lang3-3.18.0.jar differ
diff --git a/manager/.classpath b/manager/.classpath
index 391b7aba01..966341035f 100644
--- a/manager/.classpath
+++ b/manager/.classpath
@@ -29,8 +29,8 @@
-
-
+
+
@@ -46,7 +46,7 @@
-
+
diff --git a/manager/ant-build.xml b/manager/ant-build.xml
index 4733353eba..5efe843aa8 100644
--- a/manager/ant-build.xml
+++ b/manager/ant-build.xml
@@ -43,7 +43,7 @@
-
+
diff --git a/manager/lib/commons-beanutils-1.11.0.jar b/manager/lib/commons-beanutils-1.11.0.jar
new file mode 100644
index 0000000000..6b7b993661
Binary files /dev/null and b/manager/lib/commons-beanutils-1.11.0.jar differ
diff --git a/manager/lib/commons-beanutils-1.9.4.jar b/manager/lib/commons-beanutils-1.9.4.jar
deleted file mode 100644
index b73543cbac..0000000000
Binary files a/manager/lib/commons-beanutils-1.9.4.jar and /dev/null differ
diff --git a/manager/lib/commons-configuration2-2.10.1.jar b/manager/lib/commons-configuration2-2.10.1.jar
new file mode 100644
index 0000000000..272b62517a
Binary files /dev/null and b/manager/lib/commons-configuration2-2.10.1.jar differ
diff --git a/manager/lib/commons-configuration2-2.8.0.jar b/manager/lib/commons-configuration2-2.8.0.jar
deleted file mode 100644
index bd3d8d83b2..0000000000
Binary files a/manager/lib/commons-configuration2-2.8.0.jar and /dev/null differ
diff --git a/manager/lib/commons-lang3-3.13.0.jar b/manager/lib/commons-lang3-3.13.0.jar
deleted file mode 100644
index 891540f404..0000000000
Binary files a/manager/lib/commons-lang3-3.13.0.jar and /dev/null differ
diff --git a/manager/lib/commons-lang3-3.18.0.jar b/manager/lib/commons-lang3-3.18.0.jar
new file mode 100644
index 0000000000..9359e524af
Binary files /dev/null and b/manager/lib/commons-lang3-3.18.0.jar differ
diff --git a/server/.classpath b/server/.classpath
index 37a587c948..281031b9b6 100644
--- a/server/.classpath
+++ b/server/.classpath
@@ -12,9 +12,9 @@
-
+
-
+
@@ -46,7 +46,7 @@
-
+
diff --git a/server/build.xml b/server/build.xml
index 1e66e78173..1b03e5de96 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -1036,7 +1036,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-configuration2-2.10.1.jar b/server/lib/commons/commons-configuration2-2.10.1.jar
new file mode 100644
index 0000000000..272b62517a
Binary files /dev/null and b/server/lib/commons/commons-configuration2-2.10.1.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-lang3-3.13.0.jar b/server/lib/commons/commons-lang3-3.13.0.jar
deleted file mode 100644
index 891540f404..0000000000
Binary files a/server/lib/commons/commons-lang3-3.13.0.jar and /dev/null differ
diff --git a/server/lib/commons/commons-lang3-3.18.0.jar b/server/lib/commons/commons-lang3-3.18.0.jar
new file mode 100644
index 0000000000..9359e524af
Binary files /dev/null and b/server/lib/commons/commons-lang3-3.18.0.jar differ