geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1064472 - in /geronimo/server/trunk: plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml plugins/jaxws/pom.xml plugins/webservices/pom.xml pom.xml
Date Fri, 28 Jan 2011 07:10:44 GMT
Author: xuhaihong
Date: Fri Jan 28 07:10:43 2011
New Revision: 1064472

URL: http://svn.apache.org/viewvc?rev=1064472&view=rev
Log:
Update dependent ri components to latest released vesion

Modified:
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
    geronimo/server/trunk/plugins/jaxws/pom.xml
    geronimo/server/trunk/plugins/webservices/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml?rev=1064472&r1=1064471&r2=1064472&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml Fri Jan 28 07:10:43
2011
@@ -42,13 +42,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-command-api</artifactId>
-            <scope>provided</scope>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.console</artifactId>
         </dependency>
+        
     </dependencies>
 
-    <build>
+    <!--<build>
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.gshell</groupId>
@@ -64,4 +64,4 @@
         </plugins>
     </build>
 
-</project>
+--></project>

Modified: geronimo/server/trunk/plugins/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/pom.xml?rev=1064472&r1=1064471&r2=1064472&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/pom.xml Fri Jan 28 07:10:43 2011
@@ -40,11 +40,114 @@
         <module>geronimo-jaxws</module>
         <module>geronimo-jaxws-builder</module>
         <module>geronimo-jaxws-ejb-builder</module>
-        <!--<module>geronimo-jaxws-sun-tools</module>-->
+        <!--module>geronimo-jaxws-sun-tools</module-->
         <module>jaxws-deployer</module>
         <module>jaxws-ejb-deployer</module>
-        <!--<module>jaxws-sun-tools</module>-->
-        <!--<module>jaxws-tools</module>-->
+        <!--module>jaxws-sun-tools</module-->
+        <!--module>jaxws-tools</module-->
     </modules>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-tools</artifactId>
+                <version>2.2.3-promoted-b07</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
 
+            <dependency>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-rt</artifactId>
+                <version>2.2.3-promoted-b07</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.ws</groupId>
+                        <artifactId>jaxws-api</artifactId>            
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>            
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.messaging.saaj</groupId>
+                        <artifactId>saaj-impl</artifactId>
+                    </exclusion>        
+                    <exclusion>
+                        <groupId>org.codehaus.woodstox</groupId>
+                        <artifactId>wstx-asl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.org.apache.xml.internal</groupId>
+                        <artifactId>resolver</artifactId>                   
    
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.jvnet</groupId>
+                        <artifactId>mimepull</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.ws</groupId>
+                        <artifactId>policy</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.glassfish.gmbal</groupId>
+                        <artifactId>gmbal-api-only</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.glassfish.ha</groupId>
+                        <artifactId>ha-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.stream</groupId>
+                        <artifactId>sjsxp</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>com.sun.xml.stream.buffer</groupId>
+                <artifactId>streambuffer</artifactId>
+                <version>1.2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.jvnet.staxex</groupId>
+                        <artifactId>stax-ex</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jvnet.staxex</groupId>
+                <artifactId>stax-ex</artifactId>
+                <version>1.4</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-xjc</artifactId>
+                <version>2.2.3-1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
+                </exclusions>    
+            </dependency>
+        </dependencies>
+    </dependencyManagement>    
 </project>

Modified: geronimo/server/trunk/plugins/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/pom.xml?rev=1064472&r1=1064471&r2=1064472&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/pom.xml Fri Jan 28 07:10:43 2011
@@ -42,4 +42,23 @@
         <module>webservices-common</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.sun.xml.messaging.saaj</groupId>
+                <artifactId>saaj-impl</artifactId>
+                <version>1.3.6</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.soap</groupId>
+                        <artifactId>saaj-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>        
+        </dependencies>
+    </dependencyManagement>
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1064472&r1=1064471&r2=1064472&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Jan 28 07:10:43 2011
@@ -724,7 +724,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>scout</artifactId>
-                <version>1.2.2_2-SNAPSHOT</version>
+                <version>1.2.2_1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -1377,22 +1377,6 @@
             </dependency>
 
             <dependency>
-                <groupId>com.sun.xml.messaging.saaj</groupId>
-                <artifactId>saaj-impl</artifactId>
-                <version>1.3.2</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.soap</groupId>
-                        <artifactId>saaj-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>jaxb-impl</artifactId>
                 <version>2.2_1</version>
@@ -1513,66 +1497,6 @@
             </dependency>
 
             <dependency>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-tools</artifactId>
-                <version>2.1.4</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-rt</artifactId>
-                <version>2.1.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.ws</groupId>
-                        <artifactId>jaxws-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.xml.stream</groupId>
-                        <artifactId>sjsxp</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.org.apache.xml.internal</groupId>
-                        <artifactId>resolver</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.jvnet</groupId>
-                        <artifactId>mimepull</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.sun.xml.stream.buffer</groupId>
-                <artifactId>streambuffer</artifactId>
-                <version>0.8</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jvnet.staxex</groupId>
-                <artifactId>stax-ex</artifactId>
-                <version>1.2</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>activation</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-xjc</artifactId>
-                <version>2.2</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.woden</groupId>
                 <artifactId>woden-api</artifactId>
                 <version>1.0M8</version>
@@ -2431,8 +2355,8 @@ only found in cxf
                 </repository>
                 <repository>
                     <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
+                    <url>http://download.java.net/maven/2/</url>
+                    <layout>default</layout>
                     <snapshots>
                         <enabled>false</enabled>
                     </snapshots>



Mime
View raw message