Merge branch 'develop' into 9810-unf6 #9810

doc/release-notes/9260-solr930.md

@@ -11,7 +11,7 @@ We assume that you already have a user called "solr" (from the instructions abov
    ```
    su - solr
    cd /usr/local/solr
-   wget https://archive.apache.org/dist/lucene/solr/9.3.0/solr-9.3.0.tgz
+   wget https://archive.apache.org/dist/solr/solr/9.3.0/solr-9.3.0.tgz
    tar xvzf solr-9.3.0.tgz
    cd solr-9.3.0
    cp -r server/solr/configsets/_default server/solr/collection1
@@ -25,6 +25,10 @@ We assume that you already have a user called "solr" (from the instructions abov
    cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-9.3.0/server/solr/collection1/conf
    ```
 
+1. A Dataverse installation requires a change to the jetty.xml file that ships with Solr.
+
+   Edit /usr/local/solr/solr-9.3.0/server/etc/jetty.xml , increasing `requestHeaderSize` from `8192` to `102400`
+
 1. Tell Solr to create the core "collection1" on startup.
 
    ```

pom.xml

@@ -169,7 +169,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
+            <version>32.1.2-jre</version>
             <type>jar</type>
         </dependency>
 

src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java

@@ -734,6 +734,13 @@ public void testMigrateHDLToDOI() {
                 .statusCode(OK.getStatusCode());
     }
 
+    /**
+     * Disabled because once there are new fields in the database that Solr
+     * doesn't know about, dataset creation could be prevented, or at least
+     * subsequent search operations could fail because the dataset can't be
+     * indexed.
+     */
+    @Disabled
     @Test
     public void testLoadMetadataBlock_NoErrorPath() {
         Response createUser = UtilIT.createRandomUser();
@@ -778,6 +785,13 @@ public void testLoadMetadataBlock_NoErrorPath() {
         assertEquals(244, (int) statistics.get("Controlled Vocabulary"));
     }
 
+    /**
+     * Disabled because once there are new fields in the database that Solr
+     * doesn't know about, dataset creation could be prevented, or at least
+     * subsequent search operations could fail because the dataset can't be
+     * indexed.
+     */
+    @Disabled
     @Test
     public void testLoadMetadataBlock_ErrorHandling() {
         Response createUser = UtilIT.createRandomUser();

src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java

@@ -300,7 +300,7 @@ public void testMoveLinkedDataset() {
                 .statusCode(OK.getStatusCode())
                 .body("feed.entry[0].id", CoreMatchers.endsWith(datasetPid));
 
-        UtilIT.sleepForReindex(datasetPid, superuserApiToken, 10);
+        UtilIT.sleepForReindex(datasetPid, superuserApiToken, 20);
         Response getLinksAfter = UtilIT.getDatasetLinks(datasetPid, superuserApiToken);
         getLinksAfter.prettyPrint();
         getLinksAfter.then().assertThat()

src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java

@@ -563,7 +563,14 @@ static Response updateDatasetPIDMetadata(String persistentId,  String apiToken)
                 .post("/api/datasets/:persistentId/modifyRegistrationMetadata/?persistentId=" + persistentId);
         return response;
     }
-
+
+    /**
+     * Deprecated because once there are new fields in the database that Solr
+     * doesn't know about, dataset creation could be prevented, or at least
+     * subsequent search operations could fail because the dataset can't be
+     * indexed.
+     */
+    @Deprecated    
     static Response loadMetadataBlock(String apiToken, byte[] body) {
         return given()
           .header(API_TOKEN_HTTP_HEADER, apiToken)