Skip to content

Commit 7976917

Browse files
authored
Merge branch 'develop' into dependabot/github_actions/peter-evans/create-or-update-comment-5
2 parents 39626a5 + 7c476e2 commit 7976917

36 files changed

+1232
-164
lines changed

.github/actions/setup-maven/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
echo "JAVA_VERSION=$(grep '<target.java.version>' ${GITHUB_WORKSPACE}/modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" | tee -a ${GITHUB_ENV}
2424
- name: Set up JDK ${{ env.JAVA_VERSION }}
2525
id: setup-java
26-
uses: actions/setup-java@v4
26+
uses: actions/setup-java@v5
2727
with:
2828
java-version: ${{ env.JAVA_VERSION }}
2929
distribution: 'temurin'

.github/workflows/container_app_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v5
2424
with:
2525
ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
26-
- uses: actions/setup-java@v4
26+
- uses: actions/setup-java@v5
2727
with:
2828
java-version: "17"
2929
distribution: 'adopt'

.github/workflows/deploy_beta_testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v5
1818

19-
- uses: actions/setup-java@v4
19+
- uses: actions/setup-java@v5
2020
with:
2121
distribution: 'zulu'
2222
java-version: '17'

.github/workflows/maven_cache_management.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Determine Java version from Parent POM
3737
run: echo "JAVA_VERSION=$(grep '<target.java.version>' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV}
3838
- name: Set up JDK ${{ env.JAVA_VERSION }}
39-
uses: actions/setup-java@v4
39+
uses: actions/setup-java@v5
4040
with:
4141
java-version: ${{ env.JAVA_VERSION }}
4242
distribution: temurin

.github/workflows/maven_unit_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# Basic setup chores
4040
- uses: actions/checkout@v5
4141
- name: Set up JDK ${{ matrix.jdk }}
42-
uses: actions/setup-java@v4
42+
uses: actions/setup-java@v5
4343
with:
4444
java-version: ${{ matrix.jdk }}
4545
distribution: temurin
@@ -105,7 +105,7 @@ jobs:
105105
# Basic setup chores
106106
- uses: actions/checkout@v5
107107
- name: Set up JDK ${{ matrix.jdk }}
108-
uses: actions/setup-java@v4
108+
uses: actions/setup-java@v5
109109
with:
110110
java-version: ${{ matrix.jdk }}
111111
distribution: temurin
@@ -138,7 +138,7 @@ jobs:
138138
# TODO: As part of #10618 change to setup-maven custom action
139139
# Basic setup chores
140140
- uses: actions/checkout@v5
141-
- uses: actions/setup-java@v4
141+
- uses: actions/setup-java@v5
142142
with:
143143
java-version: '17'
144144
distribution: temurin

.github/workflows/spi_release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.event_name == 'pull_request' && needs.check-secrets.outputs.available == 'true'
3939
steps:
4040
- uses: actions/checkout@v5
41-
- uses: actions/setup-java@v4
41+
- uses: actions/setup-java@v5
4242
with:
4343
java-version: '17'
4444
distribution: 'adopt'
@@ -64,7 +64,7 @@ jobs:
6464
if: github.event_name == 'push' && needs.check-secrets.outputs.available == 'true'
6565
steps:
6666
- uses: actions/checkout@v5
67-
- uses: actions/setup-java@v4
67+
- uses: actions/setup-java@v5
6868
with:
6969
java-version: '17'
7070
distribution: 'adopt'
@@ -76,7 +76,7 @@ jobs:
7676

7777
# Running setup-java again overwrites the settings.xml - IT'S MANDATORY TO DO THIS SECOND SETUP!!!
7878
- name: Set up Maven Central Repository
79-
uses: actions/setup-java@v4
79+
uses: actions/setup-java@v5
8080
with:
8181
java-version: '17'
8282
distribution: 'adopt'

conf/keycloak/builtin-users-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</build>
101101

102102
<properties>
103-
<keycloak.version>26.3.2</keycloak.version>
103+
<keycloak.version>26.3.4</keycloak.version>
104104
<java.version>17</java.version>
105105
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
106106
<mindrot.jbcrypt.version>0.4</mindrot.jbcrypt.version>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
## Get Dataset/Dataverse Storage Driver API
2+
3+
### Changed Json response - breaking change!
4+
5+
The API for getting the Storage Driver info has been changed/extended.
6+
/api/datasets/{identifier}/storageDriver
7+
/api/admin/dataverse/{dataverse-alias}/storageDriver
8+
changed "message" to "name" and added "type" and "label"
9+
10+
Also added query param for /api/admin/dataverse/{dataverse-alias}/storageDriver?getEffective=true to recurse the chain of parents to find the effective storageDriver
11+
12+
See also [the guides](https://dataverse-guide--11664.org.readthedocs.build/en/11664/api/native-api.html#configure-a-dataset-to-store-all-new-files-in-a-specific-file-store), #11695, and #11664.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
### New API endpoint for retrieving a list of Dataverse Collections to which a given Dataset or Dataverse Collection may be linked
2+
3+
-The end point also takes in a search term which currently must be part of the collections' names.
4+
-The user calling this API must have Link Dataset or Link Dataverse permission on the Dataverse Collections returned.
5+
-If the Collection has already been linked to the given Dataset or Collection, it will not be returned.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Permission reindexing, which occurs, e.g., after a user has been granted a role on a collection, has been made faster and less memory intensive in this release.

0 commit comments

Comments
 (0)