diff --git a/spring-amqp-core/template.mf b/spring-amqp-core/template.mf
index 42ac4078..f7bc5170 100644
--- a/spring-amqp-core/template.mf
+++ b/spring-amqp-core/template.mf
@@ -4,6 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.*;version="[3.0.5, 4.0.0)",
+ org.springframework.amqp.*;version="[1.0.0, 1.1.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.codehaus.jackson.*;version="[1.4.3, 2.0.0)";resolution:=optional,
  org.w3c.dom.*;version="0",
diff --git a/spring-amqp-parent/pom.xml b/spring-amqp-parent/pom.xml
index 2e8548c4..1cd1cadd 100644
--- a/spring-amqp-parent/pom.xml
+++ b/spring-amqp-parent/pom.xml
@@ -62,10 +62,6 @@
 							<junitArtifactName>junit:junit</junitArtifactName>
 						</configuration>
 					</plugin>
-					<plugin>
-						<groupId>com.springsource.bundlor</groupId>
-						<artifactId>com.springsource.bundlor.maven</artifactId>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -403,6 +399,9 @@
 							</goals>
 						</execution>
 					</executions>
+					<configuration>
+						<failOnWarnings>true</failOnWarnings>
+					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
diff --git a/spring-rabbit/pom.xml b/spring-rabbit/pom.xml
index de89500d..3425a400 100644
--- a/spring-rabbit/pom.xml
+++ b/spring-rabbit/pom.xml
@@ -115,4 +115,12 @@
 		</dependency>
 
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java
index cf6c7eb6..bf3aa8c0 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java
@@ -19,8 +19,6 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.LinkedList;
 
-import javax.naming.OperationNotSupportedException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.DisposableBean;
@@ -185,7 +183,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory implements
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			String methodName = method.getName();
 			if (methodName.equals("txSelect") && !this.transactional) {
-				throw new OperationNotSupportedException("Cannot start transaction on non-transactional channel");
+				throw new UnsupportedOperationException("Cannot start transaction on non-transactional channel");
 			}
 			if (methodName.equals("equals")) {
 				// Only consider equal when proxies are identical.
diff --git a/spring-rabbit/template.mf b/spring-rabbit/template.mf
index 11e80f34..6a440447 100644
--- a/spring-rabbit/template.mf
+++ b/spring-rabbit/template.mf
@@ -4,8 +4,11 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.*;version="[3.0.5, 4.0.0)",
+ org.springframework.amqp.*;version="[1.0.0, 1.1.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- com.rabbitmq.*;version="[1.8.1, 2.0.0)",
+ com.rabbitmq.*;version="[2.0.0, 2.2.0)",
+ org.aopalliance.*;version="0";resolution:=optional,
+ com.ericsson.otp.erlang;version="0";resolution:=optional,
  org.junit.*;version="0",
  org.w3c.dom.*;version="0",
  javax.xml.*;version="0"