From 1714a40788bb9e578d98e8883b670f27204d3696 Mon Sep 17 00:00:00 2001 From: Jared Whiklo Date: Mon, 20 May 2024 09:30:38 -0500 Subject: [PATCH] Point at recent fcrepo-storage-ocfl snapshot with ocfl-java 2.0.1 changes (#205) * Point at recent fcrepo-storage-ocfl snapshot with ocfl-java 2.0.1 changes * Update github actions versions --- .github/workflows/build.yml | 10 +++++----- pom.xml | 4 ++-- .../OcflSessionFactoryFactoryBean.java | 12 ++++++------ .../org/fcrepo/migration/PicocliMigrator.java | 8 ++++---- .../handlers/ocfl/PlainOcflObjectSession.java | 14 +++++++------- .../ocfl/PlainOcflObjectSessionFactory.java | 2 +- .../java/org/fcrepo/migration/PicocliIT.java | 18 +++++++++--------- .../handlers/ocfl/ArchiveGroupHandlerTest.java | 14 +++++++------- .../PlainOcflObjectSessionFactoryTest.java | 10 +++++----- .../ocfl/PlainOcflObjectSessionTest.java | 12 ++++++------ .../fcrepo/migration/pidlist/HeadOnlyIT.java | 16 ++++++++-------- 11 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2140f1b5..15d5c11b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,14 +21,14 @@ jobs: - name: Git support longpaths run: git config --global core.longpaths true - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 11 distribution: temurin - name: Cache Maven packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -44,9 +44,9 @@ jobs: - name: Git support longpaths run: git config --global core.longpaths true - name: Checkout fcrepo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 11 distribution: temurin diff --git a/pom.xml b/pom.xml index 3f20aadb..06c55f52 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 org.fcrepo.migration.PicocliMigrator 5.2.24.RELEASE - 6.3.0-SNAPSHOT + 6.4.0-SNAPSHOT 7.1.0 4.2.0 3.1.1 @@ -48,7 +48,7 @@ org.fcrepo fcrepo-storage-ocfl - 6.3.0 + ${fcrepo-storage-ocfl.version} ch.qos.logback diff --git a/src/main/java/org/fcrepo/migration/OcflSessionFactoryFactoryBean.java b/src/main/java/org/fcrepo/migration/OcflSessionFactoryFactoryBean.java index 8c64bf43..6628db66 100644 --- a/src/main/java/org/fcrepo/migration/OcflSessionFactoryFactoryBean.java +++ b/src/main/java/org/fcrepo/migration/OcflSessionFactoryFactoryBean.java @@ -20,12 +20,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.github.benmanes.caffeine.cache.Caffeine; -import edu.wisc.library.ocfl.api.OcflConfig; -import edu.wisc.library.ocfl.api.model.DigestAlgorithm; -import edu.wisc.library.ocfl.core.OcflRepositoryBuilder; -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.OcflStorageBuilder; +import io.ocfl.api.OcflConfig; +import io.ocfl.api.model.DigestAlgorithm; +import io.ocfl.core.OcflRepositoryBuilder; +import io.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig; +import io.ocfl.core.path.mapper.LogicalPathMappers; +import io.ocfl.core.storage.OcflStorageBuilder; import org.apache.commons.lang3.SystemUtils; import org.fcrepo.migration.handlers.ocfl.PlainOcflObjectSessionFactory; import org.fcrepo.storage.ocfl.CommitType; diff --git a/src/main/java/org/fcrepo/migration/PicocliMigrator.java b/src/main/java/org/fcrepo/migration/PicocliMigrator.java index e793acb8..7d93e37a 100644 --- a/src/main/java/org/fcrepo/migration/PicocliMigrator.java +++ b/src/main/java/org/fcrepo/migration/PicocliMigrator.java @@ -6,8 +6,8 @@ */ package org.fcrepo.migration; -import static edu.wisc.library.ocfl.api.util.Enforce.expressionTrue; -import static edu.wisc.library.ocfl.api.util.Enforce.notNull; +import static io.ocfl.api.util.Enforce.expressionTrue; +import static io.ocfl.api.util.Enforce.notNull; import static org.slf4j.LoggerFactory.getLogger; import static picocli.CommandLine.Help.Visibility.ALWAYS; @@ -33,8 +33,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; -import edu.wisc.library.ocfl.api.DigestAlgorithmRegistry; -import edu.wisc.library.ocfl.api.model.DigestAlgorithm; +import io.ocfl.api.DigestAlgorithmRegistry; +import io.ocfl.api.model.DigestAlgorithm; import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSession.java b/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSession.java index 55c58617..32859116 100644 --- a/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSession.java +++ b/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSession.java @@ -16,13 +16,13 @@ package org.fcrepo.migration.handlers.ocfl; -import edu.wisc.library.ocfl.api.MutableOcflRepository; -import edu.wisc.library.ocfl.api.OcflObjectUpdater; -import edu.wisc.library.ocfl.api.OcflOption; -import edu.wisc.library.ocfl.api.exception.OcflInputException; -import edu.wisc.library.ocfl.api.model.DigestAlgorithm; -import edu.wisc.library.ocfl.api.model.ObjectVersionId; -import edu.wisc.library.ocfl.api.model.VersionInfo; +import io.ocfl.api.MutableOcflRepository; +import io.ocfl.api.OcflObjectUpdater; +import io.ocfl.api.OcflOption; +import io.ocfl.api.exception.OcflInputException; +import io.ocfl.api.model.DigestAlgorithm; +import io.ocfl.api.model.ObjectVersionId; +import io.ocfl.api.model.VersionInfo; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.SystemUtils; import org.fcrepo.storage.ocfl.CommitType; diff --git a/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionFactory.java b/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionFactory.java index 8664e1c9..c15f41e5 100644 --- a/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionFactory.java +++ b/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionFactory.java @@ -16,7 +16,7 @@ package org.fcrepo.migration.handlers.ocfl; -import edu.wisc.library.ocfl.api.MutableOcflRepository; +import io.ocfl.api.MutableOcflRepository; import org.fcrepo.storage.ocfl.OcflObjectSession; import org.fcrepo.storage.ocfl.OcflObjectSessionFactory; import org.slf4j.Logger; diff --git a/src/test/java/org/fcrepo/migration/PicocliIT.java b/src/test/java/org/fcrepo/migration/PicocliIT.java index d1a0abae..c972db61 100644 --- a/src/test/java/org/fcrepo/migration/PicocliIT.java +++ b/src/test/java/org/fcrepo/migration/PicocliIT.java @@ -16,13 +16,13 @@ import java.util.HashMap; import java.util.Map; -import edu.wisc.library.ocfl.api.OcflRepository; -import edu.wisc.library.ocfl.api.model.FileDetails; -import edu.wisc.library.ocfl.api.model.ObjectVersionId; -import edu.wisc.library.ocfl.api.model.VersionDetails; -import edu.wisc.library.ocfl.api.model.VersionInfo; -import edu.wisc.library.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig; -import edu.wisc.library.ocfl.core.storage.OcflStorageBuilder; +import io.ocfl.api.OcflRepository; +import io.ocfl.api.model.FileDetails; +import io.ocfl.api.model.ObjectVersionId; +import io.ocfl.api.model.VersionDetails; +import io.ocfl.api.model.VersionInfo; +import io.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig; +import io.ocfl.core.storage.OcflStorageBuilder; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FileUtils; @@ -34,8 +34,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import edu.wisc.library.ocfl.core.OcflRepositoryBuilder; -import edu.wisc.library.ocfl.core.extension.storage.layout.config.HashedNTupleIdEncapsulationLayoutConfig; +import io.ocfl.core.OcflRepositoryBuilder; +import io.ocfl.core.extension.storage.layout.config.HashedNTupleIdEncapsulationLayoutConfig; import picocli.CommandLine; /** diff --git a/src/test/java/org/fcrepo/migration/handlers/ocfl/ArchiveGroupHandlerTest.java b/src/test/java/org/fcrepo/migration/handlers/ocfl/ArchiveGroupHandlerTest.java index e3ecce30..d84b5832 100644 --- a/src/test/java/org/fcrepo/migration/handlers/ocfl/ArchiveGroupHandlerTest.java +++ b/src/test/java/org/fcrepo/migration/handlers/ocfl/ArchiveGroupHandlerTest.java @@ -3,13 +3,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import edu.wisc.library.ocfl.api.MutableOcflRepository; -import edu.wisc.library.ocfl.api.model.FileDetails; -import edu.wisc.library.ocfl.api.model.ObjectVersionId; -import edu.wisc.library.ocfl.core.OcflRepositoryBuilder; -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.OcflStorageBuilder; +import io.ocfl.api.MutableOcflRepository; +import io.ocfl.api.model.FileDetails; +import io.ocfl.api.model.ObjectVersionId; +import io.ocfl.core.OcflRepositoryBuilder; +import io.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig; +import io.ocfl.core.path.mapper.LogicalPathMappers; +import io.ocfl.core.storage.OcflStorageBuilder; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.SystemUtils; diff --git a/src/test/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionFactoryTest.java b/src/test/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionFactoryTest.java index 469e9224..6fb896b9 100644 --- a/src/test/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionFactoryTest.java +++ b/src/test/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionFactoryTest.java @@ -16,11 +16,11 @@ package org.fcrepo.migration.handlers.ocfl; -import edu.wisc.library.ocfl.api.MutableOcflRepository; -import edu.wisc.library.ocfl.core.OcflRepositoryBuilder; -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.OcflStorageBuilder; +import io.ocfl.api.MutableOcflRepository; +import io.ocfl.core.OcflRepositoryBuilder; +import io.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig; +import io.ocfl.core.path.mapper.LogicalPathMappers; +import io.ocfl.core.storage.OcflStorageBuilder; import org.apache.commons.lang3.SystemUtils; import org.fcrepo.storage.ocfl.OcflObjectSessionFactory; import org.junit.Before; diff --git a/src/test/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionTest.java b/src/test/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionTest.java index 60818726..a193d35c 100644 --- a/src/test/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionTest.java +++ b/src/test/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSessionTest.java @@ -16,12 +16,12 @@ package org.fcrepo.migration.handlers.ocfl; -import edu.wisc.library.ocfl.api.MutableOcflRepository; -import edu.wisc.library.ocfl.api.model.ObjectVersionId; -import edu.wisc.library.ocfl.core.OcflRepositoryBuilder; -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.OcflStorageBuilder; +import io.ocfl.api.MutableOcflRepository; +import io.ocfl.api.model.ObjectVersionId; +import io.ocfl.core.OcflRepositoryBuilder; +import io.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig; +import io.ocfl.core.path.mapper.LogicalPathMappers; +import io.ocfl.core.storage.OcflStorageBuilder; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.SystemUtils; import org.fcrepo.storage.ocfl.InteractionModel; diff --git a/src/test/java/org/fcrepo/migration/pidlist/HeadOnlyIT.java b/src/test/java/org/fcrepo/migration/pidlist/HeadOnlyIT.java index 5f2ebfac..9c17e8c6 100644 --- a/src/test/java/org/fcrepo/migration/pidlist/HeadOnlyIT.java +++ b/src/test/java/org/fcrepo/migration/pidlist/HeadOnlyIT.java @@ -8,14 +8,14 @@ import java.util.stream.Collectors; import javax.xml.stream.XMLStreamException; -import edu.wisc.library.ocfl.api.OcflRepository; -import edu.wisc.library.ocfl.api.model.DigestAlgorithm; -import edu.wisc.library.ocfl.api.model.FileDetails; -import edu.wisc.library.ocfl.api.model.ObjectDetails; -import edu.wisc.library.ocfl.core.OcflRepositoryBuilder; -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.OcflStorageBuilder; +import io.ocfl.api.OcflRepository; +import io.ocfl.api.model.DigestAlgorithm; +import io.ocfl.api.model.FileDetails; +import io.ocfl.api.model.ObjectDetails; +import io.ocfl.core.OcflRepositoryBuilder; +import io.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig; +import io.ocfl.core.path.mapper.LogicalPathMappers; +import io.ocfl.core.storage.OcflStorageBuilder; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.SystemUtils; import org.fcrepo.migration.MigrationType;