You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/18 19:25:20 UTC
svn commit: r1504550 - in /cxf/branches/2.7.x-fixes: parent/pom.xml
systests/jaxrs/pom.xml systests/transport-jms/pom.xml
systests/transports/pom.xml
Author: dkulp
Date: Thu Jul 18 17:25:19 2013
New Revision: 1504550
URL: http://svn.apache.org/r1504550
Log:
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.7.x-fixes/parent/pom.xml
cxf/branches/2.7.x-fixes/systests/jaxrs/pom.xml
cxf/branches/2.7.x-fixes/systests/transport-jms/pom.xml
cxf/branches/2.7.x-fixes/systests/transports/pom.xml
Modified: cxf/branches/2.7.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/parent/pom.xml?rev=1504550&r1=1504549&r2=1504550&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Thu Jul 18 17:25:19 2013
@@ -585,7 +585,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.7.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/pom.xml?rev=1504550&r1=1504549&r2=1504550&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/pom.xml Thu Jul 18 17:25:19 2013
@@ -270,7 +270,6 @@
<dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: cxf/branches/2.7.x-fixes/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/transport-jms/pom.xml?rev=1504550&r1=1504549&r2=1504550&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/transport-jms/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/transport-jms/pom.xml Thu Jul 18 17:25:19 2013
@@ -269,7 +269,6 @@
<dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: cxf/branches/2.7.x-fixes/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/transports/pom.xml?rev=1504550&r1=1504549&r2=1504550&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/transports/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/transports/pom.xml Thu Jul 18 17:25:19 2013
@@ -248,7 +248,6 @@
<dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.6.2</version>
<scope>test</scope>
</dependency>
<dependency>