cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1509280 - in /cxf/branches/2.6.x-fixes: parent/pom.xml systests/jaxrs/pom.xml systests/transport-jms/pom.xml systests/transports/pom.xml
Date Thu, 01 Aug 2013 15:19:52 GMT
Author: dkulp
Date: Thu Aug  1 15:19:51 2013
New Revision: 1509280

URL: http://svn.apache.org/r1509280
Log:
Merged revisions 1504550 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1504550 | dkulp | 2013-07-18 13:25:19 -0400 (Thu, 18 Jul 2013) | 10 lines

  Merged revisions 1504540 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1504540 | dkulp | 2013-07-18 13:18:19 -0400 (Thu, 18 Jul 2013) | 2 lines

    Move nekohtml version to parent pom

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/parent/pom.xml
    cxf/branches/2.6.x-fixes/systests/jaxrs/pom.xml
    cxf/branches/2.6.x-fixes/systests/transport-jms/pom.xml
    cxf/branches/2.6.x-fixes/systests/transports/pom.xml

Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1509280&r1=1509279&r2=1509280&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Thu Aug  1 15:19:51 2013
@@ -574,7 +574,17 @@
                 <version>${cxf.junit.version}</version>
                 <scope>test</scope>
             </dependency>
-
+            <dependency>
+                <groupId>nekohtml</groupId>
+                <artifactId>nekohtml</artifactId>
+                <version>1.9.6.2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>xerces</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>

Modified: cxf/branches/2.6.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/jaxrs/pom.xml?rev=1509280&r1=1509279&r2=1509280&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/systests/jaxrs/pom.xml Thu Aug  1 15:19:51 2013
@@ -262,7 +262,6 @@
         <dependency>
             <groupId>nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
-            <version>1.9.6.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.6.x-fixes/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/transport-jms/pom.xml?rev=1509280&r1=1509279&r2=1509280&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/transport-jms/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/systests/transport-jms/pom.xml Thu Aug  1 15:19:51 2013
@@ -263,7 +263,6 @@
         <dependency>
             <groupId>nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
-            <version>1.9.6.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.6.x-fixes/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/transports/pom.xml?rev=1509280&r1=1509279&r2=1509280&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/transports/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/systests/transports/pom.xml Thu Aug  1 15:19:51 2013
@@ -238,7 +238,6 @@
         <dependency>
             <groupId>nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
-            <version>1.9.6.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>



Mime
View raw message