Skip to content

[pull] main from DSpace:main #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 8 commits into from
Mar 3, 2026
Merged

[pull] main from DSpace:main #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c224b6
build(deps): bump com.fasterxml.jackson.core:jackson-core
dependabot[bot] Mar 1, 2026
20d5c9d
build(deps): bump korthout/backport-action from 2 to 4
dependabot[bot] Mar 1, 2026
0cacb03
build(deps): bump actions/setup-java from 4 to 5
dependabot[bot] Mar 1, 2026
bac3865
build(deps): bump docker/build-push-action from 5 to 6
dependabot[bot] Mar 2, 2026
39f190a
Merge pull request #12008 from DSpace/dependabot/github_actions/korth…
tdonohue Mar 3, 2026
bd4ba64
Merge pull request #12055 from DSpace/dependabot/github_actions/docke…
tdonohue Mar 3, 2026
16cfd8f
Merge pull request #12015 from DSpace/dependabot/github_actions/actio…
tdonohue Mar 3, 2026
54cb2d1
Merge pull request #12044 from DSpace/dependabot/maven/com.fasterxml.…
tdonohue Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

# https://github.com/actions/setup-java
- name: Install JDK ${{ matrix.java }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codescan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

# https://github.com/actions/setup-java
- name: Install JDK
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: 21
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/port_merged_pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# Port PR to other branch (ONLY if labeled with "port to")
# See https://github.com/korthout/backport-action
- name: Create backport pull requests
uses: korthout/backport-action@v2
uses: korthout/backport-action@v4
with:
# Trigger based on a "port to [branch]" label on PR
# (This label must specify the branch name to port to)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/reusable-docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jobs:
- name: Build and push image to ${{ env.DOCKER_BUILD_REGISTRY }}
if: ${{ ! matrix.isPr }}
id: docker_build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
build-contexts: |
${{ inputs.dockerfile_additional_contexts }}
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
# with direct tarball export. This includes: dspace-dependencies, dspace-solr, dspace-postgres-loadsql
- name: Build and push image to local TAR file (docker-container driver)
if: ${{ matrix.arch == 'linux/amd64' && (!matrix.isPr || (inputs.build_id != 'dspace-prod' && inputs.build_id != 'dspace-test' && inputs.build_id != 'dspace-cli')) }}
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
build-contexts: |
${{ inputs.dockerfile_additional_contexts }}
Expand All @@ -255,7 +255,7 @@ jobs:
# The docker driver doesn't support tarball export, so we use 'load: true' and then 'docker save'.
- name: Build image (docker driver for local dependencies access)
if: ${{ matrix.arch == 'linux/amd64' && matrix.isPr && (inputs.build_id == 'dspace-prod' || inputs.build_id == 'dspace-test' || inputs.build_id == 'dspace-cli') }}
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
build-contexts: |
${{ inputs.dockerfile_additional_contexts }}
Expand Down
Loading