Strabon

changeset 297:36acd78a9455

Merging again
author Manos Karpathiotakis <mk@di.uoa.gr>
date Tue Jun 19 17:56:09 2012 +0300 (2012-06-19)
parents 581e52ae22a0 809c08f7b984
children 3a2cb2955296 b553a8023a07
files
line diff
     1.1 --- a/endpoint/pom.xml	Tue Jun 19 17:45:18 2012 +0300
     1.2 +++ b/endpoint/pom.xml	Tue Jun 19 17:56:09 2012 +0300
     1.3 @@ -100,6 +100,12 @@
     1.4  		<dependency>
     1.5  			<groupId>org.apache.cxf</groupId>
     1.6  			<artifactId>cxf-rt-transports-http-jetty</artifactId>
     1.7 +			<exclusions>
     1.8 +				<exclusion>
     1.9 +					<artifactId>slf4j-jdk14</artifactId>
    1.10 +					<groupId>org.slf4j</groupId>
    1.11 +				</exclusion>
    1.12 +			</exclusions>
    1.13  		</dependency>
    1.14  
    1.15  		<dependency>