diff --git a/datastore_server/build.gradle b/datastore_server/build.gradle
index 6bc92746a8356d1508849403ab604ddcdd9b8d5e..9e750f8c63c1ff4becc1143d6020e6ea09e48578 100644
--- a/datastore_server/build.gradle
+++ b/datastore_server/build.gradle
@@ -25,7 +25,8 @@ dependencies {
 			'shriop:javacsv:+',
 			'cisd:cisd-image-readers:+',
 			'hjg:pngj:+',
-			'apache:commons-fileupload:+'
+			'apache:commons-fileupload:+',
+			'lyncode:xoai-data-provider:+'
 
 	runtime 'sun:jai:+'
 				
diff --git a/openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/ClassReferenceSearchTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/ClassReferenceSearchTest.java
index 06319cd425d6f3047284848509db64e45c6b853f..a3303a79e2c07badb5c978b0a3a3b237d3c5c6b5 100644
--- a/openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/ClassReferenceSearchTest.java
+++ b/openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/api/server/json/ClassReferenceSearchTest.java
@@ -16,9 +16,9 @@
 
 package ch.systemsx.cisd.openbis.common.api.server.json;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat; 
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.collection.IsCollectionContaining.hasItems;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
 
 import java.util.Collection;
 import java.util.List;