Clean up the ode dependencies and manifest

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@747411 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 24 insertions, 17 deletions

diff --git a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
index e2842f488c..cbfe380bfe 100644
--- a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Private-Package: org.apache.tuscany.sca.implementation.bpel.ode;versio

- n="1.4",org.apache.tuscany.sca.implementation.bpel.ode.provider;versi

- on="1.4"

+ n="2.0",org.apache.tuscany.sca.implementation.bpel.ode.provider;versi

+ on="2.0"

 Tool: Bnd-0.0.255

 Bundle-Name: Apache Tuscany SCA BPEL ODE Implementation Extension

 Created-By: 1.6.0_07 (Sun Microsystems Inc.)

 Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 1.4

+Bundle-Version: 2.0

 Bnd-LastModified: 1225397447609

 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

@@ -17,7 +17,6 @@ Import-Package: javax.resource.spi,
  javax.transaction;version="1.0.1",

  javax.wsdl,

  javax.xml.namespace,

- 

  org.apache.commons.logging,

  org.apache.geronimo.transaction.manager,

  org.apache.ode.bpel.compiler,

@@ -30,17 +29,17 @@ Import-Package: javax.resource.spi,
  org.apache.ode.il.dbutil,

  org.apache.ode.scheduler.simple,

  org.apache.ode.utils,

- org.apache.tuscany.sca.assembly;version="1.4",

- org.apache.tuscany.sca.core;version="1.4",

- org.apache.tuscany.sca.databinding.xml;version="1.4",

- org.apache.tuscany.sca.implementation.bpel;version="1.4",

- org.apache.tuscany.sca.interfacedef;version="1.4",

- org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

- org.apache.tuscany.sca.invocation;version="1.4",

- org.apache.tuscany.sca.policy;version="1.4.0",

- org.apache.tuscany.sca.provider;version="1.4",

- org.apache.tuscany.sca.runtime;version="1.4",

- org.osoa.sca.annotations;version="1.4",

+ org.apache.tuscany.sca.assembly;version="2.0",

+ org.apache.tuscany.sca.core;version="2.0",

+ org.apache.tuscany.sca.databinding.xml;version="2.0",

+ org.apache.tuscany.sca.implementation.bpel;version="2.0",

+ org.apache.tuscany.sca.interfacedef;version="2.0",

+ org.apache.tuscany.sca.interfacedef.wsdl;version="2.0",

+ org.apache.tuscany.sca.invocation;version="2.0",

+ org.apache.tuscany.sca.policy;version="2.0.0",

+ org.apache.tuscany.sca.provider;version="2.0",

+ org.apache.tuscany.sca.runtime;version="2.0",

+ org.oasisopen.sca.annotation;version="2.0",

  org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel.ode

 Bundle-DocURL: http://www.apache.org/

diff --git a/java/sca/modules/implementation-bpel-ode/pom.xml b/java/sca/modules/implementation-bpel-ode/pom.xml
index c5d1ad5699..d5b139e167 100644
--- a/java/sca/modules/implementation-bpel-ode/pom.xml
+++ b/java/sca/modules/implementation-bpel-ode/pom.xml
@@ -180,8 +180,8 @@
         </dependency>

         <dependency>

             <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>

-            <version>1.0</version>

+            <artifactId>geronimo-jta_1.1_spec</artifactId>

+            <version>1.1.1</version>

         </dependency>

         <dependency>

             <groupId>org.apache.geronimo.modules</groupId>

@@ -209,6 +209,10 @@
             <exclusions>

                 <exclusion>

                     <groupId>org.apache.geronimo.specs</groupId>

+                    <artifactId>geronimo-jta_1.0.1B_spec</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.apache.geronimo.specs</groupId>

                     <artifactId>geronimo-ejb_2.1_spec</artifactId>

                 </exclusion>

                 <exclusion>

@@ -228,6 +232,10 @@
             <version>1.2-beta</version>

             <exclusions>

                 <exclusion>

+                    <groupId>org.apache.geronimo.specs</groupId>

+                    <artifactId>geronimo-jta_1.0.1B_spec</artifactId>

+                </exclusion>

+                <exclusion>

                     <groupId>xmlbeans</groupId>

                     <artifactId>xbean</artifactId>

                 </exclusion>