Skip to content

Commit b577bfa

Browse files
committed
Merge remote-tracking branch 'IQSS/develop' into
IQSS/7956-show_original_file_format
2 parents 7fbbfd0 + 180aa55 commit b577bfa

File tree

1,386 files changed

+150428
-30011
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,386 files changed

+150428
-30011
lines changed

.env

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
APP_IMAGE=gdcc/dataverse:unstable
2-
POSTGRES_VERSION=13
2+
POSTGRES_VERSION=17
33
DATAVERSE_DB_USER=dataverse
4-
SOLR_VERSION=9.3.0
4+
SOLR_VERSION=9.8.0
5+
SKIP_DEPLOY=0

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# https://www.git-scm.com/docs/gitattributes
2+
3+
# This set mandatory LF line endings for .sh files preventing from windows users to having to change the value of their git config --global core.autocrlf to 'false' or 'input'
4+
*.sh text eol=lf

.github/CODEOWNERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
# Any container related stuff should be assigned to / reviewed by Oliver and/or Phil
3+
modules/container-configbaker/** @poikilotherm @pdurbin
4+
modules/container-base/** @poikilotherm @pdurbin
5+
src/main/docker/** @poikilotherm @pdurbin
6+
docker-compose-dev.yml @poikilotherm @pdurbin
7+
.github/workflows/scripts/containers** @poikilotherm @pdurbin
8+
.github/workflows/container_* @poikilotherm @pdurbin

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Bug report
33
about: Did you encounter something unexpected or incorrect in the Dataverse software?
44
We'd like to hear about it!
55
title: ''
6-
labels: ''
6+
labels: 'Type: Bug'
77
assignees: ''
88

99
---
@@ -14,7 +14,7 @@ Thank you for contributing to the Dataverse Project through the creation of a bu
1414
WARNING: If this is a security issue it should be reported privately to security@dataverse.org
1515
1616
More information on bug issues and contributions can be found in the "Contributing to Dataverse" page:
17-
https://github.com/IQSS/dataverse/blob/develop/CONTRIBUTING.md#bug-reportsissues
17+
https://guides.dataverse.org/en/latest/contributor/index.html
1818
1919
Please fill out as much of the template as you can.
2020
Start below this comment section.
@@ -44,7 +44,6 @@ Start below this comment section.
4444
**Any related open or closed issues to this bug report?**
4545

4646

47-
4847
**Screenshots:**
4948

5049
No matter the issue, screenshots are always welcome.
@@ -53,3 +52,7 @@ To add a screenshot, please use one of the following formats and/or methods desc
5352

5453
* https://help.github.com/en/articles/file-attachments-on-issues-and-pull-requests
5554
*
55+
56+
57+
**Are you thinking about creating a pull request for this issue?**
58+
Help is always welcome, is this bug something you or your organization plan to fix?

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
name: Feature request
33
about: Suggest an idea or new feature for the Dataverse software!
4-
title: 'Feature Request/Idea:'
5-
labels: ''
4+
title: 'Feature Request:'
5+
labels: 'Type: Feature'
66
assignees: ''
77

88
---
@@ -11,7 +11,7 @@ assignees: ''
1111
Thank you for contributing to the Dataverse Project through the creation of a feature request!
1212
1313
More information on ideas/feature requests and contributions can be found in the "Contributing to Dataverse" page:
14-
https://github.com/IQSS/dataverse/blob/develop/CONTRIBUTING.md#ideasfeature-requests
14+
https://guides.dataverse.org/en/latest/contributor/index.html
1515
1616
Please fill out as much of the template as you can.
1717
Start below this comment section.
@@ -34,3 +34,6 @@ Start below this comment section.
3434

3535

3636
**Any open or closed issues related to this feature request?**
37+
38+
**Are you thinking about creating a pull request for this feature?**
39+
Help is always welcome, is this feature something you or your organization plan to implement?
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Idea proposal
3+
about: Propose a new idea for discussion to improve the Dataverse software!
4+
title: 'Suggestion:'
5+
labels: 'Type: Suggestion'
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Thank you for contributing to the Dataverse Project through the creation of a feature request!
12+
13+
More information on ideas/feature requests and contributions can be found in the "Contributing to Dataverse" page:
14+
https://guides.dataverse.org/en/latest/contributor/index.html
15+
16+
Please fill out as much of the template as you can.
17+
Start below this comment section.
18+
-->
19+
20+
**Overview of the Suggestion**
21+
22+
23+
**What kind of user is the suggestion intended for?**
24+
(Example users roles: API User, Curator, Depositor, Guest, Superuser, Sysadmin)
25+
26+
27+
**What inspired this idea?**
28+
29+
30+
**What existing behavior do you want changed?**
31+
32+
33+
**Any brand new behavior do you want to add to Dataverse?**
34+
35+
36+
**Any open or closed issues related to this suggestion?**
37+
38+
39+
**Are you thinking about creating a pull request for this issue?**
40+
Help is always welcome, is this idea something you or your organization plan to implement?

.github/PULL_REQUEST_TEMPLATE.md

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

33
**Which issue(s) this PR closes**:
44

5-
Closes #
5+
- Closes #
66

77
**Special notes for your reviewer**:
88

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
name: "Setup Maven and Caches"
3+
description: "Determine Java version and setup Maven, including necessary caches."
4+
inputs:
5+
git-reference:
6+
description: 'The git reference (branch/tag) to check out'
7+
required: false
8+
default: '${{ github.ref }}'
9+
pom-paths:
10+
description: "List of paths to Maven POM(s) for cache dependency setup"
11+
required: false
12+
default: 'pom.xml'
13+
runs:
14+
using: composite
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v5
18+
with:
19+
ref: ${{ inputs.git-reference }}
20+
- name: Determine Java version by reading the Maven property
21+
shell: bash
22+
run: |
23+
echo "JAVA_VERSION=$(grep '<target.java.version>' ${GITHUB_WORKSPACE}/modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" | tee -a ${GITHUB_ENV}
24+
- name: Set up JDK ${{ env.JAVA_VERSION }}
25+
id: setup-java
26+
uses: actions/setup-java@v5
27+
with:
28+
java-version: ${{ env.JAVA_VERSION }}
29+
distribution: 'temurin'
30+
cache: 'maven'
31+
cache-dependency-path: ${{ inputs.pom-paths }}
32+
- name: Download common cache on branch cache miss
33+
if: ${{ steps.setup-java.outputs.cache-hit != 'true' }}
34+
uses: actions/cache/restore@v4
35+
with:
36+
key: dataverse-maven-cache
37+
path: ~/.m2/repository

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Set update schedule for GitHub Actions
2+
# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
3+
4+
version: 2
5+
updates:
6+
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
# Check for updates to GitHub Actions daily
11+
interval: "daily"
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: "Properties Check"
2+
on:
3+
pull_request:
4+
paths:
5+
- "src/**/*.properties"
6+
- "scripts/api/data/metadatablocks/*"
7+
jobs:
8+
duplicate_keys:
9+
name: Duplicate Keys
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v6
13+
- name: Run duplicates detection script
14+
shell: bash
15+
run: tests/check_duplicate_properties.sh
16+
17+
metadata_blocks_properties:
18+
name: Metadata Blocks Properties
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v6
22+
- name: Setup GraalVM + Native Image
23+
uses: graalvm/setup-graalvm@v1
24+
with:
25+
github-token: ${{ secrets.GITHUB_TOKEN }}
26+
java-version: '21'
27+
distribution: 'graalvm-community'
28+
- name: Setup JBang
29+
uses: jbangdev/setup-jbang@main
30+
- name: Run metadata block properties verification script
31+
shell: bash
32+
run: tests/verify_mdb_properties.sh

0 commit comments

Comments
 (0)