Author: asoldano
Date: Mon Jan 27 16:41:38 2014
New Revision: 1561739
URL: http://svn.apache.org/r1561739
Log:
Merged revisions 1561677 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1561677 | asoldano | 2014-01-27 14:47:10 +0100 (Mon, 27 Jan 2014) | 2 lines
[CXF-5526] Excluding wrong dependencies
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/osgi/itests/pom.xml
cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1561677
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/osgi/itests/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/osgi/itests/pom.xml?rev=1561739&r1=1561738&r2=1561739&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/osgi/itests/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/osgi/itests/pom.xml Mon Jan 27 16:41:38 2014
@@ -56,6 +56,16 @@
<artifactId>apache-karaf</artifactId>
<version>${cxf.karaf.version}</version>
<type>tar.gz</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openengsb.labs.paxexam.karaf</groupId>
Modified: cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml?rev=1561739&r1=1561738&r2=1561739&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml Mon Jan 27
16:41:38 2014
@@ -92,16 +92,20 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${karaf.version}</version>
- <type>tar.gz</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.client</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>tar.gz</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
