Merge pull request #10186 from IQSS/75_google_cloud_protobuf

bump google.library.version to 26.30.0
IQSS · Jan 30, 2024 · 97508e6 · 97508e6
2 parents f16c4a1 + 2eeda3d
commit 97508e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml
@@ -40,8 +40,8 @@
             </dependency>
             <dependency>
                 <groupId>com.google.cloud</groupId>
-                <artifactId>google-cloud-bom</artifactId>
-                <version>${google.cloud.version}</version>
+                <artifactId>libraries-bom</artifactId>
+                <version>${google.library.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -152,7 +152,7 @@
         <postgresql.version>42.6.0</postgresql.version>
         <solr.version>9.3.0</solr.version>
         <aws.version>1.12.290</aws.version>
-        <google.cloud.version>0.177.0</google.cloud.version>
+        <google.library.version>26.30.0</google.library.version>
 
         <!-- Basic libs, logging -->
         <jakartaee-api.version>8.0.0</jakartaee-api.version>

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SwordIT.java
@@ -855,7 +855,7 @@ public void testDeleteFiles() {
         List<String> oneFileLeftInV2Draft = statement3.getBody().xmlPath().getList("feed.entry.id");
         logger.info("Number of files remaining in this post version 1 draft:" + oneFileLeftInV2Draft.size());
         assertEquals(1, oneFileLeftInV2Draft.size());
-
+        UtilIT.sleepForLock(datasetPersistentId, "EditInProgress", apiToken, UtilIT.MAXIMUM_PUBLISH_LOCK_DURATION);
         Response deleteIndex1b = UtilIT.deleteFile(Integer.parseInt(index1b), apiToken);
         deleteIndex1b.then().assertThat()
                 .statusCode(NO_CONTENT.getStatusCode());