Update geronimo spec jars to the osgi-enabled versions

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

5 files changed, 52 insertions, 49 deletions

diff --git a/java/sca/modules/binding-ejb-runtime/pom.xml b/java/sca/modules/binding-ejb-runtime/pom.xml
index df6c35391b..96c179fbaa 100644
--- a/java/sca/modules/binding-ejb-runtime/pom.xml
+++ b/java/sca/modules/binding-ejb-runtime/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0</version>
+            <version>1.0.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -146,13 +146,7 @@
         <dependency>
            <groupId>org.apache.geronimo.specs</groupId>
            <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
+           <version>1.1.1</version>
         </dependency>         
 
     </dependencies>
diff --git a/java/sca/modules/binding-jms-runtime/pom.xml b/java/sca/modules/binding-jms-runtime/pom.xml
index 6b78bfb342..0ab0dd069a 100644
--- a/java/sca/modules/binding-jms-runtime/pom.xml
+++ b/java/sca/modules/binding-jms-runtime/pom.xml
@@ -81,14 +81,8 @@
         <dependency>
            <groupId>org.apache.geronimo.specs</groupId>
            <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
+           <version>1.1.1</version>
            <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
         </dependency>         
 
         <dependency>
diff --git a/java/sca/modules/binding-sca-axis2-runtime/pom.xml b/java/sca/modules/binding-sca-axis2-runtime/pom.xml
index bf6312cf2b..64d095c032 100644
--- a/java/sca/modules/binding-sca-axis2-runtime/pom.xml
+++ b/java/sca/modules/binding-sca-axis2-runtime/pom.xml
@@ -53,14 +53,7 @@
         <dependency>
            <groupId>org.apache.geronimo.specs</groupId>
            <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <!-- scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions-->
+           <version>1.1.1</version>
         </dependency>           
                 
         <dependency>
diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml
index b9d56c6e70..1476825f85 100644
--- a/java/sca/modules/binding-ws-axis2/pom.xml
+++ b/java/sca/modules/binding-ws-axis2/pom.xml
@@ -407,14 +407,8 @@
         <dependency>
            <groupId>org.apache.geronimo.specs</groupId>
            <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
+           <version>1.1.1</version>
            <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
         </dependency>           
 
     </dependencies>
diff --git a/java/sca/modules/implementation-bpel-runtime/pom.xml b/java/sca/modules/implementation-bpel-runtime/pom.xml
index bd582bd3de..eedf738ddb 100644
--- a/java/sca/modules/implementation-bpel-runtime/pom.xml
+++ b/java/sca/modules/implementation-bpel-runtime/pom.xml
@@ -182,11 +182,6 @@
             <version>3.2</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>2.0.1</version>
@@ -220,13 +215,17 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+                    <artifactId>geronimo-jta_1.1_spec</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-ejb_2.1_spec</artifactId>
                 </exclusion>
                 <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>ognl</groupId>
                     <artifactId>ognl</artifactId>
                 </exclusion>
@@ -239,7 +238,27 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0</version>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
@@ -251,6 +270,10 @@
                     <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
                 </exclusion>
                 <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+                </exclusion>                
+                <exclusion>
                     <groupId>xmlbeans</groupId>
                     <artifactId>xbean</artifactId>
                 </exclusion>
@@ -305,17 +328,22 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
             <version>1.2.1</version>
-            <!--
-                <exclusions> <exclusion> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-lib</artifactId>
-                </exclusion> <exclusion> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-kernel</artifactId>
-                </exclusion> <exclusion> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-kernel-5</artifactId>
-                </exclusion> <exclusion> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-jdbc</artifactId>
-                </exclusion> <exclusion> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-jdbc-5</artifactId>
-                </exclusion> <exclusion> <groupId>org.apache.openjpa</groupId>
-                <artifactId>openjpa-persistence-jdbc</artifactId> </exclusion> <exclusion>
-                <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-xmlstore</artifactId> </exclusion> <exclusion>
-                <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> </exclusions>
-            -->
+
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jta_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+
         </dependency>
         <dependency>
             <groupId>net.sourceforge.serp</groupId>
@@ -407,7 +435,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>