Update ocfl-java version and package names (#2081)

Update github actions versions
fcrepo · May 17, 2024 · 92e44fe · 92e44fe
1 parent cb08064
commit 92e44fe
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 43 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,9 +30,9 @@ 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 ${{ matrix.java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
@@ -63,9 +63,9 @@ 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 ${{ matrix.java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
@@ -97,9 +97,9 @@ 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 ${{ matrix.java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
@@ -131,9 +131,9 @@ 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 ${{ matrix.java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
@@ -148,9 +148,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@v2
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 11
@@ -167,7 +167,7 @@ jobs:
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
       - name: Checkout fcrepo-docker
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: fcrepo-exts/fcrepo-docker
           path: fcrepo-docker
@@ -179,4 +179,4 @@ jobs:
           FCREPO_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)
           cd fcrepo-docker
           echo "build and push image to dockerhub"
-          ./build-and-push-to-dockerhub.sh ../fcrepo-webapp/target/fcrepo-webapp-${FCREPO_VERSION}.war latest ${FCREPO_VERSION}
+          ./build-and-push-to-dockerhub.sh ../fcrepo-webapp/target/fcrepo-webapp-${FCREPO_VERSION}.war ${FCREPO_VERSION}
diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFixityIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFixityIT.java
@@ -28,8 +28,8 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-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.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraReindexIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraReindexIT.java
@@ -21,10 +21,10 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.test.context.TestExecutionListeners;
 
-import edu.wisc.library.ocfl.api.OcflOption;
-import edu.wisc.library.ocfl.api.OcflRepository;
-import edu.wisc.library.ocfl.api.model.ObjectVersionId;
-import edu.wisc.library.ocfl.api.model.VersionNum;
+import io.ocfl.api.OcflOption;
+import io.ocfl.api.OcflRepository;
+import io.ocfl.api.model.ObjectVersionId;
+import io.ocfl.api.model.VersionNum;
 
 /**
  * @author dbernstein

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/RebuildIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/RebuildIT.java
@@ -8,11 +8,11 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import edu.wisc.library.ocfl.api.OcflOption;
-import edu.wisc.library.ocfl.api.OcflRepository;
-import edu.wisc.library.ocfl.api.model.ObjectVersionId;
-import edu.wisc.library.ocfl.api.model.VersionInfo;
-import edu.wisc.library.ocfl.api.model.VersionNum;
+import io.ocfl.api.OcflOption;
+import io.ocfl.api.OcflRepository;
+import io.ocfl.api.model.ObjectVersionId;
+import io.ocfl.api.model.VersionInfo;
+import io.ocfl.api.model.VersionNum;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.jena.graph.Node;

diff --git a/...ttp-api/src/test/java/org/fcrepo/integration/http/api/TestIsolationExecutionListener.java b/...ttp-api/src/test/java/org/fcrepo/integration/http/api/TestIsolationExecutionListener.java
@@ -5,7 +5,7 @@
  */
 package org.fcrepo.integration.http.api;
 
-import edu.wisc.library.ocfl.api.MutableOcflRepository;
+import io.ocfl.api.MutableOcflRepository;
 import org.apache.commons.io.FileUtils;
 import org.fcrepo.config.OcflPropsConfig;
 import org.fcrepo.persistence.ocfl.RepositoryInitializer;

diff --git a/fcrepo-persistence-ocfl/pom.xml b/fcrepo-persistence-ocfl/pom.xml
@@ -72,7 +72,7 @@
     </dependency>
 
     <dependency>
-      <groupId>edu.wisc.library.ocfl</groupId>
+      <groupId>io.ocfl</groupId>
       <artifactId>ocfl-java-aws</artifactId>
       <version>${ocfl-java.version}</version>
       <exclusions>

diff --git a/fcrepo-persistence-ocfl/src/main/java/org/fcrepo/persistence/ocfl/impl/IndexBuilderImpl.java b/fcrepo-persistence-ocfl/src/main/java/org/fcrepo/persistence/ocfl/impl/IndexBuilderImpl.java
@@ -5,7 +5,7 @@
  */
 package org.fcrepo.persistence.ocfl.impl;
 
-import edu.wisc.library.ocfl.api.OcflRepository;
+import io.ocfl.api.OcflRepository;
 
 import org.fcrepo.common.db.DbTransactionExecutor;
 import org.fcrepo.config.FedoraPropsConfig;

diff --git a/...ersistence-ocfl/src/main/java/org/fcrepo/persistence/ocfl/impl/OcflPersistenceConfig.java b/...ersistence-ocfl/src/main/java/org/fcrepo/persistence/ocfl/impl/OcflPersistenceConfig.java
@@ -33,7 +33,7 @@
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 
-import edu.wisc.library.ocfl.api.MutableOcflRepository;
+import io.ocfl.api.MutableOcflRepository;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.cache.CaffeineCacheMetrics;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;

diff --git a/...tence-ocfl/src/main/java/org/fcrepo/persistence/ocfl/impl/OcflPersistentStorageUtils.java b/...tence-ocfl/src/main/java/org/fcrepo/persistence/ocfl/impl/OcflPersistentStorageUtils.java
@@ -19,16 +19,16 @@
 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.DigestAlgorithmRegistry;
-import edu.wisc.library.ocfl.api.MutableOcflRepository;
-import edu.wisc.library.ocfl.api.model.DigestAlgorithm;
-import edu.wisc.library.ocfl.api.model.OcflVersion;
-import edu.wisc.library.ocfl.aws.OcflS3Client;
-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.constraint.ContentPathConstraints;
-import edu.wisc.library.ocfl.core.path.mapper.LogicalPathMappers;
-import edu.wisc.library.ocfl.core.storage.OcflStorageBuilder;
+import io.ocfl.api.DigestAlgorithmRegistry;
+import io.ocfl.api.MutableOcflRepository;
+import io.ocfl.api.model.DigestAlgorithm;
+import io.ocfl.api.model.OcflVersion;
+import io.ocfl.aws.OcflS3Client;
+import io.ocfl.core.OcflRepositoryBuilder;
+import io.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig;
+import io.ocfl.core.path.constraint.ContentPathConstraints;
+import io.ocfl.core.path.mapper.LogicalPathMappers;
+import io.ocfl.core.storage.OcflStorageBuilder;
 import org.apache.commons.lang3.SystemUtils;
 import org.apache.http.impl.auth.UnsupportedDigestAlgorithmException;
 import org.apache.jena.riot.RDFFormat;

diff --git a/fcrepo-persistence-ocfl/src/main/java/org/fcrepo/persistence/ocfl/impl/ReindexService.java b/fcrepo-persistence-ocfl/src/main/java/org/fcrepo/persistence/ocfl/impl/ReindexService.java
@@ -22,7 +22,7 @@
 import javax.inject.Inject;
 import javax.validation.constraints.NotNull;
 
-import edu.wisc.library.ocfl.api.OcflRepository;
+import io.ocfl.api.OcflRepository;
 import org.fcrepo.config.FedoraPropsConfig;
 import org.fcrepo.kernel.api.ContainmentIndex;
 import org.fcrepo.kernel.api.RdfLexicon;

diff --git a/...src/test/java/org/fcrepo/integration/persistence/ocfl/impl/DeleteResourcePersisterIT.java b/...src/test/java/org/fcrepo/integration/persistence/ocfl/impl/DeleteResourcePersisterIT.java
@@ -31,8 +31,8 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import edu.wisc.library.ocfl.api.MutableOcflRepository;
-import edu.wisc.library.ocfl.api.model.ObjectVersionId;
+import io.ocfl.api.MutableOcflRepository;
+import io.ocfl.api.model.ObjectVersionId;
 
 /**
  * Test delete resource persister for stamping versions of deleted resources in manually versioned repository.

diff --git a/...ersistence-ocfl/src/test/java/org/fcrepo/persistence/ocfl/impl/AbstractReindexerTest.java b/...ersistence-ocfl/src/test/java/org/fcrepo/persistence/ocfl/impl/AbstractReindexerTest.java
@@ -25,7 +25,7 @@
 import java.nio.file.Paths;
 import java.util.UUID;
 
-import edu.wisc.library.ocfl.api.MutableOcflRepository;
+import io.ocfl.api.MutableOcflRepository;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.ResourceFactory;
 

diff --git a/...o-persistence-ocfl/src/test/java/org/fcrepo/persistence/ocfl/impl/ReindexServiceTest.java b/...o-persistence-ocfl/src/test/java/org/fcrepo/persistence/ocfl/impl/ReindexServiceTest.java
@@ -27,7 +27,7 @@
 import java.util.Random;
 import java.util.UUID;
 
-import edu.wisc.library.ocfl.api.OcflRepository;
+import io.ocfl.api.OcflRepository;
 import org.fcrepo.common.db.DbTransactionExecutor;
 import org.fcrepo.config.FedoraPropsConfig;
 import org.fcrepo.kernel.api.RdfStream;

diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
     <logback.version>1.2.13</logback.version>
     <micrometer.version>1.7.4</micrometer.version>
     <netty.version>4.1.68.Final</netty.version>
-    <ocfl-java.version>1.5.0</ocfl-java.version>
+    <ocfl-java.version>2.0.1</ocfl-java.version>
     <prometheus.version>0.10.0</prometheus.version>
     <reactivestreams.version>1.0.3</reactivestreams.version>
     <shiro.version>1.13.0</shiro.version>