Author: djencks
Date: Wed Aug  5 23:52:19 2009
New Revision: 801469

URL: http://svn.apache.org/viewvc?rev=801469&view=rev
Log:
GERONIMO-4703, GERONIMO-4786 Upgrade to scout 1.1, txmanager 2.1.3-SNAPSHOT

Modified:
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=801469&r1=801468&r2=801469&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Aug  5 23:52:19 2009
@@ -90,7 +90,7 @@
 
         <connectorSuffix></connectorSuffix>
         <connectorSpec>geronimo-j2ee-connector_1.5_spec</connectorSpec>
-        <txmanagerVersion>2.1.2</txmanagerVersion>
+        <txmanagerVersion>2.1.3-SNAPSHOT</txmanagerVersion>
         <!--<connectorSuffix>-1_6</connectorSuffix>
         <connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>
         <txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>-->
@@ -732,46 +732,16 @@
             <dependency>
                 <groupId>org.apache.ws.scout</groupId>
                 <artifactId>scout</artifactId>
-                <version>1.0rc1</version>
-                <!--<version>1.1</version>-->
+                <version>1.1</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>axis</groupId>
-                        <artifactId>axis-saaj</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>axis</groupId>
-                        <artifactId>axis-jaxrpc</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xmlbeans</groupId>
-                        <artifactId>xbean</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.ws.scout</groupId>
-                        <artifactId>jaxr-api</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>stax</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>xerces</groupId>
                         <artifactId>xercesImpl</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>geronimo-spec</groupId>
-                        <artifactId>geronimo-spec-activation</artifactId>
-                    </exclusion>
-                    <!-- not sure how scout would work without this if its a dependency ?? -->
-                    <exclusion>
-                        <groupId>jdom</groupId>
-                        <artifactId>jdom</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>