Merge pull request #4 from georgecalm/master

DATADOC-231: setting optional deps in the manifest to make the bundle work in an OSGi server

spring-data-mongodb/template.mf

@@ -11,11 +11,11 @@ Import-Template:
  org.springframework.data.*;version="${data.commons.version:[=.=.=.=,+1.0.0)}",
  org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
  com.mongodb.*;version="${mongo.version:[=.=,+1.0.0)}",
- com.mysema.query.*;version="[2.1.1, 3.0.0)",
+ com.mysema.query.*;version="[2.1.1, 3.0.0)";resolution:=optional,
  javax.annotation.processing.*;version="0",
  javax.tools.*;version="0",
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.apache.commons.collections15.*;version="[4.0.0,5.0.0)",
+ org.apache.commons.collections15.*;version="[4.0.0,5.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.bson.*;version="0",
  org.w3c.dom.*;version="0"