From e80cd73f36c2e8b8715eaddd7cbbbfabb0781b6f Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 11:27:20 -0600
Subject: [PATCH 01/13] Update jackson

---
 pom.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0133518..55704b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <fcrepo.storage.ocfl.version>6.3.0</fcrepo.storage.ocfl.version>
         <ocfl-java.version>1.5.0</ocfl-java.version>
         <gpg.plugin.version>1.6</gpg.plugin.version>
-        <jackson.version>2.11.1</jackson.version>
+        <jackson.version>2.17.1</jackson.version>
         <checkstyle.plugin.version>3.1.1</checkstyle.plugin.version>
         <license.plugin.version>3.0</license.plugin.version>
         <project.java.source>11</project.java.source>
@@ -248,7 +248,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.30</version>
+            <version>2.3.32</version>
         </dependency>
 
         <dependency>
@@ -280,41 +280,41 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.0-jre</version>
+            <version>33.2.1-jre</version>
         </dependency>
 
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
-            <version>4.5.2</version>
+            <version>4.7.6</version>
         </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
+            <version>2.16.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.14</version>
+            <version>1.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>2.0.12</version>
         </dependency>
 
         <!-- Test -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -326,13 +326,13 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.19.0</version>
+            <version>3.26.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.22.0</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From 194d55c1c07c7033b3ad858e619210979ffc59cb Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 12:39:06 -0600
Subject: [PATCH 02/13] Use an updated version of logback-classic

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 55704b4..b5b490b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,6 +309,11 @@
             <artifactId>slf4j-api</artifactId>
             <version>2.0.12</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.5.6</version>
+        </dependency>
 
         <!-- Test -->
         <dependency>

From ff036de09409312b03e96a46f7bff145ae61390e Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 11:48:08 -0600
Subject: [PATCH 03/13] Remove unused test dependencies

---
 pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index b5b490b..d2a4fb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,24 +322,12 @@
             <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <version>3.26.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>5.11.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <distributionManagement>

From 2f74608727abc45592e0adc2ce0ce6597eead062 Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 11:33:16 -0600
Subject: [PATCH 04/13] Update to ocfl 2.1.0

---
 pom.xml                                       |  8 ++---
 .../validator/api/ObjectValidationConfig.java |  2 +-
 .../validator/api/RepositoryValidator.java    |  2 +-
 .../validator/api/ValidationHandler.java      |  2 +-
 .../impl/ApplicationConfigurationHelper.java  | 33 ++++++++++---------
 .../validator/impl/F3RepositoryValidator.java |  2 +-
 .../validator/impl/F6DigestAlgorithm.java     |  2 +-
 .../impl/HeadOnlyValidationHandler.java       |  4 +--
 .../impl/ValidatingObjectHandler.java         |  4 +--
 .../validator/ReportGeneratorIT.java          |  2 +-
 10 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2a4fb8..b664920 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <fcrepo-build-tools.version>6.0.0</fcrepo-build-tools.version>
-        <fcrepo-migration-utils.version>6.3.0</fcrepo-migration-utils.version>
-        <fcrepo.storage.ocfl.version>6.3.0</fcrepo.storage.ocfl.version>
-        <ocfl-java.version>1.5.0</ocfl-java.version>
+        <fcrepo-migration-utils.version>6.6.0-SNAPSHOT</fcrepo-migration-utils.version>
+        <fcrepo.storage.ocfl.version>6.4.0-SNAPSHOT</fcrepo.storage.ocfl.version>
+        <ocfl-java.version>2.1.0</ocfl-java.version>
         <gpg.plugin.version>1.6</gpg.plugin.version>
         <jackson.version>2.17.1</jackson.version>
         <checkstyle.plugin.version>3.1.1</checkstyle.plugin.version>
@@ -223,7 +223,7 @@
         </dependency>
 
         <dependency>
-            <groupId>edu.wisc.library.ocfl</groupId>
+            <groupId>io.ocfl</groupId>
             <artifactId>ocfl-java-aws</artifactId>
             <version>${ocfl-java.version}</version>
             <!--
diff --git a/src/main/java/org/fcrepo/migration/validator/api/ObjectValidationConfig.java b/src/main/java/org/fcrepo/migration/validator/api/ObjectValidationConfig.java
index 78947a8..e28615c 100644
--- a/src/main/java/org/fcrepo/migration/validator/api/ObjectValidationConfig.java
+++ b/src/main/java/org/fcrepo/migration/validator/api/ObjectValidationConfig.java
@@ -8,7 +8,7 @@
 import java.io.File;
 import java.nio.file.Path;
 
-import edu.wisc.library.ocfl.api.OcflRepository;
+import io.ocfl.api.OcflRepository;
 import org.fcrepo.migration.validator.impl.F6DigestAlgorithm;
 
 /**
diff --git a/src/main/java/org/fcrepo/migration/validator/api/RepositoryValidator.java b/src/main/java/org/fcrepo/migration/validator/api/RepositoryValidator.java
index 8b47ce2..3d28fff 100644
--- a/src/main/java/org/fcrepo/migration/validator/api/RepositoryValidator.java
+++ b/src/main/java/org/fcrepo/migration/validator/api/RepositoryValidator.java
@@ -5,7 +5,7 @@
  */
 package org.fcrepo.migration.validator.api;
 
-import edu.wisc.library.ocfl.api.OcflRepository;
+import io.ocfl.api.OcflRepository;
 
 /**
  * An interface for performing validations across the repository.
diff --git a/src/main/java/org/fcrepo/migration/validator/api/ValidationHandler.java b/src/main/java/org/fcrepo/migration/validator/api/ValidationHandler.java
index 13d96c0..e02b813 100644
--- a/src/main/java/org/fcrepo/migration/validator/api/ValidationHandler.java
+++ b/src/main/java/org/fcrepo/migration/validator/api/ValidationHandler.java
@@ -29,7 +29,7 @@
 import com.google.common.hash.Funnels;
 import com.google.common.hash.HashCode;
 import com.google.common.io.ByteStreams;
-import edu.wisc.library.ocfl.api.model.OcflObjectVersion;
+import io.ocfl.api.model.OcflObjectVersion;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.RDFNode;
diff --git a/src/main/java/org/fcrepo/migration/validator/impl/ApplicationConfigurationHelper.java b/src/main/java/org/fcrepo/migration/validator/impl/ApplicationConfigurationHelper.java
index 0057e40..abd5ad7 100644
--- a/src/main/java/org/fcrepo/migration/validator/impl/ApplicationConfigurationHelper.java
+++ b/src/main/java/org/fcrepo/migration/validator/impl/ApplicationConfigurationHelper.java
@@ -10,12 +10,12 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.base.Suppliers;
-import edu.wisc.library.ocfl.api.MutableOcflRepository;
-import edu.wisc.library.ocfl.api.OcflRepository;
-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.OcflRepository;
+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.ObjectSource;
 import org.fcrepo.migration.foxml.AkubraFSIDResolver;
@@ -40,8 +40,8 @@
 import java.util.function.Supplier;
 
 import static com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS;
-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;
 
 /**
  * A helper class for configuring and creating application components.
@@ -124,16 +124,17 @@ private ObjectSource doObjectSource() throws IOException {
 
     private MutableOcflRepository repository(final Fedora3ValidationConfig config, final Path workDir) {
         final var storage = OcflStorageBuilder.builder()
-                .fileSystem(config.getOcflRepositoryRootDirectory().toPath())
-                .build();
+                                              .fileSystem(config.getOcflRepositoryRootDirectory().toPath())
+                                              .build();
         final var logicalPathMapper = SystemUtils.IS_OS_WINDOWS ?
-                LogicalPathMappers.percentEncodingWindowsMapper() : LogicalPathMappers.percentEncodingLinuxMapper();
+                                      LogicalPathMappers.percentEncodingWindowsMapper() :
+                                      LogicalPathMappers.percentEncodingLinuxMapper();
 
         return new OcflRepositoryBuilder().storage(storage)
-                .defaultLayoutConfig(new HashedNTupleLayoutConfig())
-                .logicalPathMapper(logicalPathMapper)
-                .workDir(workDir)
-                .buildMutable();
+                                          .defaultLayoutConfig(new HashedNTupleLayoutConfig())
+                                          .logicalPathMapper(logicalPathMapper)
+                                          .workDir(workDir)
+                                          .buildMutable();
     }
 
     /**
@@ -164,7 +165,7 @@ public OcflObjectSessionFactory ocflObjectSessionFactory() {
                 .maximumSize(512)
                 .expireAfterAccess(Duration.ofMinutes(10))
                 .build();
-        // https://jira.lyrasis.org/browse/FCREPO-3632:
+
         return new DefaultOcflObjectSessionFactory(repositorySupplier.get(),
                 workDirectory,
                 objectMapper,
diff --git a/src/main/java/org/fcrepo/migration/validator/impl/F3RepositoryValidator.java b/src/main/java/org/fcrepo/migration/validator/impl/F3RepositoryValidator.java
index 13686bd..6023646 100644
--- a/src/main/java/org/fcrepo/migration/validator/impl/F3RepositoryValidator.java
+++ b/src/main/java/org/fcrepo/migration/validator/impl/F3RepositoryValidator.java
@@ -15,7 +15,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
-import edu.wisc.library.ocfl.api.OcflRepository;
+import io.ocfl.api.OcflRepository;
 import org.fcrepo.migration.FedoraObjectProcessor;
 import org.fcrepo.migration.ObjectSource;
 import org.fcrepo.migration.validator.api.RepositoryValidator;
diff --git a/src/main/java/org/fcrepo/migration/validator/impl/F6DigestAlgorithm.java b/src/main/java/org/fcrepo/migration/validator/impl/F6DigestAlgorithm.java
index 79bc9c1..263122e 100644
--- a/src/main/java/org/fcrepo/migration/validator/impl/F6DigestAlgorithm.java
+++ b/src/main/java/org/fcrepo/migration/validator/impl/F6DigestAlgorithm.java
@@ -8,7 +8,7 @@
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
-import edu.wisc.library.ocfl.api.model.DigestAlgorithm;
+import io.ocfl.api.model.DigestAlgorithm;
 
 /**
  * Supported digest algorithms for ocfl
diff --git a/src/main/java/org/fcrepo/migration/validator/impl/HeadOnlyValidationHandler.java b/src/main/java/org/fcrepo/migration/validator/impl/HeadOnlyValidationHandler.java
index 2a8ea00..53ef76d 100644
--- a/src/main/java/org/fcrepo/migration/validator/impl/HeadOnlyValidationHandler.java
+++ b/src/main/java/org/fcrepo/migration/validator/impl/HeadOnlyValidationHandler.java
@@ -18,8 +18,8 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import edu.wisc.library.ocfl.api.OcflRepository;
-import edu.wisc.library.ocfl.api.model.ObjectVersionId;
+import io.ocfl.api.OcflRepository;
+import io.ocfl.api.model.ObjectVersionId;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.riot.RDFDataMgr;
 import org.apache.jena.riot.RDFFormat;
diff --git a/src/main/java/org/fcrepo/migration/validator/impl/ValidatingObjectHandler.java b/src/main/java/org/fcrepo/migration/validator/impl/ValidatingObjectHandler.java
index 3062cfa..d0de169 100644
--- a/src/main/java/org/fcrepo/migration/validator/impl/ValidatingObjectHandler.java
+++ b/src/main/java/org/fcrepo/migration/validator/impl/ValidatingObjectHandler.java
@@ -30,8 +30,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.google.common.collect.Sets;
-import edu.wisc.library.ocfl.api.OcflRepository;
-import edu.wisc.library.ocfl.api.model.ObjectVersionId;
+import io.ocfl.api.OcflRepository;
+import io.ocfl.api.model.ObjectVersionId;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.riot.RDFDataMgr;
 import org.apache.jena.riot.RDFFormat;
diff --git a/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java b/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java
index 11e3a10..3d24954 100644
--- a/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java
+++ b/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java
@@ -18,7 +18,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import edu.wisc.library.ocfl.api.OcflRepository;
+import io.ocfl.api.OcflRepository;
 import org.fcrepo.migration.validator.impl.ApplicationConfigurationHelper;
 import org.fcrepo.migration.validator.impl.Fedora3ValidationExecutionManager;
 import org.fcrepo.migration.validator.report.CsvReportHandler;

From c720be37cf5fd5f5f558273394c2e0f9c0c9a1ff Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 11:52:43 -0600
Subject: [PATCH 05/13] Update version display

---
 src/main/java/org/fcrepo/migration/validator/Driver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/fcrepo/migration/validator/Driver.java b/src/main/java/org/fcrepo/migration/validator/Driver.java
index f5e61c0..23c09b4 100644
--- a/src/main/java/org/fcrepo/migration/validator/Driver.java
+++ b/src/main/java/org/fcrepo/migration/validator/Driver.java
@@ -34,7 +34,7 @@
  * @author dbernstein
  */
 @CommandLine.Command(name = "fcrepo-migration-validator", mixinStandardHelpOptions = true, sortOptions = false,
-        version = "0.1.0-SNAPSHOT")
+        version = "Fedora Migration Validator 1.3.0")
 public class Driver implements Callable<Integer> {
 
     private static final Logger LOGGER = getLogger(Driver.class);

From 524666a657724fea0fb4ba608f7be6b11b552742 Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 12:45:30 -0600
Subject: [PATCH 06/13] Update github actions to be in line with fcrepo

---
 .github/workflows/build.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d2f45aa..f75e9b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,21 +17,23 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
+        java: ['11']
+        experimental: [false]
+        include:
+          - java: 17
+            os: ubuntu-latest
+            experimental: true
     steps:
     - name: Git support longpaths
       run: git config --global core.longpaths true
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/checkout@v4
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
-    - name: Cache Maven packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+        cache: 'maven'
     - name: Build with Maven
       run: mvn -B -U clean install
 
@@ -43,10 +45,11 @@ jobs:
       - name: Git support longpaths
         run: git config --global core.longpaths true
       - name: Checkout fcrepo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: 11
           server-id: sonatype-nexus-snapshots
           server-username: MAVEN_USERNAME

From fd1853c71832e7dff167df83d50c5f120de869cb Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 13:43:50 -0600
Subject: [PATCH 07/13] Add windows to the build matrix

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f75e9b0..057aff1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
         java: ['11']
         experimental: [false]
         include:

From 79d468951f7aee4fd915650971758c6a945ca31e Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 13:47:35 -0600
Subject: [PATCH 08/13] Encode object ids to allow ids with colons on windows

---
 .../validator/api/ObjectValidationResults.java  | 17 +++++++++++++++++
 .../impl/FileSystemValidationResultWriter.java  | 10 ++++++++--
 .../validator/impl/ValidationResultUtils.java   | 11 ++++++-----
 .../validator/report/CsvReportHandler.java      |  2 +-
 .../validator/report/HtmlReportHandler.java     |  2 +-
 .../migration/validator/ReportGeneratorIT.java  |  3 +++
 6 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/fcrepo/migration/validator/api/ObjectValidationResults.java b/src/main/java/org/fcrepo/migration/validator/api/ObjectValidationResults.java
index ff004ae..2204b53 100644
--- a/src/main/java/org/fcrepo/migration/validator/api/ObjectValidationResults.java
+++ b/src/main/java/org/fcrepo/migration/validator/api/ObjectValidationResults.java
@@ -5,6 +5,8 @@
  */
 package org.fcrepo.migration.validator.api;
 
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,6 +44,21 @@ public String getObjectId() {
         return results.stream().findFirst().map(ValidationResult::getSourceObjectId).orElse("unknown");
     }
 
+    /**
+     * This method returns an encoded version of the object id for use as a filesystem path
+     * @return the encoded object-id
+     */
+    public String getEncodedObjectId() {
+        if (results == null || results.isEmpty()) {
+            return "unknown";
+        }
+
+        return results.stream().findFirst()
+                      .map(ValidationResult::getSourceObjectId)
+                      .map(objectId -> URLEncoder.encode(objectId, Charset.defaultCharset()))
+                      .orElse("unknown");
+    }
+
     /**
      * This method indicates if the result set has any errors
      * @return true if there are validation errors
diff --git a/src/main/java/org/fcrepo/migration/validator/impl/FileSystemValidationResultWriter.java b/src/main/java/org/fcrepo/migration/validator/impl/FileSystemValidationResultWriter.java
index 1435e84..c5531ee 100644
--- a/src/main/java/org/fcrepo/migration/validator/impl/FileSystemValidationResultWriter.java
+++ b/src/main/java/org/fcrepo/migration/validator/impl/FileSystemValidationResultWriter.java
@@ -12,8 +12,11 @@
 
 import java.io.FileWriter;
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.function.UnaryOperator;
 
 import static org.fcrepo.migration.validator.api.ValidationResult.Status.OK;
 import static org.fcrepo.migration.validator.impl.ValidationResultUtils.resolvePathToJsonResult;
@@ -30,6 +33,7 @@ public class FileSystemValidationResultWriter implements ValidationResultWriter
 
     private final Path validationRoot;
     private final boolean writeFailureOnly;
+    private final UnaryOperator<String> pathEncoder;
 
     /**
      * Constructor
@@ -41,6 +45,8 @@ public FileSystemValidationResultWriter(final Path validationRoot, final boolean
         this.validationRoot = validationRoot;
         this.writeFailureOnly = writeFailureOnly;
         validationRoot.toFile().mkdirs();
+
+        pathEncoder = original -> URLEncoder.encode(original, Charset.defaultCharset());
     }
 
     @Override
@@ -51,8 +57,8 @@ public void write(final List<ValidationResult> results) {
                 continue;
             }
 
-            LOGGER.debug("Writing of results here: {}", result);
-            final var jsonFilePath = this.validationRoot.resolve(resolvePathToJsonResult(result));
+            final var jsonFilePath = this.validationRoot.resolve(resolvePathToJsonResult(result, pathEncoder));
+            LOGGER.debug("Writing of results here: {}", jsonFilePath);
             final var file = jsonFilePath.toFile();
             file.getParentFile().mkdirs();
             try (final var writer = new FileWriter(file)) {
diff --git a/src/main/java/org/fcrepo/migration/validator/impl/ValidationResultUtils.java b/src/main/java/org/fcrepo/migration/validator/impl/ValidationResultUtils.java
index 61f19f2..2e52a19 100644
--- a/src/main/java/org/fcrepo/migration/validator/impl/ValidationResultUtils.java
+++ b/src/main/java/org/fcrepo/migration/validator/impl/ValidationResultUtils.java
@@ -11,6 +11,7 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.function.UnaryOperator;
 
 /**
  * A utility class
@@ -26,20 +27,20 @@ private ValidationResultUtils() {
      * Resolves the relative (i.e. to the validation output directory) path
      * of the json file associated with the validation result.
      *
-     * @param result The result
+     * @param result      The result
+     * @param pathEncoder The encoder for the objectId
      * @return The file path
      */
-    public static Path resolvePathToJsonResult(final ValidationResult result) {
+    public static Path resolvePathToJsonResult(final ValidationResult result,
+                                               final UnaryOperator<String> pathEncoder) {
         final var pathSegments = new ArrayList<String>();
         final var sourceId = result.getSourceObjectId();
         if (sourceId != null) {
             final var segments = Splitter.fixedLength(4).splitToList(DigestUtils.sha1Hex(sourceId)).subList(0, 4);
             pathSegments.addAll(segments);
-            pathSegments.add(sourceId);
+            pathSegments.add(pathEncoder.apply(sourceId));
         }
         pathSegments.add("result-" + result.getIndex() + ".json");
         return Path.of(String.join(File.separator, pathSegments));
-
-
     }
 }
diff --git a/src/main/java/org/fcrepo/migration/validator/report/CsvReportHandler.java b/src/main/java/org/fcrepo/migration/validator/report/CsvReportHandler.java
index 62c96cd..03634c9 100644
--- a/src/main/java/org/fcrepo/migration/validator/report/CsvReportHandler.java
+++ b/src/main/java/org/fcrepo/migration/validator/report/CsvReportHandler.java
@@ -61,7 +61,7 @@ public void beginReport() {
 
     @Override
     public String objectLevelReport(final ObjectValidationResults objectValidationResults) {
-        final var csvFile = outputDir.resolve(objectValidationResults.getObjectId() + reportType.getExtension());
+        final var csvFile = outputDir.resolve(objectValidationResults.getEncodedObjectId() + reportType.getExtension());
         return writeValidationResults(csvFile, objectValidationResults);
     }
 
diff --git a/src/main/java/org/fcrepo/migration/validator/report/HtmlReportHandler.java b/src/main/java/org/fcrepo/migration/validator/report/HtmlReportHandler.java
index ec2928e..3d400d5 100644
--- a/src/main/java/org/fcrepo/migration/validator/report/HtmlReportHandler.java
+++ b/src/main/java/org/fcrepo/migration/validator/report/HtmlReportHandler.java
@@ -78,7 +78,7 @@ public void beginReport() {
      */
     @Override
     public String objectLevelReport(final ObjectValidationResults objectValidationResults) {
-        final var id = objectValidationResults.getObjectId();
+        final var id = objectValidationResults.getEncodedObjectId();
         final var filename = id + ".html";
         final var success = objectValidationResults.getPassed();
         final var errors = objectValidationResults.getErrors();
diff --git a/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java b/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java
index 3d24954..ea1bed8 100644
--- a/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java
+++ b/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java
@@ -9,6 +9,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -113,6 +115,7 @@ public void testOnlyWriteFailureAllPass() throws IOException {
     public List<String> getExpectedObjectReports(final OcflRepository repository, final ReportType reportType) {
         return repository.listObjectIds()
                          .map(objectId -> objectId.substring("info:fedora/".length()))
+                         .map(objectId -> URLEncoder.encode(objectId, Charset.defaultCharset()))
                          .map(objectId -> objectId + reportType.getExtension())
                          .collect(Collectors.toList());
     }

From 79acfbf71705cddbde6898df880013fba3188275 Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 13:47:58 -0600
Subject: [PATCH 09/13] Close the stream when getting object reports

---
 .../fcrepo/migration/validator/ReportGeneratorIT.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java b/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java
index ea1bed8..5185808 100644
--- a/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java
+++ b/src/test/java/org/fcrepo/migration/validator/ReportGeneratorIT.java
@@ -121,10 +121,11 @@ public List<String> getExpectedObjectReports(final OcflRepository repository, fi
     }
 
     public List<String> getObjectReports(final Path reportDir, final Predicate<String> filter) throws IOException {
-        return Files.list(reportDir)
-                    .map(Path::getFileName)
-                    .map(Path::toString)
-                    .filter(filter)
-                    .collect(Collectors.toList());
+        try (var reports = Files.list(reportDir)) {
+            return reports.map(Path::getFileName)
+                .map(Path::toString)
+                .filter(filter)
+                .collect(Collectors.toList());
+        }
     }
 }

From 1fc6e6160e04a4aa25294131f9f6644771b6fdc1 Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Mon, 17 Jun 2024 14:30:02 -0600
Subject: [PATCH 10/13] Add gitattributes

---
 .gitattributes | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..09023ca
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+* text
+*.json text
+*.java text diff=java
+
+# Keep the line endings for some test files by setting to binary
+# This is to allow tests to pass in windows and *nix
+*.0 binary
+ADMINMD binary
+BIB0 binary
+props binary
+TECH0 binary
+TECH1 binary
+
+# Images
+*REF binary
+*THUMB binary
+*MASTER0 binary
+
+# Fedora 6
+*.nt eol=lf
+*.json eol=lf
+*.sha512 eol=lf

From 1df4f4f307b6ec2a4e50180e6f5e0dce4850dde6 Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Wed, 19 Jun 2024 14:10:22 -0600
Subject: [PATCH 11/13] Use correct class

---
 .../migration/validator/impl/ValidatingObjectHandler.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/fcrepo/migration/validator/impl/ValidatingObjectHandler.java b/src/main/java/org/fcrepo/migration/validator/impl/ValidatingObjectHandler.java
index d0de169..5e99cfa 100644
--- a/src/main/java/org/fcrepo/migration/validator/impl/ValidatingObjectHandler.java
+++ b/src/main/java/org/fcrepo/migration/validator/impl/ValidatingObjectHandler.java
@@ -55,7 +55,7 @@
  * @author dbernstein
  */
 public class ValidatingObjectHandler implements ValidationHandler {
-    private static final Logger LOGGER = getLogger(Fedora3ObjectValidator.class);
+    private static final Logger LOGGER = getLogger(ValidatingObjectHandler.class);
 
     private F3State objectState;
     private ObjectInfo objectInfo;

From d48ad1735bacfa7c7311af607ba93f0df0d48229 Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Wed, 19 Jun 2024 14:10:33 -0600
Subject: [PATCH 12/13] Minor styling/formatting tweaks

---
 .../fcrepo/migration/validator/api/ValidationTask.java    | 2 +-
 .../migration/validator/impl/ResumeManagerImpl.java       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/fcrepo/migration/validator/api/ValidationTask.java b/src/main/java/org/fcrepo/migration/validator/api/ValidationTask.java
index beb72e0..a19342a 100644
--- a/src/main/java/org/fcrepo/migration/validator/api/ValidationTask.java
+++ b/src/main/java/org/fcrepo/migration/validator/api/ValidationTask.java
@@ -15,5 +15,5 @@
  */
 public abstract class ValidationTask implements Supplier<ValidationTask> {
 
-    abstract public Optional<String> getPid();
+    public abstract Optional<String> getPid();
 }
diff --git a/src/main/java/org/fcrepo/migration/validator/impl/ResumeManagerImpl.java b/src/main/java/org/fcrepo/migration/validator/impl/ResumeManagerImpl.java
index e8d2014..d1d9b86 100644
--- a/src/main/java/org/fcrepo/migration/validator/impl/ResumeManagerImpl.java
+++ b/src/main/java/org/fcrepo/migration/validator/impl/ResumeManagerImpl.java
@@ -24,7 +24,7 @@
  */
 public class ResumeManagerImpl implements ResumeManager {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(ResumeManagerImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResumeManagerImpl.class);
 
     private final boolean acceptAll;
     private final Path resumeFile;
@@ -69,14 +69,14 @@ public void completed(final String pid) {
     }
 
     public boolean accept(final String pid) {
-        final String logMsg = "PID: " + pid + ", accept? ";
+        final String logMsg = "PID: {}, accept? {}";
 
         if (!acceptAll && processedPids.contains(pid)) {
-            LOGGER.debug(logMsg + false);
+            LOGGER.debug(logMsg, pid, false);
             return false;
         }
 
-        LOGGER.debug(logMsg + true);
+        LOGGER.debug(logMsg, pid, true);
         return true;
     }
 

From 9d7919b5c07cb45bc1fed18c82285ee6e0a97132 Mon Sep 17 00:00:00 2001
From: Michael Ritter <emericaskate15@gmail.com>
Date: Wed, 19 Jun 2024 14:14:18 -0600
Subject: [PATCH 13/13] Minor updates to assertions

---
 src/test/java/org/fcrepo/migration/validator/HeadOnlyIT.java  | 4 ++--
 .../org/fcrepo/migration/validator/ObjectValidationIT.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/fcrepo/migration/validator/HeadOnlyIT.java b/src/test/java/org/fcrepo/migration/validator/HeadOnlyIT.java
index 7e9583d..5c41106 100644
--- a/src/test/java/org/fcrepo/migration/validator/HeadOnlyIT.java
+++ b/src/test/java/org/fcrepo/migration/validator/HeadOnlyIT.java
@@ -48,7 +48,7 @@ public void validateHeadOnly() {
                                              .filter(result -> result.getValidationType() == BINARY_METADATA)
                                              .map(ValidationResult::getDetails)
                                              .collect(Collectors.toList());
-        assertThat(validations).allMatch(details -> details.contains("HEAD"));
+        assertThat(validations).isNotEmpty().allMatch(details -> details.contains("HEAD"));
     }
 
     @Test
@@ -107,7 +107,7 @@ public void testObjectNotMigrated() {
         config.setValidateHeadOnly(true);
 
         final var reportHandler = doValidation(config);
-        Assertions.assertThat(reportHandler.getErrors()).hasSize(0);
+        Assertions.assertThat(reportHandler.getErrors()).isEmpty();
     }
 
     @Test
diff --git a/src/test/java/org/fcrepo/migration/validator/ObjectValidationIT.java b/src/test/java/org/fcrepo/migration/validator/ObjectValidationIT.java
index 0f68c40..cb3238f 100644
--- a/src/test/java/org/fcrepo/migration/validator/ObjectValidationIT.java
+++ b/src/test/java/org/fcrepo/migration/validator/ObjectValidationIT.java
@@ -142,7 +142,7 @@ public void testResultWriterException() {
         final var executionManager = new Fedora3ValidationExecutionManager(configHelper);
         final var completedRun = executionManager.doValidation();
 
-        assertThat(completedRun).isEqualTo(false);
+        assertThat(completedRun).isFalse();
     }
 
 }
\ No newline at end of file