Skip to content

Commit ec49f15

Browse files
ErykKulErykKul
committed
Merge branch 'develop' into 12096-fix-ok-message-nested-object
2 parents b5a0406 + d55acc6 commit ec49f15

188 files changed

Lines changed: 10678 additions & 2594 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/workflows/container_app_pr.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@ jobs:
2525
ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
2626
- uses: actions/setup-java@v5
2727
with:
28-
java-version: "17"
28+
java-version: "21"
2929
distribution: 'adopt'
30-
- uses: actions/cache@v4
30+
- uses: actions/cache@v5
3131
with:
3232
path: ~/.m2
3333
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3434
restore-keys: ${{ runner.os }}-m2
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@v3
38+
uses: docker/login-action@v4
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@v3
45+
uses: docker/setup-qemu-action@v4
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
@@ -69,7 +69,7 @@ jobs:
6969
-Dapp.image.tag=${{ env.IMAGE_TAG }}
7070
-Ddocker.registry=ghcr.io -Ddocker.platforms=${{ env.PLATFORMS }}
7171
72-
- uses: marocchino/sticky-pull-request-comment@v2
72+
- uses: marocchino/sticky-pull-request-comment@v3
7373
with:
7474
header: registry-push
7575
hide_and_recreate: true

‎.github/workflows/container_app_push.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,20 @@ jobs:
101101
# Depending on context, we push to different targets. Login accordingly.
102102
- if: github.event_name != 'pull_request'
103103
name: Log in to Docker Hub registry
104-
uses: docker/login-action@v3
104+
uses: docker/login-action@v4
105105
with:
106106
username: ${{ secrets.DOCKERHUB_USERNAME }}
107107
password: ${{ secrets.DOCKERHUB_TOKEN }}
108108
- if: ${{ github.event_name == 'pull_request' }}
109109
name: Login to Github Container Registry
110-
uses: docker/login-action@v3
110+
uses: docker/login-action@v4
111111
with:
112112
registry: ghcr.io
113113
username: ${{ secrets.GHCR_USERNAME }}
114114
password: ${{ secrets.GHCR_TOKEN }}
115115

116116
- name: Set up QEMU for multi-arch builds
117-
uses: docker/setup-qemu-action@v3
117+
uses: docker/setup-qemu-action@v4
118118

119119
- name: Add rolling image tag when pushing to develop
120120
if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
@@ -141,7 +141,7 @@ jobs:
141141
${{ env.REGISTRY }} -Ddocker.platforms=${{ env.PLATFORMS }}
142142
-P ct deploy
143143
144-
- uses: marocchino/sticky-pull-request-comment@v2
144+
- uses: marocchino/sticky-pull-request-comment@v3
145145
if: ${{ github.event_name == 'pull_request' }}
146146
with:
147147
header: registry-push

‎.github/workflows/container_base_push.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ jobs:
4242
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
4343
# on events in context of upstream because secrets. PRs run in context of forks by default!
4444
- name: Log in to the Container registry
45-
uses: docker/login-action@v3
45+
uses: docker/login-action@v4
4646
with:
4747
username: ${{ secrets.DOCKERHUB_USERNAME }}
4848
password: ${{ secrets.DOCKERHUB_TOKEN }}
4949

5050
# In case this is a push to develop, we care about buildtime.
5151
# Configure a remote ARM64 build host in addition to the local AMD64 in two steps.
5252
- name: Setup SSH agent
53-
uses: webfactory/ssh-agent@v0.9.1
53+
uses: webfactory/ssh-agent@v0.10.0
5454
with:
5555
ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }}
5656
- name: Provide the known hosts key and the builder config

‎.github/workflows/container_maintenance.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ jobs:
7979
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
8080
# on events in context of upstream because secrets. PRs run in context of forks by default!
8181
- name: Log in to the Container registry
82-
uses: docker/login-action@v3
82+
uses: docker/login-action@v4
8383
with:
8484
username: ${{ secrets.DOCKERHUB_USERNAME }}
8585
password: ${{ secrets.DOCKERHUB_TOKEN }}
8686
- name: Set up QEMU for multi-arch builds
87-
uses: docker/setup-qemu-action@v3
87+
uses: docker/setup-qemu-action@v4
8888
with:
8989
platforms: ${{ env.PLATFORMS }}
9090

@@ -122,12 +122,12 @@ jobs:
122122
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
123123
# on events in context of upstream because secrets. PRs run in context of forks by default!
124124
- name: Log in to the Container registry
125-
uses: docker/login-action@v3
125+
uses: docker/login-action@v4
126126
with:
127127
username: ${{ secrets.DOCKERHUB_USERNAME }}
128128
password: ${{ secrets.DOCKERHUB_TOKEN }}
129129
- name: Set up QEMU for multi-arch builds
130-
uses: docker/setup-qemu-action@v3
130+
uses: docker/setup-qemu-action@v4
131131
with:
132132
platforms: ${{ env.PLATFORMS }}
133133

@@ -164,12 +164,12 @@ jobs:
164164
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
165165
# on events in context of upstream because secrets. PRs run in context of forks by default!
166166
- name: Log in to the Container registry
167-
uses: docker/login-action@v3
167+
uses: docker/login-action@v4
168168
with:
169169
username: ${{ secrets.DOCKERHUB_USERNAME }}
170170
password: ${{ secrets.DOCKERHUB_TOKEN }}
171171
- name: Set up QEMU for multi-arch builds
172-
uses: docker/setup-qemu-action@v3
172+
uses: docker/setup-qemu-action@v4
173173
with:
174174
platforms: ${{ env.PLATFORMS }}
175175
- name: Setup Trivy binary for vulnerability scanning

‎.github/workflows/deploy_beta_testing.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/setup-java@v5
2020
with:
2121
distribution: 'zulu'
22-
java-version: '17'
22+
java-version: '21'
2323

2424
- name: Enable API Session Auth feature flag
2525
working-directory: src/main/resources/META-INF
@@ -36,7 +36,7 @@ jobs:
3636
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
3737

3838
- name: Upload war artifact
39-
uses: actions/upload-artifact@v6
39+
uses: actions/upload-artifact@v7
4040
with:
4141
name: built-app
4242
path: ./target/${{ env.war_file }}
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@v6
5151

5252
- name: Download war artifact
53-
uses: actions/download-artifact@v6
53+
uses: actions/download-artifact@v8
5454
with:
5555
name: built-app
5656
path: ./
@@ -69,7 +69,7 @@ jobs:
6969
overwrite: true
7070

7171
- name: Execute payara war deployment remotely
72-
uses: appleboy/ssh-action@v1.2.4
72+
uses: appleboy/ssh-action@v1.2.5
7373
env:
7474
INPUT_WAR_FILE: ${{ env.war_file }}
7575
with:
@@ -79,11 +79,11 @@ jobs:
7979
envs: INPUT_WAR_FILE
8080
script: |
8181
APPLICATION_NAME=dataverse-backend
82-
ASADMIN='/usr/local/payara6/bin/asadmin --user admin'
82+
ASADMIN='/usr/local/payara7/bin/asadmin --user admin'
8383
$ASADMIN undeploy $APPLICATION_NAME
8484
#$ASADMIN stop-domain
85-
#rm -rf /usr/local/payara6/glassfish/domains/domain1/generated
86-
#rm -rf /usr/local/payara6/glassfish/domains/domain1/osgi-cache
85+
#rm -rf /usr/local/payara7/glassfish/domains/domain1/generated
86+
#rm -rf /usr/local/payara7/glassfish/domains/domain1/osgi-cache
8787
#$ASADMIN start-domain
8888
$ASADMIN deploy --name $APPLICATION_NAME $INPUT_WAR_FILE
8989
#$ASADMIN stop-domain

‎.github/workflows/maven_cache_management.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
env:
6363
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6464
- name: Save the common cache
65-
uses: actions/cache@v4
65+
uses: actions/cache@v5
6666
with:
6767
path: ${{ env.COMMON_CACHE_PATH }}
6868
key: ${{ env.COMMON_CACHE_KEY }}

‎.github/workflows/maven_unit_test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
jdk: [ '17' ]
32+
jdk: [ '21' ]
3333
experimental: [false]
3434
status: ["Stable"]
3535
continue-on-error: ${{ matrix.experimental }}
@@ -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@v6
65+
- uses: actions/upload-artifact@v7
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@v6
75+
- uses: actions/upload-artifact@v7
7676
with:
7777
name: java-artifacts
7878
path: |
@@ -87,7 +87,7 @@ jobs:
8787
strategy:
8888
fail-fast: false
8989
matrix:
90-
jdk: [ '17' ]
90+
jdk: [ '21' ]
9191
experimental: [ false ]
9292
status: [ "Stable" ]
9393
#
@@ -112,7 +112,7 @@ jobs:
112112
cache: maven
113113

114114
# Get the build output from the unit test job
115-
- uses: actions/download-artifact@v6
115+
- uses: actions/download-artifact@v8
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@v6
127+
- uses: actions/upload-artifact@v7
128128
with:
129129
name: java-reportdir
130130
path: java-reportdir.tar
@@ -140,12 +140,12 @@ jobs:
140140
- uses: actions/checkout@v6
141141
- uses: actions/setup-java@v5
142142
with:
143-
java-version: '17'
143+
java-version: '21'
144144
distribution: temurin
145145
cache: maven
146146

147147
# Get the build output from the integration test job
148-
- uses: actions/download-artifact@v6
148+
- uses: actions/download-artifact@v8
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
@@ -40,12 +40,12 @@ jobs:
4040
- uses: actions/checkout@v6
4141
- uses: actions/setup-java@v5
4242
with:
43-
java-version: '17'
43+
java-version: '21'
4444
distribution: 'adopt'
4545
server-id: central
4646
server-username: MAVEN_USERNAME
4747
server-password: MAVEN_PASSWORD
48-
- uses: actions/cache@v4
48+
- uses: actions/cache@v5
4949
with:
5050
path: ~/.m2
5151
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -66,9 +66,9 @@ jobs:
6666
- uses: actions/checkout@v6
6767
- uses: actions/setup-java@v5
6868
with:
69-
java-version: '17'
69+
java-version: '21'
7070
distribution: 'adopt'
71-
- uses: actions/cache@v4
71+
- uses: actions/cache@v5
7272
with:
7373
path: ~/.m2
7474
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -78,7 +78,7 @@ jobs:
7878
- name: Set up Maven Central Repository
7979
uses: actions/setup-java@v5
8080
with:
81-
java-version: '17'
81+
java-version: '21'
8282
distribution: 'adopt'
8383
server-id: central
8484
server-username: MAVEN_USERNAME

‎conf/jhove/jhove.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns="http://hul.harvard.edu/ois/xml/ns/jhove/jhoveConfig"
55
xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/jhove/jhoveConfig
6-
file:///usr/local/payara6/glassfish/domains/domain1/config/jhoveConfig.xsd">
6+
file:///usr/local/payara7/glassfish/domains/domain1/config/jhoveConfig.xsd">
77
<jhoveHome>/usr/local/src/jhove</jhoveHome>
88
<defaultEncoding>utf-8</defaultEncoding>
99
<tempDirectory>/tmp</tempDirectory>

‎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.5.3</keycloak.version>
103+
<keycloak.version>26.5.5</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>

0 commit comments

Comments
 (0)
⚡