Author: jbonofre
Date: Sat Jul 5 13:03:32 2014
New Revision: 1608011
URL: http://svn.apache.org/r1608011
Log:
[SMX4-1789] Extend the guava import package version range
Modified:
servicemix/smx4/bundles/trunk/jackson-module-scala-2.1.5/pom.xml
servicemix/smx4/bundles/trunk/jackson-module-scala-2.3.0/pom.xml
Modified: servicemix/smx4/bundles/trunk/jackson-module-scala-2.1.5/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jackson-module-scala-2.1.5/pom.xml?rev=1608011&r1=1608010&r2=1608011&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jackson-module-scala-2.1.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jackson-module-scala-2.1.5/pom.xml Sat Jul 5 13:03:32 2014
@@ -49,7 +49,8 @@
javax.inject;resolution:=optional,
scala.reflect.internal.pickling;version="[2.10,2.11)";resolution:=optional,
scala.reflect.internal;version="[2.10,2.11)";resolution:=optional,
- com.google.common.collect;resolution:=optional,
+ com.google.common.cache;version="[13,18)";resolution:=optional,
+ com.google.common.collect;version="[13,18)";resolution:=optional,
com.thoughtworks.paranamer;resolution:=optional,
scala*;version="[2.10,2.11)",
*
Modified: servicemix/smx4/bundles/trunk/jackson-module-scala-2.3.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jackson-module-scala-2.3.0/pom.xml?rev=1608011&r1=1608010&r2=1608011&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jackson-module-scala-2.3.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jackson-module-scala-2.3.0/pom.xml Sat Jul 5 13:03:32 2014
@@ -49,9 +49,10 @@
javax.inject;resolution:=optional,
scala.reflect.internal.pickling;version="[2.10,2.11)";resolution:=optional,
scala.reflect.internal;version="[2.10,2.11)";resolution:=optional,
- com.google.common.collect;resolution:=optional,
+ com.google.common.cache;version="[13,18)";resolution:=optional,
+ com.google.common.collect;version="[13,18)";resolution:=optional,
com.thoughtworks.paranamer;resolution:=optional,
- scala*;version="[2.10,2.11)",
+ scala*;version="[2.10,2.12)",
*
</servicemix.osgi.import.pkg>
</properties>
|