diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index 712ce49651..4df894ef49 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -36,6 +36,7 @@
       org.springframework*;resolution:=optional,
       sun.management*;resolution:=optional,
       org.josql*;resolution:=optional,
+      org.apache.velocity*;resolution:=optional,
       *
     </activemq.osgi.import.pkg>
     <activemq.osgi.export>
@@ -97,13 +98,18 @@
     </dependency>
 
     <dependency>
-      <groupId>velocity</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>${commons-lang-version}</version>
+    </dependency>
     <dependency>
       <groupId>net.sf.josql</groupId>
       <artifactId>josql</artifactId>
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index e1dfcee5a1..1fd6ac8924 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -4,7 +4,7 @@
     <feature name="transaction" version="1.0.0"> 
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> 
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle> 
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/1.0.1-1_1</bundle> 
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/1.0.1-1_1</bundle>
         <bundle>mvn:org.apache.geronimo.components/geronimo-transaction/2.2-r634076</bundle> 
         <bundle>mvn:org.springframework/spring-tx/2.5.6</bundle> 
         <bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/1.0.0</bundle> 
@@ -17,16 +17,23 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jencks/2.1_1</bundle> 
     </feature>
     
-    <feature name="activemq" version="5.3.0"> 
-    <feature version="4.0.0">connector</feature> 
+    <feature name="activemq" version="${activemq-version}"> 
+        <feature version="4.0.0">connector</feature>
+        <config name="org.apache.servicemix.transaction">
+            transactionLogDir = data/txlog/
+        </config> 
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle> 
-        <bundle>mvn:commons-pool/commons-pool/1.4</bundle> 
-        <bundle>mvn:org.apache.xbean/xbean-spring/3.6</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-core/5.3.0</bundle> 
-        <bundle>mvn:org.apache.activemq/kahadb/5.3.0</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-ra/5.3.0</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-console/5.3.0</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-pool/5.3.0</bundle> 
+        <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> 
+        <bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle> 
+        <bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle> 
+        <bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle> 
+        <bundle>mvn:org.apache.activemq/activemq-ra/${activemq-version}</bundle> 
+        <bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle> 
+        <bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle> 
         <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/4.1.0-SNAPSHOT</bundle> 
     </feature>
 </features>
\ No newline at end of file
diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index f527cd4d35..27987d7fd3 100755
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -173,7 +173,7 @@
     </dependency>  
     
     <dependency>
-      <groupId>velocity</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 9ef0cad0e4..1e400b242f 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -202,6 +202,7 @@
         <include>commons-pool:commons-pool</include>
         <include>commons-codec:commons-codec</include>
         <include>commons-net:commons-net</include>
+        <include>commons-lang:commons-lang</include>
         <include>log4j:log4j</include>
         <include>mx4j:mx4j-remote</include>
         <include>mx4j:mx4j-tools</include>
@@ -221,7 +222,7 @@
         <include>org.codehaus.woodstox:wstx-asl</include>
         <include>org.springframework.ws:spring-oxm-tiger</include>
         <include>org.codehaus.jettison:jettison</include>
-        <include>velocity:velocity</include>
+        <include>org.apache.velocity:velocity</include>
         <include>net.sf.josql:josql</include>
       </includes>
     </dependencySet>
diff --git a/pom.xml b/pom.xml
index 4a851f8e9d..4f109911c6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
     <commons-dbcp-version>1.2.2</commons-dbcp-version>
     <commons-httpclient-version>3.1</commons-httpclient-version>
     <commons-io-version>1.4</commons-io-version>
+    <commons-lang-version>2.4</commons-lang-version>
     <commons-logging-version>1.1</commons-logging-version>
     <commons-pool-version>1.4</commons-pool-version>
     <commons-primitives-version>1.0</commons-primitives-version>
@@ -78,6 +79,7 @@
     <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
     <xstream-version>1.3.1</xstream-version>
     <xbean-version>3.6</xbean-version>
+    <velocity-version>1.6.2</velocity-version>
     <felix-version>2.0.1</felix-version>
     <commons-net-version>2.0</commons-net-version>
     <ftpserver-version>1.0.0</ftpserver-version>
@@ -890,9 +892,9 @@
     	</dependency>
 
       <dependency>
-        <groupId>velocity</groupId>
+        <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
-        <version>1.4</version>
+        <version>${velocity-version}</version>
         <optional>true</optional>
       </dependency>
       <dependency>