cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r948194 - in /cxf/branches/2.2.x-fixes: ./ parent/pom.xml rt/frontend/jaxrs/pom.xml
Date Tue, 25 May 2010 20:12:37 GMT
Author: dkulp
Date: Tue May 25 20:12:37 2010
New Revision: 948194

URL: http://svn.apache.org/viewvc?rev=948194&view=rev
Log:
Merged revisions 948193 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r948193 | dkulp | 2010-05-25 16:10:06 -0400 (Tue, 25 May 2010) | 1 line
  
  [CXF-2809] Update jaxen/abdera/activemq
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/parent/pom.xml
    cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:948193

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=948194&r1=948193&r2=948194&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Tue May 25 20:12:37 2010
@@ -46,8 +46,8 @@
         <saaj.impl.version>1.3.2</saaj.impl.version>
 
         <!-- please maintain alphabetical order here -->
-        <abdera.version>0.4.0-incubating</abdera.version>
-        <activemq.version>5.3.0</activemq.version>
+        <abdera.version>1.0</abdera.version>
+        <activemq.version>5.3.1</activemq.version>
         <derby.version>10.2.2.0</derby.version>
         <jaxb.version>2.1</jaxb.version>
         <jaxb.impl.version>2.1.13</jaxb.impl.version>
@@ -1032,9 +1032,13 @@
             <dependency>
                 <groupId>jaxen</groupId>
                 <artifactId>jaxen</artifactId>
-                <version>1.1</version>
+                <version>1.1.1</version>
                 <exclusions>
                     <exclusion>
+                        <artifactId>jdom</artifactId>
+                        <groupId>jdom</groupId>
+                    </exclusion>
+                    <exclusion>
                         <artifactId>dom4j</artifactId>
                         <groupId>dom4j</groupId>
                     </exclusion>

Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml?rev=948194&r1=948193&r2=948194&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml Tue May 25 20:12:37 2010
@@ -103,6 +103,10 @@
             <version>${abdera.version}</version>
         </dependency>
         <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-json</artifactId>
             <version>${abdera.version}</version>



Mime
View raw message