Skip to content

Commit 95cd663

Browse files
committed
Merge branch 'develop' into PFUpdates
# Conflicts: # pom.xml # src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java # src/main/webapp/file.xhtml # src/main/webapp/filesFragment.xhtml # src/main/webapp/metadataFragment.xhtml # src/main/webapp/resources/css/structure.css # src/main/webapp/search-include-fragment.xhtml
2 parents c65257e + 02eca06 commit 95cd663

19 files changed

Lines changed: 223 additions & 689 deletions

File tree

doc/sphinx-guides/source/installation/config.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -935,11 +935,11 @@ Connection Validation
935935
- Default
936936
* - dataverse.db.is-connection-validation-required
937937
- ``true``: Validate connections, allow server to reconnect in case of failure.
938-
- false
938+
- true
939939
* - dataverse.db.connection-validation-method
940940
- | The method of connection validation:
941-
| ``table|autocommit|meta-data|custom-validation``.
942-
- *Empty string*
941+
| ``table|auto-commit|meta-data|custom-validation``.
942+
- ``auto-commit``
943943
* - dataverse.db.validation-table-name
944944
- The name of the table used for validation if the validation method is set to ``table``.
945945
- *Empty string*

modules/dataverse-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152

153153
<!-- Major system components and dependencies -->
154154
<payara.version>7.2026.3</payara.version>
155-
<postgresql.version>42.7.7</postgresql.version>
155+
<postgresql.version>42.7.11</postgresql.version>
156156
<solr.version>9.10.0</solr.version>
157157
<postgresql.server.version>16</postgresql.server.version>
158158
<aws.version>2.41.4</aws.version>

src/main/java/edu/harvard/iq/dataverse/DatasetPage.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,7 @@
109109
import jakarta.inject.Inject;
110110
import jakarta.inject.Named;
111111
import jakarta.json.Json;
112-
import jakarta.json.JsonArray;
113-
import jakarta.json.JsonObject;
114112
import jakarta.json.JsonObjectBuilder;
115-
import jakarta.json.JsonValue;
116113
import jakarta.persistence.OptimisticLockException;
117114

118115
import org.apache.commons.lang3.StringUtils;
@@ -169,7 +166,6 @@
169166
import edu.harvard.iq.dataverse.search.SearchException;
170167
import edu.harvard.iq.dataverse.search.SearchFields;
171168
import edu.harvard.iq.dataverse.search.SolrClientService;
172-
import edu.harvard.iq.dataverse.settings.FeatureFlags;
173169
import edu.harvard.iq.dataverse.settings.JvmSettings;
174170
import edu.harvard.iq.dataverse.util.SignpostingResources;
175171
import edu.harvard.iq.dataverse.util.FileMetadataUtil;
@@ -4738,17 +4734,11 @@ public void setDownloadType(String downloadType) {
47384734
this.downloadType = downloadType;
47394735
}
47404736

4741-
public void initGuestbookMultipleResponse(String selectedFileIds){
4742-
initGuestbookResponse(null, "download", selectedFileIds);
4743-
}
4744-
47454737
public void initGuestbookResponse(FileMetadata fileMetadata, String downloadFormat, String selectedFileIds) {
47464738

47474739
this.guestbookResponse = guestbookResponseService.initGuestbookResponse(fileMetadata, downloadFormat, selectedFileIds, session);
47484740
}
47494741

4750-
4751-
47524742
public void compareVersionDifferences() {
47534743
if (this.selectedVersions.size() != 2) {
47544744
PrimeFaces.current().executeScript("openCompareTwo();");

src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ public String getDefinitionLevelString(){
508508
}
509509

510510
public void assignRole(ActionEvent evt) {
511-
logger.info("Got to assignRole");
512511
List<RoleAssignee> selectedRoleAssigneesList = getRoleAssignSelectedRoleAssignees();
513512
if ( selectedRoleAssigneesList == null ) {
514513
logger.info("** SELECTED role asignees is null");

src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class ThemeWidgetFragment implements java.io.Serializable {
5555
static final String DEFAULT_LOGO_BACKGROUND_COLOR = "FFFFFF";
5656
static final String DEFAULT_BACKGROUND_COLOR = "FFFFFF";
5757
static final String DEFAULT_LINK_COLOR = "3C7BB1";
58-
static final String DEFAULT_TEXT_COLOR = "888888";
58+
static final String DEFAULT_TEXT_COLOR = "767676";
5959
private static final Logger logger = Logger.getLogger(ThemeWidgetFragment.class.getCanonicalName());
6060

6161
public static final String LOGOS_SUBDIR = "logos";

src/main/java/edu/harvard/iq/dataverse/api/Meta.java

Lines changed: 0 additions & 146 deletions
This file was deleted.

0 commit comments

Comments
 (0)