You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/10/30 06:44:14 UTC

svn commit: r831205 - in /tuscany/java/sca/modules: binding-ejb-runtime/pom.xml binding-jms-runtime/pom.xml binding-sca-axis2-runtime/pom.xml binding-ws-axis2/pom.xml implementation-bpel-runtime/pom.xml

Author: rfeng
Date: Fri Oct 30 05:44:14 2009
New Revision: 831205

URL: http://svn.apache.org/viewvc?rev=831205&view=rev
Log:
Update geronimo spec jars to the osgi-enabled versions 

Modified:
    tuscany/java/sca/modules/binding-ejb-runtime/pom.xml
    tuscany/java/sca/modules/binding-jms-runtime/pom.xml
    tuscany/java/sca/modules/binding-sca-axis2-runtime/pom.xml
    tuscany/java/sca/modules/binding-ws-axis2/pom.xml
    tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml

Modified: tuscany/java/sca/modules/binding-ejb-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/pom.xml?rev=831205&r1=831204&r2=831205&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ejb-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ejb-runtime/pom.xml Fri Oct 30 05:44:14 2009
@@ -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>

Modified: tuscany/java/sca/modules/binding-jms-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/pom.xml?rev=831205&r1=831204&r2=831205&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jms-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-jms-runtime/pom.xml Fri Oct 30 05:44:14 2009
@@ -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>

Modified: tuscany/java/sca/modules/binding-sca-axis2-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-axis2-runtime/pom.xml?rev=831205&r1=831204&r2=831205&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-sca-axis2-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-sca-axis2-runtime/pom.xml Fri Oct 30 05:44:14 2009
@@ -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>

Modified: tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=831205&r1=831204&r2=831205&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/pom.xml Fri Oct 30 05:44:14 2009
@@ -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>

Modified: tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml?rev=831205&r1=831204&r2=831205&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml Fri Oct 30 05:44:14 2009
@@ -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>