From b54a099f4968e269f6b8ae9ba4bfc5fbfdac39ab Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 17 Feb 2010 22:50:01 +0000
Subject: [PATCH] marked spring-tx as a required dependency (SPR-6737)

---
 org.springframework.jms/ivy.xml | 2 +-
 org.springframework.jms/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.springframework.jms/ivy.xml b/org.springframework.jms/ivy.xml
index 3f43b50d2048..f5678706a240 100644
--- a/org.springframework.jms/ivy.xml
+++ b/org.springframework.jms/ivy.xml
@@ -44,7 +44,7 @@
 		<dependency org="org.springframework" name="org.springframework.oxm" rev="latest.integration"
 					conf="optional, oxm->compile"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration"
-					conf="optional, jca->compile"/>
+					conf="compile->compile"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 8de79c2a305c..dcf4d06caa11 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -88,7 +88,7 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
       <version>${project.version}</version>
-      <optional>true</optional>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
   <build>