diff --git a/build.gradle b/build.gradle
index 2fe733c4..22de7108 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ configure(allprojects) {
 	}
 
 	dependencies {
-		compile("commons-logging:commons-logging:1.1.1")
+		compile("commons-logging:commons-logging:1.1.3")
 		compile("org.springframework:spring-core:$springVersion")
 
 		testCompile("junit:junit:4.10")
@@ -193,9 +193,8 @@ project('spring-ws-support') {
 		testCompile("org.springframework:spring-test:$springVersion")
 
 		// Transport
-		provided("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
-		provided("org.apache.geronimo.specs:geronimo-ejb_2.1_spec:1.1")
-		provided("javax.mail:mail:1.4.5")
+		provided("javax.jms:jms-api:1.1-rev-1")
+		provided("javax.mail:mail:1.4.7")
 		optional("jivesoftware:smack:3.1.0")
 		testCompile("commons-httpclient:commons-httpclient:3.1")
 		testRuntime("org.apache.activemq:activemq-core:4.1.2")
diff --git a/spring-ws-core/template.mf b/spring-ws-core/template.mf
deleted file mode 100644
index 67719760..00000000
--- a/spring-ws-core/template.mf
+++ /dev/null
@@ -1,40 +0,0 @@
-Bundle-SymbolicName: org.springframework.ws
-Bundle-Name: Spring Web Services Core
-Bundle-Vendor: SpringSource
-Bundle-Version: ${osgi.version}
-Bundle-ManifestVersion: 2
-Import-Template: 
- javax.activation.*;version="0",
- javax.servlet.*;version="[2.4.0, 4.0.0)",
- javax.wsdl.*;version="[1.6.1, 2.0.0)";resolution:=optional,
- javax.xml.bind.*;version="0";resolution:=optional,
- javax.xml.namespace.*;version="0",
- javax.xml.parsers.*;version="0",
- javax.xml.transform.*;version="0",
- javax.xml.xpath.*;version="0",
- javax.xml.soap.*;version="0";resolution:=optional,
- javax.xml.stream.*;version="0";resolution:=optional,
- nu.xom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
- org.apache.axiom.*;version="[1.2.13, 2.0.0)";resolution:=optional,
- org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
- org.apache.http.*;version="[4.1.3, 5.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.dom4j.*;version="[1.6.1, 2.0.0)";resolution:=optional,
- org.jdom2.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- org.springframework.aop.*;version=${spring.framework.osgi.range},
- org.springframework.beans.*;version=${spring.framework.osgi.range},
- org.springframework.context.*;version=${spring.framework.osgi.range},
- org.springframework.core.*;version=${spring.framework.osgi.range},
- org.springframework.oxm.*;version=${spring.framework.osgi.range},
- org.springframework.util.*;version=${spring.framework.osgi.range},
- org.springframework.stereotype.*;version=${spring.framework.osgi.range},
- org.springframework.validation.*;version=${spring.framework.osgi.range},
- org.springframework.web.*;version=${spring.framework.osgi.range},
- org.springframework.xml.*;version=${osgi.range},
- org.w3c.dom.*;version="0",
- org.xml.sax.*;version="0"
-Ignored-Existing-Headers: 
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-ws-security/template.mf b/spring-ws-security/template.mf
deleted file mode 100644
index e73d7142..00000000
--- a/spring-ws-security/template.mf
+++ /dev/null
@@ -1,29 +0,0 @@
-Bundle-SymbolicName: org.springframework.ws.soap.security
-Bundle-Name: Spring Web Services SOAP Security
-Bundle-Vendor: SpringSource
-Bundle-Version: ${osgi.version}
-Bundle-ManifestVersion: 2
-Import-Template: 
- com.sun.xml.wss.*;version="0",
- javax.crypto.*;version="0",
- javax.security.auth.*;version="0",
- javax.xml.namespace.*;version="0",
- javax.xml.soap.*;version="0";resolution:=optional,
- net.sf.ehcache.*;version="2.0.0";resolution:=optional,
- org.apache.axiom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.apache.ws.security.*;version="[1.6.5, 2.0.0)";resolution:=optional,
- org.apache.xml.security.*;version="[1.0.5.D2, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version=${spring.framework.osgi.range},
- org.springframework.context.*;version=${spring.framework.osgi.range},
- org.springframework.core.*;version=${spring.framework.osgi.range},
- org.springframework.dao.*;version=${spring.framework.osgi.range},
- org.springframework.security.*;version="[3.1.0, 4.0.0)",
- org.springframework.util.*;version=${spring.framework.osgi.range},
- org.springframework.ws.*;version=${osgi.range},
- org.w3c.dom.*;version="0"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-ws-support/template.mf b/spring-ws-support/template.mf
deleted file mode 100644
index f269602e..00000000
--- a/spring-ws-support/template.mf
+++ /dev/null
@@ -1,33 +0,0 @@
-Bundle-SymbolicName: org.springframework.ws.support
-Bundle-Name: Spring Web Services Support
-Bundle-Vendor: SpringSource
-Bundle-Version: ${osgi.version}
-Bundle-ManifestVersion: 2
-Fragment-Host: org.springframework.ws;bundle-version=${osgi.range}
-Import-Template: 
- com.sun.net.httpserver.*;version="0";resolution:=optional,
- com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional,
- javax.activation.*;version="0",
- javax.ejb.*;version="[2.0.0, 4.0.0)";resolution:=optional,
- javax.jms.*;version="[1.1.0, 2.0.0)",
- javax.mail.*;version="[1.4.0, 2.0.0)",
- javax.naming.*;version="0";resolution:=optional,
- javax.net.ssl.*;version="0",
- javax.xml.transform.*;version="0",
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.jivesoftware.smack.*;version="[3.1.0, 4.0.0)",
- org.springframework.beans.*;version=${spring.framework.osgi.range},
- org.springframework.context.*;version=${spring.framework.osgi.range},
- org.springframework.core.*;version=${spring.framework.osgi.range},
- org.springframework.ejb.*;version=${spring.framework.osgi.range},
- org.springframework.jms.*;version=${spring.framework.osgi.range},
- org.springframework.jndi.*;version=${spring.framework.osgi.range},
- org.springframework.scheduling.*;version=${spring.framework.osgi.range},
- org.springframework.util.*;version=${spring.framework.osgi.range},
- org.springframework.ws.*;version=${osgi.range},
- org.springframework.xml.*;version=${osgi.range}
-Ignored-Existing-Headers: 
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-ws-test/template.mf b/spring-ws-test/template.mf
deleted file mode 100644
index 47a7cd46..00000000
--- a/spring-ws-test/template.mf
+++ /dev/null
@@ -1,25 +0,0 @@
-Bundle-SymbolicName: org.springframework.ws.test
-Bundle-Name: Spring Web Services Test
-Bundle-Vendor: SpringSource
-Bundle-Version: ${osgi.version}
-Bundle-ManifestVersion: 2
-Import-Template:
- javax.xml.namespace.*;version="0",
- javax.xml.parsers.*;version="0",
- javax.xml.transform.*;version="0",
- org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.custommonkey.xmlunit.*;version="[1.1.0, 2.0.0)",
- org.springframework.beans.*;version=${spring.framework.osgi.range},
- org.springframework.core.*;version=${spring.framework.osgi.range},
- org.springframework.context.*;version=${spring.framework.osgi.range},
- org.springframework.test.*;version=${spring.framework.osgi.range},
- org.springframework.util.*;version=${spring.framework.osgi.range},
- org.springframework.ws.*;version=${osgi.range},
- org.springframework.xml.*;version=${osgi.range},
- org.w3c.dom.*;version="0",
- org.xml.sax.*;version="0"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-xml/template.mf b/spring-xml/template.mf
deleted file mode 100644
index af9f4d78..00000000
--- a/spring-xml/template.mf
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.springframework.ws.xml
-Bundle-Name: Spring XML
-Bundle-Vendor: SpringSource
-Bundle-Version: ${osgi.version}
-Bundle-ManifestVersion: 2
-Import-Template: 
- javax.xml.namespace.*;version="0",
- javax.xml.parsers.*;version="0",
- javax.xml.stream.*;version="0",
- javax.xml.transform.*;version="0",
- javax.xml.transform.stax.*;version="0";resolution:=optional,
- javax.xml.validation.*;version="0",
- javax.xml.xpath.*;version="0",
- org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.apache.ws.commons.schema.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- org.jaxen.*;version="[1.1.3, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version=${spring.framework.osgi.range},
- org.springframework.core.*;version=${spring.framework.osgi.range},
- org.springframework.context.*;version=${spring.framework.osgi.range},
- org.springframework.util.*;version=${spring.framework.osgi.range},
- org.w3c.dom.*;version="0",
- org.xml.sax.*;version="0"
-Ignored-Existing-Headers:
- Bnd-LastModified,
- DynamicImport-Package,
- Import-Package,
- Export-Package,
- Tool