Update bagit-support dependency to 1.1.0 (#58)

* Update imports * Update bagit-support to 1.1.0
DSpace · Oct 26, 2020 · bc3d515 · bc3d515
1 parent 8509d26
commit bc3d515
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
         <!-- DuraCloud Version Information (supported version of DuraCloud) -->
         <duracloud.version>6.1.1</duracloud.version>
         <!-- DuraSpace BagIt Support Library -->
-        <bagit-support.version>1.0.1</bagit-support.version>
+        <bagit-support.version>1.1.0</bagit-support.version>
         <jaxb.version>2.3.1</jaxb.version>
         <!-- Replication Task Suite requires Java 1.7 or higher, as DuraCloud APIs require Java 1.7 or above. -->
         <java.version>1.7</java.version>

diff --git a/src/main/java/org/dspace/pack/PackerFactory.java b/src/main/java/org/dspace/pack/PackerFactory.java
@@ -13,14 +13,13 @@
 import org.dspace.content.Item;
 import org.dspace.content.Site;
 import org.dspace.core.Constants;
-import org.dspace.pack.bagit.CatalogPacker;
 import org.dspace.pack.bagit.CollectionPacker;
 import org.dspace.pack.bagit.CommunityPacker;
 import org.dspace.pack.bagit.ItemPacker;
 import org.dspace.pack.bagit.SitePacker;
 import org.dspace.pack.mets.METSPacker;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.duraspace.bagit.BagProfile;
+import org.duraspace.bagit.profile.BagProfile;
 
 /**
  * PackerFactory mints packers for specified object types. Packer implementation

diff --git a/src/main/java/org/dspace/pack/bagit/BagItAipReader.java b/src/main/java/org/dspace/pack/bagit/BagItAipReader.java
@@ -45,9 +45,9 @@
 import org.dspace.pack.bagit.xml.policy.Policy;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.duraspace.bagit.BagDeserializer;
-import org.duraspace.bagit.BagProfile;
-import org.duraspace.bagit.SerializationSupport;
+import org.duraspace.bagit.profile.BagProfile;
+import org.duraspace.bagit.serialize.BagDeserializer;
+import org.duraspace.bagit.serialize.SerializationSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/org/dspace/pack/bagit/BagItAipWriter.java b/src/main/java/org/dspace/pack/bagit/BagItAipWriter.java
@@ -46,11 +46,11 @@
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.duraspace.bagit.BagConfig;
 import org.duraspace.bagit.BagItDigest;
-import org.duraspace.bagit.BagProfile;
-import org.duraspace.bagit.BagProfileConstants;
-import org.duraspace.bagit.BagSerializer;
 import org.duraspace.bagit.BagWriter;
-import org.duraspace.bagit.SerializationSupport;
+import org.duraspace.bagit.profile.BagProfile;
+import org.duraspace.bagit.profile.BagProfileConstants;
+import org.duraspace.bagit.serialize.BagSerializer;
+import org.duraspace.bagit.serialize.SerializationSupport;
 import org.joda.time.LocalDate;
 import org.joda.time.format.ISODateTimeFormat;
 

diff --git a/src/main/java/org/dspace/pack/bagit/CatalogPacker.java b/src/main/java/org/dspace/pack/bagit/CatalogPacker.java
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/src/main/java/org/dspace/pack/bagit/CollectionPacker.java b/src/main/java/org/dspace/pack/bagit/CollectionPacker.java
@@ -37,7 +37,6 @@
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.packager.PackageException;
-import org.dspace.content.packager.PackageUtils;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;

diff --git a/src/test/java/org/dspace/pack/bagit/BagItAipWriterTest.java b/src/test/java/org/dspace/pack/bagit/BagItAipWriterTest.java
@@ -8,8 +8,8 @@
 package org.dspace.pack.bagit;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

diff --git a/src/test/java/org/dspace/pack/bagit/BagItPolicyUtilTest.java b/src/test/java/org/dspace/pack/bagit/BagItPolicyUtilTest.java
@@ -9,8 +9,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.dspace.authorize.ResourcePolicy.TYPE_CUSTOM;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.matches;
+import static org.mockito.ArgumentMatchers.anyListOf;
+import static org.mockito.ArgumentMatchers.matches;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;