DATAREDIS-80

+ make some OSGi imports optional
+ upgrade to Jackson 1.8.6
This commit is contained in:
Costin Leau
2011-12-06 12:19:35 +02:00
parent 5c41fb47ca
commit 711bc14361
3 changed files with 9 additions and 9 deletions

View File

@@ -6,8 +6,8 @@
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true"/>
<classpathentry sourcepath="C:/Users/costin/.gradle/cache/org.codehaus.jackson/jackson-core-asl/sources/jackson-core-asl-1.8.5-sources.jar" kind="lib" path="C:/Users/costin/.gradle/cache/org.codehaus.jackson/jackson-core-asl/jars/jackson-core-asl-1.8.5.jar" exported="true"/>
<classpathentry sourcepath="C:/Users/costin/.gradle/cache/org.codehaus.jackson/jackson-mapper-asl/sources/jackson-mapper-asl-1.8.5-sources.jar" kind="lib" path="C:/Users/costin/.gradle/cache/org.codehaus.jackson/jackson-mapper-asl/jars/jackson-mapper-asl-1.8.5.jar" exported="true"/>
<classpathentry sourcepath="C:/Users/costin/.gradle/cache/org.codehaus.jackson/jackson-core-asl/sources/jackson-core-asl-1.8.6-sources.jar" kind="lib" path="C:/Users/costin/.gradle/cache/org.codehaus.jackson/jackson-core-asl/jars/jackson-core-asl-1.8.6.jar" exported="true"/>
<classpathentry sourcepath="C:/Users/costin/.gradle/cache/org.codehaus.jackson/jackson-mapper-asl/sources/jackson-mapper-asl-1.8.6-sources.jar" kind="lib" path="C:/Users/costin/.gradle/cache/org.codehaus.jackson/jackson-mapper-asl/jars/jackson-mapper-asl-1.8.6.jar" exported="true"/>
<classpathentry sourcepath="C:/Users/costin/.gradle/cache/org.springframework/spring-oxm/sources/spring-oxm-3.1.0.RC2-sources.jar" kind="lib" path="C:/Users/costin/.gradle/cache/org.springframework/spring-oxm/jars/spring-oxm-3.1.0.RC2.jar" exported="true"/>
<classpathentry sourcepath="C:/Users/costin/.gradle/cache/log4j/log4j/sources/log4j-1.2.16-sources.jar" kind="lib" path="C:/Users/costin/.gradle/cache/log4j/log4j/bundles/log4j-1.2.16.jar" exported="true"/>
<classpathentry sourcepath="C:/Users/costin/.gradle/cache/org.springframework/spring-aop/sources/spring-aop-3.1.0.RC2-sources.jar" kind="lib" path="C:/Users/costin/.gradle/cache/org.springframework/spring-aop/jars/spring-aop-3.1.0.RC2.jar" exported="true"/>

View File

@@ -6,7 +6,7 @@ slf4jVersion = 1.6.3
# Common libraries
springVersion = 3.1.0.RC2
jacksonVersion = 1.8.5
jacksonVersion = 1.8.6
# Testing
junitVersion = 4.8.1

View File

@@ -19,11 +19,11 @@ Import-Template:
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
org.w3c.dom.*;version="0",
javax.xml.transform.*;resolution:="optional";version="0",
org.jredis.*;version="[1.0.0, 2.0.0)",
org.jredis.ri.alphazero.*;version="[1.0.0, 2.0.0)",
org.jredis.*;resolution:="optional";version="[1.0.0, 2.0.0)",
org.jredis.ri.alphazero.*;resolution:="optional";version="[1.0.0, 2.0.0)",
redis.clients.jedis.*;version=${jedis.range},
redis.clients.util.*;version=${jedis.range},
org.idevlab.rjc.*;version=${rjc.range},
org.apache.commons.pool.impl.*;version="[1.0.0, 3.0.0)",
org.codehaus.jackson.*;version=${jackson.range},
org.apache.commons.beanutils.*;version=1.8.5
org.idevlab.rjc.*;resolution:="optional";version=${rjc.range},
org.apache.commons.pool.impl.*;resolution:="optional";version="[1.0.0, 3.0.0)",
org.codehaus.jackson.*;resolution:="optional";version=${jackson.range},
org.apache.commons.beanutils.*;resolution:="optional";version=1.8.5