Author: ningjiang
Date: Tue Oct 7 08:58:13 2008
New Revision: 702527
URL: http://svn.apache.org/viewvc?rev=702527&view=rev
Log:
Merged revisions 702524 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r702524 | ningjiang | 2008-10-07 23:52:21 +0800 (Tue, 07 Oct 2008) | 1 line
CXF-1841 set the jca spec jar's scope to be provided
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/api/pom.xml
cxf/branches/2.1.x-fixes/integration/jca/pom.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/pom.xml?rev=702527&r1=702526&r2=702527&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/api/pom.xml Tue Oct 7 08:58:13 2008
@@ -76,6 +76,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Modified: cxf/branches/2.1.x-fixes/integration/jca/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/integration/jca/pom.xml?rev=702527&r1=702526&r2=702527&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/integration/jca/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/integration/jca/pom.xml Tue Oct 7 08:58:13 2008
@@ -113,6 +113,12 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
