Author: lresende
Date: Mon Sep 17 15:01:21 2007
New Revision: 576600

URL: http://svn.apache.org/viewvc?rev=576600&view=rev
Log:
Merging pom updates from 1.0 branch

Modified:
    incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml

Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?rev=576600&r1=576599&r2=576600&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Mon Sep 17 
15:01:21 2007
@@ -101,7 +101,7 @@
                        <version>2.2</version>
                        <scope>test</scope>
                </dependency>
-
+               
                <!-- ODE Jars -->
                <dependency>
                        <groupId>org.apache.ode</groupId>
@@ -120,6 +120,11 @@
                </dependency>
                <dependency>
                        <groupId>org.apache.ode</groupId>
+                       <artifactId>ode-bpel-dao</artifactId>
+                       <version>1.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.ode</groupId>
                        <artifactId>ode-dao-jpa</artifactId>
                        <version>1.1</version>
                </dependency>
@@ -195,11 +200,31 @@
                        <groupId>org.apache.geronimo.modules</groupId>
                        <artifactId>geronimo-kernel</artifactId>
                        <version>1.2-beta</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>mx4j</groupId>
+                                       <artifactId>mx4j</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>xpp3</groupId>
+                                       <artifactId>xpp3</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>xstream</groupId>
+                                       <artifactId>xstream</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.apache.geronimo.modules</groupId>
                        <artifactId>geronimo-transaction</artifactId>
                        <version>1.2-beta</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>ognl</groupId>
+                                       <artifactId>ognl</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.apache.geronimo.modules</groupId>
@@ -263,10 +288,10 @@
                        <version>1.12.0</version>
                </dependency>
                <dependency>
-                   <groupId>xerces</groupId>
-                   <artifactId>xercesImpl</artifactId>
-                   <version>2.8.0</version>
-               </dependency>           
+                       <groupId>xerces</groupId>
+                       <artifactId>xercesImpl</artifactId>
+                       <version>2.8.0</version>
+               </dependency>
                <dependency>
                        <groupId>org.apache.xmlbeans</groupId>
                        <artifactId>xmlbeans</artifactId>
@@ -288,6 +313,7 @@
                        <version>8.7</version>
                </dependency>
        </dependencies>
+       
        <build>
                <plugins>
                        <plugin>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to