diff --git a/build.versions b/build.versions
index 10516f7..a1b1a11 100644
--- a/build.versions
+++ b/build.versions
@@ -1,31 +1,60 @@
 # Test
-org.junit=4.7.0
-org.easymock=2.3.0
+
 org.eclipse.virgo.test=3.7.0.BUILD-20150104200311
 
+#CQ4131
+org.easymock=2.3.0
+
+#CQ4130
+org.junit=4.7.0
+
+
 # Compile
-org.eclipse.virgo.util=3.6.3.RELEASE
-org.eclipse.virgo.build.tools=1.4.1.RELEASE
+org.eclipse.equinox.event=1.3.100.v20140115-1647
 org.eclipse.equinox.launcher=1.3.0.v20120308-1358
-javax.activation=1.1.1
-javax.annotation=1.2.0.v201401042248
-javax.ejb=3.1.1.v201204261316
-javax.el=3.0.0.20161229
-javax.mail=1.4.0.v201005080615
-javax.persistence=2.1.0.v201304241213
-javax.security.auth.message=1.1.0.20161229
-javax.servlet.jsp=2.3.0.20161229
-javax.servlet.jstl=1.2.0.v201105211821
-javax.servlet=3.1.0.20161229
-javax.transaction=1.1.0.v201205091237
-javax.xml.rpc=1.1.0.v201005080400
-javax.xml.soap=1.3.0.v201105210645
-javax.websocket=1.1.0.20161229
-org.apache.taglibs=1.1.2.v20110518
+org.eclipse.jdt=3.11.0.v20150602-1242
 org.eclipse.osgi=3.10.100.v20150529-1857
 org.eclipse.osgi.services=3.5.0.v20150519-2006
-org.eclipse.equinox.event=1.3.100.v20140115-1647
+org.eclipse.virgo.build.tools=1.4.1.RELEASE
+org.eclipse.virgo.util=3.6.3.RELEASE
+javax.persistence=2.1.0.v201304241213
+
+#CQ4135, CQ4316
+javax.activation=1.1.1
+
+#CQ12586
+javax.annotation=1.2.0.v201401042248
+
+#CQ6818
+javax.ejb=3.1.1.v201204261316
+
+#CQ4320
+javax.mail=1.4.0.v201005080615
+
+#CQ5418, CQ4354
+javax.servlet.jstl=1.2.0.v201105211821
+
+#CQ4323
+javax.transaction=1.1.0.v201205091237
+
+#CQ4325
+javax.xml.rpc=1.1.0.v201005080400
+
+#CQ4326
+javax.xml.soap=1.3.0.v201105210645
+
+#CQ4111
+org.apache.taglibs=1.1.2.v20110518
+
+#CQ12373
 org.apache.catalina=8.5.9
-org.eclipse.jdt=3.11.0.v20150602-1242
+javax.el=3.0.0.20161229
+javax.security.auth.message=1.1.0.20161229
+javax.servlet=3.1.0.20161229
+javax.servlet.jsp=2.3.0.20161229
+javax.websocket=1.1.0.20161229
+
+#CQ6925
 org.slf4j.api=1.7.2.v20121108-1250
+#CQ6926
 org.slf4j.nop=1.7.2.v201212060727