hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-10 19:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into configurable_entities

Browse Source
This commit is contained in:
Tim Donohue
2018-12-06 17:05:31 +00:00
parent b44cf37d9d 301f804d44
commit ceed829800
568 changed files with 3990 additions and 2864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-api/src/test/java/org/dspace/content/ItemTest.java
View File

@@ -29,8 +29,8 @@ import java.util.List;
import java.util.UUID;
import mockit.NonStrictExpectations;
import org.apache.commons.lang.time.DateUtils;
import org.apache.log4j.Logger;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.logging.log4j.Logger;
import org.dspace.app.util.AuthorizeUtil;
import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.ResourcePolicy;
@@ -56,7 +56,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
/**
* log4j category
*/
private static final Logger log = Logger.getLogger(ItemTest.class);
private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemTest.class);
/**
* Item instance for the tests