Merge branch 'master' into configurable_entities

This commit is contained in:
Tim Donohue
2018-12-06 17:05:31 +00:00
568 changed files with 3990 additions and 2864 deletions

View File

@@ -18,7 +18,7 @@ import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.dspace.AbstractUnitTest;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.factory.ContentServiceFactory;
@@ -42,7 +42,7 @@ public class MetadataValueTest extends AbstractUnitTest {
/**
* log4j category
*/
private static final Logger log = Logger.getLogger(MetadataValueTest.class);
private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(MetadataValueTest.class);
/**
* MetadataValue instance for the tests