Skip to content

Commit 1493abd

Browse files
qqmyersqqmyers
committed
Merge remote-tracking branch 'IQSS/develop' into develop
2 parents be8af9d + b78060a commit 1493abd

173 files changed

Lines changed: 5992 additions & 1524 deletions

File tree

Some content is hidden

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

‎.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/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171

7272
# Initializes the CodeQL tools for scanning.
7373
- name: Initialize CodeQL
74-
uses: github/codeql-action/init@v3
74+
uses: github/codeql-action/init@v4
7575
with:
7676
languages: ${{ matrix.language }}
7777
build-mode: ${{ matrix.build-mode }}
@@ -99,6 +99,6 @@ jobs:
9999
exit 1
100100
101101
- name: Perform CodeQL Analysis
102-
uses: github/codeql-action/analyze@v3
102+
uses: github/codeql-action/analyze@v4
103103
with:
104104
category: "/language:${{matrix.language}}"

‎.github/workflows/container_app_pr.yml‎

Lines changed: 2 additions & 2 deletions
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'
@@ -86,7 +86,7 @@ jobs:
8686
:ship: [See on GHCR](https://github.com/orgs/gdcc/packages/container). Use by referencing with full name as printed above, mind the registry name.
8787
8888
# Leave a note when things have gone sideways
89-
- uses: peter-evans/create-or-update-comment@v4
89+
- uses: peter-evans/create-or-update-comment@v5
9090
if: ${{ failure() }}
9191
with:
9292
issue-number: ${{ github.event.client_payload.pull_request.number }}

‎.github/workflows/container_maintenance.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218
cat "./modules/container-base/README.md"
219219
- name: Push description to DockerHub for base image
220220
if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.base-image.outputs.rebuilt_images) != '[]' }}
221-
uses: peter-evans/dockerhub-description@v4
221+
uses: peter-evans/dockerhub-description@v5
222222
with:
223223
username: ${{ secrets.DOCKERHUB_USERNAME }}
224224
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -243,7 +243,7 @@ jobs:
243243
cat "./src/main/docker/README.md"
244244
- name: Push description to DockerHub for application image
245245
if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.application-image.outputs.rebuilt_images) != '[]' }}
246-
uses: peter-evans/dockerhub-description@v4
246+
uses: peter-evans/dockerhub-description@v5
247247
with:
248248
username: ${{ secrets.DOCKERHUB_USERNAME }}
249249
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -268,7 +268,7 @@ jobs:
268268
cat "./modules/container-configbaker/README.md"
269269
- name: Push description to DockerHub for config baker image
270270
if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.configbaker-image.outputs.rebuilt_images) != '[]' }}
271-
uses: peter-evans/dockerhub-description@v4
271+
uses: peter-evans/dockerhub-description@v5
272272
with:
273273
username: ${{ secrets.DOCKERHUB_USERNAME }}
274274
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/deploy_beta_testing.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v5
1919

20-
- uses: actions/setup-java@v4
20+
- uses: actions/setup-java@v5
2121
with:
2222
distribution: 'zulu'
2323
java-version: '17'
@@ -37,7 +37,7 @@ jobs:
3737
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
3838

3939
- name: Upload war artifact
40-
uses: actions/upload-artifact@v4
40+
uses: actions/upload-artifact@v5
4141
with:
4242
name: built-app
4343
path: ./target/${{ env.war_file }}
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@v5
5252

5353
- name: Download war artifact
54-
uses: actions/download-artifact@v5
54+
uses: actions/download-artifact@v6
5555
with:
5656
name: built-app
5757
path: ./

‎.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: 8 additions & 8 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
@@ -62,7 +62,7 @@ jobs:
6262

6363
# Upload the built war file. For download, it will be wrapped in a ZIP by GitHub.
6464
# See also https://github.com/actions/upload-artifact#zipped-artifact-downloads
65-
- uses: actions/upload-artifact@v4
65+
- uses: actions/upload-artifact@v5
6666
with:
6767
name: dataverse-java${{ matrix.jdk }}.war
6868
path: target/dataverse*.war
@@ -72,7 +72,7 @@ jobs:
7272
- run: |
7373
tar -cvf java-builddir.tar target
7474
tar -cvf java-m2-selection.tar ~/.m2/repository/io/gdcc/dataverse-*
75-
- uses: actions/upload-artifact@v4
75+
- uses: actions/upload-artifact@v5
7676
with:
7777
name: java-artifacts
7878
path: |
@@ -105,14 +105,14 @@ 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
112112
cache: maven
113113

114114
# Get the build output from the unit test job
115-
- uses: actions/download-artifact@v5
115+
- uses: actions/download-artifact@v6
116116
with:
117117
name: java-artifacts
118118
- run: |
@@ -124,7 +124,7 @@ jobs:
124124

125125
# Wrap up and send to coverage job
126126
- run: tar -cvf java-reportdir.tar target/site
127-
- uses: actions/upload-artifact@v4
127+
- uses: actions/upload-artifact@v5
128128
with:
129129
name: java-reportdir
130130
path: java-reportdir.tar
@@ -138,14 +138,14 @@ 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
145145
cache: maven
146146

147147
# Get the build output from the integration test job
148-
- uses: actions/download-artifact@v5
148+
- uses: actions/download-artifact@v6
149149
with:
150150
name: java-reportdir
151151
- run: tar -xvf java-reportdir.tar

‎.github/workflows/spi_release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ 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'
45-
server-id: ossrh
45+
server-id: central
4646
server-username: MAVEN_USERNAME
4747
server-password: MAVEN_PASSWORD
4848
- uses: actions/cache@v4
@@ -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,11 +76,11 @@ 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'
83-
server-id: ossrh
83+
server-id: central
8484
server-username: MAVEN_USERNAME
8585
server-password: MAVEN_PASSWORD
8686
gpg-private-key: ${{ secrets.DATAVERSEBOT_GPG_KEY }}

‎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>

‎doc/release-notes/10190-dataset-count.md‎

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

0 commit comments

Comments
 (0)