diff --git a/.classpath b/.classpath
index 55a508b..bd86b27 100644
--- a/.classpath
+++ b/.classpath
@@ -110,16 +110,16 @@
     <classpathentry kind="lib" path="framework/base/lib/scripting/jline-0.9.94.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/ecj-P20140317-1600.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-catalina.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-jasper.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.4.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.55-catalina.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.55-jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
     <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-3.1.1.jar"/>
diff --git a/LICENSE b/LICENSE
index 2cff094..4e74c7c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -76,15 +76,15 @@
 framework/base/lib/xmlrpc-client-3.1.2.jar
 framework/base/lib/xmlrpc-common-3.1.2.jar
 framework/base/lib/xmlrpc-server-3.1.2.jar
-framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
-framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
-framework/catalina/lib/tomcat-7.0.54-catalina.jar
-framework/catalina/lib/tomcat-7.0.54-jasper.jar
-framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
-framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
-framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
-framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar
-framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar
+framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar
+framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar
+framework/catalina/lib/tomcat-7.0.55-catalina.jar
+framework/catalina/lib/tomcat-7.0.55-jasper.jar
+framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar
+framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar
+framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar
+framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
+framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar
 framework/entity/lib/commons-dbcp-1.4.jar
 framework/entity/lib/jdbc/derby-10.8.2.2.jar
 framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
@@ -2315,6 +2315,7 @@
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 Eclipse Public License - v 1.0:
+framework/catalina/lib/ecj-4.4.jar
 framework/birt/lib/flute.jar
 framework/birt/lib/jaxrpc.jar
 framework/birt/lib/js.jar
diff --git a/framework/catalina/lib/ecj-4.4.jar b/framework/catalina/lib/ecj-4.4.jar
new file mode 100644
index 0000000..98f82dc
--- /dev/null
+++ b/framework/catalina/lib/ecj-4.4.jar
Binary files differ
diff --git a/framework/catalina/lib/ecj-P20140317-1600.jar b/framework/catalina/lib/ecj-P20140317-1600.jar
deleted file mode 100644
index 1285def..0000000
--- a/framework/catalina/lib/ecj-P20140317-1600.jar
+++ /dev/null
Binary files differ
diff --git a/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar b/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
deleted file mode 100644
index f49e8d7..0000000
--- a/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
+++ /dev/null
Binary files differ
diff --git a/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar b/framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar
similarity index 88%
rename from framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
rename to framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar
index 9ac21ef..073c71d 100644
--- a/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
+++ b/framework/catalina/lib/tomcat-7.0.55-catalina-ha.jar
Binary files differ
diff --git a/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar b/framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar
similarity index 93%
rename from framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
rename to framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar
index 9a5a724..6ffba9c 100644
--- a/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
+++ b/framework/catalina/lib/tomcat-7.0.55-catalina-tribes.jar
Binary files differ
diff --git a/framework/catalina/lib/tomcat-7.0.54-catalina.jar b/framework/catalina/lib/tomcat-7.0.55-catalina.jar
similarity index 77%
rename from framework/catalina/lib/tomcat-7.0.54-catalina.jar
rename to framework/catalina/lib/tomcat-7.0.55-catalina.jar
index 4d2ad0d..de8c5fe 100644
--- a/framework/catalina/lib/tomcat-7.0.54-catalina.jar
+++ b/framework/catalina/lib/tomcat-7.0.55-catalina.jar
Binary files differ
diff --git a/framework/catalina/lib/tomcat-7.0.54-jasper.jar b/framework/catalina/lib/tomcat-7.0.55-jasper.jar
similarity index 82%
rename from framework/catalina/lib/tomcat-7.0.54-jasper.jar
rename to framework/catalina/lib/tomcat-7.0.55-jasper.jar
index 022fd8b..ce94849 100644
--- a/framework/catalina/lib/tomcat-7.0.54-jasper.jar
+++ b/framework/catalina/lib/tomcat-7.0.55-jasper.jar
Binary files differ
diff --git a/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar b/framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar
similarity index 82%
rename from framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
rename to framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar
index 7228c63..081203f 100644
--- a/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
+++ b/framework/catalina/lib/tomcat-7.0.55-tomcat-api.jar
Binary files differ
diff --git a/framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar b/framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar
new file mode 100644
index 0000000..9f09ecd
--- /dev/null
+++ b/framework/catalina/lib/tomcat-7.0.55-tomcat-coyote.jar
Binary files differ
diff --git a/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar b/framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar
similarity index 90%
rename from framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
rename to framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar
index e257b98..148594c 100644
--- a/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
+++ b/framework/catalina/lib/tomcat-7.0.55-tomcat-util.jar
Binary files differ
diff --git a/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar b/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar
deleted file mode 100644
index ae8a2f8..0000000
--- a/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar
+++ /dev/null
Binary files differ
diff --git a/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar b/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar
similarity index 92%
rename from framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar
rename to framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar
index 135ebc3..0ad5763 100644
--- a/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar
+++ b/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli-adapters.jar
Binary files differ
diff --git a/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar b/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
new file mode 100644
index 0000000..325207b
--- /dev/null
+++ b/framework/catalina/lib/tomcat-extras-7.0.55-tomcat-juli.jar
Binary files differ