# Conflicts: # build.gradle # spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java