Merge branch 'develop' into 11367-6.7-release-notes #11367

pdurbin · pdurbin · commit b2e9a11f2ad7 · 2025-07-15T10:26:17.000-04:00
diff --git a/doc/release-notes/11608-rclone.md b/doc/release-notes/11608-rclone.md
@@ -0,0 +1,3 @@
+### Rclone Support
+
+Rclone ("rsync for cloud storage") is a command-line program to sync files and directories to and from different cloud storage providers. As of version 1.70 Rclone supports Dataverse. See [the announcement](https://groups.google.com/g/dataverse-community/c/IoxF85arJhA/m/QFD6vP-bBQAJ), [the guides](https://dataverse-guide--11609.org.readthedocs.build/en/11609/admin/integrations.html#rclone), #11608, and #11609.
diff --git a/doc/sphinx-guides/source/admin/integrations.rst b/doc/sphinx-guides/source/admin/integrations.rst
@@ -213,6 +213,13 @@ It is a lightweight client-side web application built using React and relying on
 What kind of user is the feature intended for?
 The feature is intended for researchers, scientists and data analyst who are working with Dataverse instances and JupyterHub looking to ease the data transfer process. See `presentation <https://harvard.zoom.us/rec/share/0RpoN_a7HPXF9jpBovtvxVgcaEbqrv5ZBSIKISVemdZjswGxOzbalQYpjebCbLA1.y2ZjRXYxhq8C_SU7>`_ for details.
 
+Rclone
+++++++
+
+`Rclone <https://rclone.org>`_ ("rsync for cloud storage") is a command-line program to sync files and directories to and from different cloud storage providers.
+
+Rclone v1.70+ supports listing and downloading files from Dataverse datasets. For details, consult the Rclone `DOI remote <https://rclone.org/doi/>`_ documentation and the `discussion <https://groups.google.com/g/dataverse-community/c/IoxF85arJhA/m/QFD6vP-bBQAJ>`_ on the Dataverse mailing list.
+
 .. _integrations-discovery:
 
 Discoverability
diff --git a/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.jar b/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.jar
diff --git a/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai-common/5.3.2.1-local/xoai-common-5.3.2.1-local.pom
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>xoai</artifactId>
         <groupId>io.gdcc</groupId>
-        <version>5.3.2-local</version>
+        <version>5.3.2.1-local</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.jar b/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.jar
diff --git a/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai-data-provider/5.3.2.1-local/xoai-data-provider-5.3.2.1-local.pom
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>xoai</artifactId>
         <groupId>io.gdcc</groupId>
-        <version>5.3.2-local</version>
+        <version>5.3.2.1-local</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.jar b/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.jar
diff --git a/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai-service-provider/5.3.2.1-local/xoai-service-provider-5.3.2.1-local.pom
@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.gdcc</groupId>
         <artifactId>xoai</artifactId>
-        <version>5.3.2-local</version>
+        <version>5.3.2.1-local</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.jar b/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.jar
diff --git a/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai-xmlio/5.3.2.1-local/xoai-xmlio-5.3.2.1-local.pom
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.gdcc</groupId>
         <artifactId>xoai</artifactId>
-        <version>5.3.2-local</version>
+        <version>5.3.2.1-local</version>
     </parent>
 
     <artifactId>xoai-xmlio</artifactId>
diff --git a/local_lib/io/gdcc/xoai/5.3.2.1-local/xoai-5.3.2.1-local.pom b/local_lib/io/gdcc/xoai/5.3.2.1-local/xoai-5.3.2.1-local.pom
@@ -26,7 +26,7 @@
     </modules>
 
     <artifactId>xoai</artifactId>
-    <version>5.3.2-local</version>
+    <version>5.3.2.1-local</version>
 
     <name>XOAI : OAI-PMH Java Toolkit</name>
     <!--<url>https://github.com/gdcc/xoai</url>-->
diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml
@@ -166,7 +166,7 @@
         
         <!-- NEW gdcc XOAI library implementation -->
         <!--gdcc.xoai.version>5.2.0</gdcc.xoai.version -->
-        <gdcc.xoai.version>5.3.2-local</gdcc.xoai.version>
+        <gdcc.xoai.version>5.3.2.1-local</gdcc.xoai.version>
     
         <!-- Testing dependencies -->
         <testcontainers.version>1.19.7</testcontainers.version>
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvesterServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvesterServiceBean.java
@@ -319,7 +319,7 @@ private void harvestOAIviaListRecords(OaiHandler oaiHandler, DataverseRequest da
             MutableBoolean getRecordErrorOccurred = new MutableBoolean(false);
             
             Metadata oaiMetadata = oaiRecord.getMetadata();
-            String metadataString = oaiMetadata.getMetadataAsString();
+            String metadataString = oaiMetadata.asUnparsedString();
 
             Long datasetId = null; 
             
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/cache/CacheFactoryBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/util/cache/CacheFactoryBeanTest.java
@@ -121,6 +121,7 @@ public static void cleanup() {
         Hazelcast.shutdownAll();
     }
     @Test
+    @ResourceLock(value = "cache")
     public void testGuestUserGettingRateLimited() {
         Command action = new ListDataverseContentCommand(null,null);
         boolean rateLimited = false;
@@ -137,6 +138,7 @@ public void testGuestUserGettingRateLimited() {
     }
 
     @Test
+    @ResourceLock(value = "cache")
     public void testAdminUserExemptFromGettingRateLimited() {
         Command action = new ListExplicitGroupsCommand(null,null);
         authUser.setSuperuser(true);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+### Rclone Support`
	`2`	`+`
	`3`	`+Rclone ("rsync for cloud storage") is a command-line program to sync files and directories to and from different cloud storage providers. As of version 1.70 Rclone supports Dataverse. See [the announcement](https://groups.google.com/g/dataverse-community/c/IoxF85arJhA/m/QFD6vP-bBQAJ), [the guides](https://dataverse-guide--11609.org.readthedocs.build/en/11609/admin/integrations.html#rclone), #11608, and #11609.`