Merge branch 'dspace-cris-2024_02_x' into task/dspace-cris-2024_02_x/DSC-2579_fix

# Conflicts:
#	dspace/config/spring/api/bitstore.xml

Author: vins01-4science

dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java

@@ -95,7 +95,7 @@ public class S3BitStoreService extends BaseBitStoreService {
     protected static final String DEFAULT_BUCKET_PREFIX = "dspace-asset-";
     protected static final Gson GSON = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
     public static final String REGEX_SECRET = "^(.{3})(.*)(.{3})$";
-    public static final long DEFAULT_EXPIRATION = Duration.ofMinutes(15).toSeconds();
+    public static final long DEFAULT_EXPIRATION = Duration.ofMinutes(2).toSeconds();
     // Prefix indicating a registered bitstream
     protected final String REGISTERED_FLAG = "-R";
     /**

dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java

@@ -87,7 +87,6 @@
 import org.dspace.content.Item;
 import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.BitstreamService;
-import org.dspace.content.service.CollectionService;
 import org.dspace.core.Constants;
 import org.dspace.disseminate.CitationDocumentServiceImpl;
 import org.dspace.eperson.EPerson;
@@ -105,7 +104,6 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 
@@ -139,18 +137,9 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
     @Autowired
     private AuthorizeService authorizeService;
 
-    @Autowired
-    private CollectionService collectionService;
-
     @Autowired
     private BitstreamStorageService bitstreamStorageService;
 
-    @Autowired
-    private S3BitStoreService s3BitStoreService;
-
-    @Autowired
-    private ApplicationContext applicationContext;
-
     // S3Mock related fields for integration testing
     private S3Mock s3Mock;
     private AmazonS3 amazonS3Client;

dspace/solr/audit/conf/schema.xml

@@ -79,7 +79,7 @@
  </types>
 
 <fields>
-   <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+   <field name="_version_" type="long" indexed="true" stored="true" docValues="true" multiValued="false"/>
    <field name="subject_uuid" type="string" indexed="true" stored="true" multiValued="false" />
    <field name="subject_type" type="string" indexed="true" stored="true" multiValued="false" />
    <field name="object_uuid" type="string" indexed="true" stored="true" multiValued="false" />

dspace/solr/authority/conf/solrconfig.xml

@@ -46,6 +46,10 @@
             <maxDocs>10000</maxDocs> <!--Commit every 10.000 documents-->
             <maxTime>${solr.autoCommit.maxTime:10000}</maxTime> <!--Commit every 10 seconds-->
         </autoCommit>
+
+        <updateLog>
+            <str name="dir">${solr.ulog.dir:}</str>
+        </updateLog>
     </updateHandler>
 
     <!-- Settings for how Solr will process & respond to queries -->

dspace/solr/dedup/conf/schema.xml

@@ -482,7 +482,7 @@
 
  <fields>
 
- 	<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+ 	<field name="_version_" type="long" indexed="true" stored="true" docValues="true" multiValued="false"/>
    <!-- Valid attributes for fields:
      name: mandatory - the name for the field
      type: mandatory - the name of a previously defined type from the

dspace/solr/oai/conf/schema.xml

@@ -115,7 +115,7 @@
  </types>
 
  <fields>
-   <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+   <field name="_version_" type="long" indexed="true" stored="true" docValues="true" multiValued="false"/>
    <!-- Item always present information -->
    <field name="item.id" type="uuid" indexed="true" stored="true" multiValued="false" />
    <field name="item.public" type="boolean" indexed="true" stored="true" multiValued="false" />

dspace/solr/oai/conf/solrconfig.xml

@@ -55,6 +55,10 @@
         <autoSoftCommit>
             <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
         </autoSoftCommit>
+
+        <updateLog>
+            <str name="dir">${solr.ulog.dir:}</str>
+        </updateLog>
     </updateHandler>
 
     <!-- Settings for how Solr will process & respond to queries -->

dspace/solr/ocr/conf/schema.xml

@@ -77,7 +77,7 @@
 
 
     <fields>
-        <field name="_version_" type="long" indexed="true" stored="false" docValues="true" multiValued="false"/>
+        <field name="_version_" type="long" indexed="true" stored="true" docValues="true" multiValued="false"/>
         <field name="id" type="string" multiValued="false" indexed="true" stored="true" required="true"/>
         <field name="ocr_text" type="text_ocr" multiValued="false" indexed="true" stored="true" />
         <field name="manifest_url" type="text_general" multiValued="false" indexed="true" stored="true" required="true"/>

dspace/solr/ocr/conf/solrconfig.xml

@@ -33,6 +33,10 @@
         <autoSoftCommit>
             <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
         </autoSoftCommit>
+
+        <updateLog>
+            <str name="dir">${solr.ulog.dir:}</str>
+        </updateLog>
     </updateHandler>
 
     <searchComponent class="de.digitalcollections.solrocr.solr.OcrHighlightComponent"

dspace/solr/qaevent/conf/schema.xml

@@ -186,7 +186,7 @@
 
  <fields>
 
- 	<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+ 	<field name="_version_" type="long" indexed="true" stored="true" docValues="true" multiValued="false"/>
 
     <!-- The event source -->
     <field name="source" type="string" indexed="true" stored="true" omitNorms="true" />