Skip to content

Commit 2b8f3dc

Browse files
committed
Merge branch 'develop' into fix-search-api-nested-metadata-fields #11172
2 parents a3d5410 + 5fbfea2 commit 2b8f3dc

File tree

382 files changed

+17873
-2706
lines changed

Some content is hidden

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

382 files changed

+17873
-2706
lines changed

.env

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

.github/workflows/codeql.yml

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL Advanced"
13+
14+
on:
15+
push:
16+
branches: [ "develop", "master" ]
17+
pull_request:
18+
branches: [ "develop", "master" ]
19+
schedule:
20+
- cron: '30 6 * * 4'
21+
22+
jobs:
23+
analyze:
24+
name: Analyze (${{ matrix.language }})
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners (GitHub.com only)
29+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
31+
permissions:
32+
# required for all workflows
33+
security-events: write
34+
35+
# required to fetch internal or private CodeQL packs
36+
packages: read
37+
38+
# only required for workflows in private repositories
39+
actions: read
40+
contents: read
41+
42+
strategy:
43+
fail-fast: false
44+
matrix:
45+
include:
46+
- language: actions
47+
build-mode: none
48+
- language: java-kotlin
49+
build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
50+
- language: javascript-typescript
51+
build-mode: none
52+
- language: python
53+
build-mode: none
54+
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
55+
# Use `c-cpp` to analyze code written in C, C++ or both
56+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
57+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
58+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
59+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
60+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
61+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
62+
steps:
63+
- name: Checkout repository
64+
uses: actions/checkout@v4
65+
66+
# Add any setup steps before running the `github/codeql-action/init` action.
67+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
68+
# or others). This is typically only required for manual builds.
69+
# - name: Setup runtime (example)
70+
# uses: actions/setup-example@v1
71+
72+
# Initializes the CodeQL tools for scanning.
73+
- name: Initialize CodeQL
74+
uses: github/codeql-action/init@v3
75+
with:
76+
languages: ${{ matrix.language }}
77+
build-mode: ${{ matrix.build-mode }}
78+
# If you wish to specify custom queries, you can do so here or in a config file.
79+
# By default, queries listed here will override any specified in a config file.
80+
# Prefix the list here with "+" to use these queries and those in the config file.
81+
82+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
83+
# queries: security-extended,security-and-quality
84+
85+
# If the analyze step fails for one of the languages you are analyzing with
86+
# "We were unable to automatically build your code", modify the matrix above
87+
# to set the build mode to "manual" for that language. Then modify this step
88+
# to build your code.
89+
# ℹ️ Command-line programs to run using the OS shell.
90+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
91+
- if: matrix.build-mode == 'manual'
92+
shell: bash
93+
run: |
94+
echo 'If you are using a "manual" build mode for one or more of the' \
95+
'languages you are analyzing, replace this with the commands to build' \
96+
'your code, for example:'
97+
echo ' make bootstrap'
98+
echo ' make release'
99+
exit 1
100+
101+
- name: Perform CodeQL Analysis
102+
uses: github/codeql-action/analyze@v3
103+
with:
104+
category: "/language:${{matrix.language}}"

.github/workflows/container_app_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535

3636
# Note: Accessing, pushing tags etc. to GHCR will only succeed in upstream because secrets.
3737
- name: Login to Github Container Registry
38-
uses: docker/login-action@v2
38+
uses: docker/login-action@v3
3939
with:
4040
registry: ghcr.io
4141
username: ${{ secrets.GHCR_USERNAME }}
4242
password: ${{ secrets.GHCR_TOKEN }}
4343

4444
- name: Set up QEMU for multi-arch builds
45-
uses: docker/setup-qemu-action@v2
45+
uses: docker/setup-qemu-action@v3
4646

4747
# Get the image tag from either the command or default to branch name (Not used for now)
4848
#- name: Get the target tag name

.github/workflows/container_app_push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,20 @@ jobs:
126126
# Depending on context, we push to different targets. Login accordingly.
127127
- if: github.event_name != 'pull_request'
128128
name: Log in to Docker Hub registry
129-
uses: docker/login-action@v2
129+
uses: docker/login-action@v3
130130
with:
131131
username: ${{ secrets.DOCKERHUB_USERNAME }}
132132
password: ${{ secrets.DOCKERHUB_TOKEN }}
133133
- if: ${{ github.event_name == 'pull_request' }}
134134
name: Login to Github Container Registry
135-
uses: docker/login-action@v2
135+
uses: docker/login-action@v3
136136
with:
137137
registry: ghcr.io
138138
username: ${{ secrets.GHCR_USERNAME }}
139139
password: ${{ secrets.GHCR_TOKEN }}
140140

141141
- name: Set up QEMU for multi-arch builds
142-
uses: docker/setup-qemu-action@v2
142+
uses: docker/setup-qemu-action@v3
143143

144144
- name: Re-set image tag based on branch (if master)
145145
if: ${{ github.ref_name == 'master' }}

.github/workflows/container_base_push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
# Configure a remote ARM64 build host in addition to the local AMD64 in two steps.
5454
- name: Setup SSH agent
5555
if: ${{ github.event_name != 'schedule' }}
56-
uses: webfactory/[email protected].0
56+
uses: webfactory/[email protected].1
5757
with:
5858
ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }}
5959
- name: Provide the known hosts key and the builder config

.github/workflows/copy_labels.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Copy labels from issue to pull request
2+
3+
on:
4+
pull_request:
5+
types: [opened]
6+
7+
jobs:
8+
copy-labels:
9+
runs-on: ubuntu-latest
10+
name: Copy labels from linked issues
11+
steps:
12+
- name: copy-labels
13+
uses: michalvankodev/[email protected]
14+
with:
15+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy_beta_testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
overwrite: true
6969

7070
- name: Execute payara war deployment remotely
71-
uses: appleboy/ssh-action@v1.0.0
71+
uses: appleboy/ssh-action@v1.2.2
7272
env:
7373
INPUT_WAR_FILE: ${{ env.war_file }}
7474
with:

README.md

Lines changed: 73 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,81 @@
11
Dataverse®
22
===============
33

4-
Dataverse is an [open source][] software platform for sharing, finding, citing, and preserving research data (developed by the [Dataverse team](https://dataverse.org/about) at the [Institute for Quantitative Social Science](https://iq.harvard.edu/) and the [Dataverse community][]).
4+
![Dataverse-logo](https://github.com/IQSS/dataverse-frontend/assets/7512607/6c4d79e4-7be5-4102-88bd-dfa167dc79d3)
55

6-
[dataverse.org][] is our home on the web and shows a map of Dataverse installations around the world, a list of [features][], [integrations][] that have been made possible through [REST APIs][], our [project board][], our development [roadmap][], and more.
6+
## Table of Contents
77

8-
We maintain a demo site at [demo.dataverse.org][] which you are welcome to use for testing and evaluating Dataverse.
8+
1. [❓ What is Dataverse?](#what-is-dataverse)
9+
2. [✔ Try Dataverse](#try-dataverse)
10+
3. [🌐 Features, Integrations, Roadmaps, and More](#website)
11+
4. [📥 Installation](#installation)
12+
5. [🏘 Community and Support](#community-and-support)
13+
6. [🧑‍💻️ Contributing](#contributing)
14+
7. [⚖️ Legal Information](#legal-informations)
915

10-
To install Dataverse, please see our [Installation Guide][] which will prompt you to download our [latest release][]. Docker users should consult the [Container Guide][].
16+
<a name="what-is-dataverse"></a>
1117

12-
To discuss Dataverse with the community, please join our [mailing list][], participate in a [community call][], chat with us at [chat.dataverse.org][], or attend our annual [Dataverse Community Meeting][].
18+
## ❓ What is Dataverse?
1319

14-
We love contributors! Please see our [Contributing Guide][] for ways you can help.
20+
Welcome to Dataverse®, the [open source][] software platform designed for sharing, finding, citing, and preserving research data. Developed by the Dataverse team at the [Institute for Quantitative Social Science](https://iq.harvard.edu/) and the [Dataverse community][], our platform makes it easy for research organizations to host, manage, and share their data with the world.
21+
22+
<a name="try-dataverse"></a>
23+
24+
## ✔ Try Dataverse
25+
26+
We invite you to explore our demo site at [demo.dataverse.org][]. This site is ideal for testing and evaluating Dataverse in a risk-free environment.
27+
28+
<a name="website"></a>
29+
30+
## 🌐 Features, Integrations, Roadmaps, and More
31+
32+
Visit [dataverse.org][], our home on the web, for a comprehensive overview of Dataverse. Here, you will find:
33+
34+
- An interactive map showcasing Dataverse installations worldwide.
35+
- A detailed list of [features][].
36+
- Information on [integrations][] that have been made possible through our [REST APIs][].
37+
- Our [project board][] and development [roadmap][].
38+
- News, events, and more.
39+
40+
<a name="installation"></a>
41+
42+
## 📥 Installation
43+
44+
Ready to get started? Follow our [Installation Guide][] to download and install the latest release of Dataverse.
45+
46+
If you are using Docker, please refer to our [Container Guide][] for detailed instructions.
47+
48+
<a name="community-and-support"></a>
49+
50+
## 🏘 Community and Support
51+
52+
Engage with the vibrant Dataverse community through various channels:
53+
54+
- **[Mailing List][]**: Join the conversation on our [mailing list][].
55+
- **[Community Calls][]**: Participate in our regular [community calls][] to discuss new features, ask questions, and share your experiences.
56+
- **[Chat][]**: Connect with us and other users in real-time at [dataverse.zulipchat.com][].
57+
- **[Dataverse Community Meeting][]**: Attend our annual [Dataverse Community Meeting][] to network, learn, and collaborate with peers and experts.
58+
- **[DataverseTV][]**: Watch the video content from the Dataverse community on [DataverseTV][] and on [Harvard's IQSS YouTube channel][].
59+
60+
<a name="contributing"></a>
61+
## 🧑‍💻️ Contribute to Dataverse
62+
63+
We love contributors! Whether you are a developer, researcher, or enthusiast, there are many ways you can help.
64+
65+
Visit our [Contributing Guide][] to learn how you can get involved.
66+
67+
Join us in building and enhancing Dataverse to make research data more accessible and impactful. Your support and participation are crucial to our success!
68+
69+
<a name="legal-informations"></a>
70+
## ⚖️ Legal Information
1571

1672
Dataverse is a trademark of President and Fellows of Harvard College and is registered in the United States.
1773

74+
---
75+
For more detailed information, visit our website at [dataverse.org][].
76+
77+
Feel free to [reach out] with any questions or feedback. Happy researching!
78+
1879
[![Dataverse Project logo](src/main/webapp/resources/images/dataverseproject_logo.jpg "Dataverse Project")](http://dataverse.org)
1980

2081
[![API Test Status](https://jenkins.dataverse.org/buildStatus/icon?job=IQSS-dataverse-develop&subject=API%20Test%20Status)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/)
@@ -37,6 +98,11 @@ Dataverse is a trademark of President and Fellows of Harvard College and is regi
3798
[Contributing Guide]: CONTRIBUTING.md
3899
[mailing list]: https://groups.google.com/group/dataverse-community
39100
[community call]: https://dataverse.org/community-calls
40-
[chat.dataverse.org]: https://chat.dataverse.org
101+
[Chat]: https://dataverse.zulipchat.com
102+
[dataverse.zulipchat.com]: https://dataverse.zulipchat.com
41103
[Dataverse Community Meeting]: https://dataverse.org/events
42104
[open source]: LICENSE.md
105+
[community calls]: https://dataverse.org/community-calls
106+
[DataverseTV]: https://dataverse.org/dataversetv
107+
[Harvard's IQSS YouTube channel]: https://www.youtube.com/@iqssatharvarduniversity8672
108+
[reach out]: https://dataverse.org/contact

0 commit comments

Comments
 (0)