Upgrades ocfl-java to 1.4.3 (#50)

Resolves: https://fedora-repository.atlassian.net/browse/FCREPO-3793
fcrepo-exts · Jan 28, 2022 · 048c182 · 048c182
1 parent 92683a3
commit 048c182
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
   <repositories>
     <repository>
-      <id>snapshots-repo</id>
+      <id>sonatype-nexus-snapshots</id>
       <url>https://${sonatype.host}/content/repositories/snapshots</url>
       <releases>
         <enabled>false</enabled>
@@ -60,10 +60,10 @@
     <junit.version>4.13.1</junit.version>
     <cargo.version>1.4.12</cargo.version>
     <fcrepo-java-client.version>0.4.0</fcrepo-java-client.version>
-    <fcrepo.storage.ocfl.version>6.1.0</fcrepo.storage.ocfl.version>
+    <fcrepo.storage.ocfl.version>6.2.0-SNAPSHOT</fcrepo.storage.ocfl.version>
     <commons-lang.version>3.11</commons-lang.version>
     <commons-collections.version>4.4</commons-collections.version>
-    <ocfl-java.version>1.3.1</ocfl-java.version>
+    <ocfl-java.version>1.4.3</ocfl-java.version>
     <httpclient.version>4.5.13</httpclient.version>
     <sonatype.host>s01.oss.sonatype.org</sonatype.host>
   </properties>

diff --git a/src/main/java/org/fcrepo/upgrade/utils/UpgradeManagerFactory.java b/src/main/java/org/fcrepo/upgrade/utils/UpgradeManagerFactory.java
@@ -18,8 +18,7 @@
 import edu.wisc.library.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig;
 import edu.wisc.library.ocfl.core.path.mapper.LogicalPathMappers;
 import edu.wisc.library.ocfl.core.storage.OcflStorage;
-import edu.wisc.library.ocfl.core.storage.cloud.CloudOcflStorage;
-import edu.wisc.library.ocfl.core.storage.filesystem.FileSystemOcflStorage;
+import edu.wisc.library.ocfl.core.storage.OcflStorageBuilder;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.fcrepo.storage.ocfl.CommitType;
@@ -119,15 +118,15 @@ private static MutableOcflRepository createOcflRepo(final Config config,
         final OcflStorage storage;
 
         if (config.isWriteToS3()) {
-            storage = CloudOcflStorage.builder()
-                    .cloudClient(OcflS3Client.builder()
+            storage = OcflStorageBuilder.builder()
+                                        .cloud(OcflS3Client.builder()
                             .s3Client(s3Client(config))
                             .bucket(config.getS3Bucket())
                             .repoPrefix(config.getS3Prefix())
                             .build())
-                    .build();
+                                        .build();
         } else {
-            storage = FileSystemOcflStorage.builder().repositoryRoot(storageRoot).build();
+            storage = OcflStorageBuilder.builder().fileSystem(storageRoot).build();
         }
 
         return new OcflRepositoryBuilder()