Skip to content

merge develop into master for 6.12 - #12720

Merged
pdurbin merged 646 commits into
masterfrom
develop
Sep 17, 2026
Merged

pdurbin merged 646 commits into
masterfrom
develop

Conversation

@pdurbin

@pdurbin pdurbin commented Sep 17, 2026

Copy link
Copy Markdown
Member

What this PR does / why we need it:

Which issue(s) this PR closes:

  • Closes #

Special notes for your reviewer:

Suggestions on how to test this:

Does this PR introduce a user interface change? If mockups are available, please link/include them here:

Is there a release notes update needed for this change?:

Additional documentation:

ErykKul and others added 30 commits August 14, 2026 16:06
update keycloak conf to 26.7.0 and remove user-store-qa from persistence.xml used to create spi jar file.
…/setup-java-5.6.0

chore(deps): bump actions/setup-java from 5 to 5.6.0
Added a comment regarding Flyway usage for additional indexes to improve download count query performance.
Verified messages are coming from Bundle. IN addition to the issue noted by AI (The only latent (pre-existing, out of scope) oddity is at line 231-233 where messageSummary/third constructor arg ordering looks slightly off (parseMessages(errors) result assigned to messageSummary, then messageSummaryFail passed as the detail argument) — this bug predates this PR and isn't touched by it, just worth flagging separately if not already known.), as far as I can tell, the PasswordResetPage.resetPassword method tries to send a message to the UI but, due to the switch to the /dataverse.xhtml page, it isn't shown. Again, not related to the PR, so merging.
…login-action-4.5.2

chore(deps): bump docker/login-action from 4 to 4.5.2 - I asked AI, most of the changes were to OIDC login which we don't use, so not expecting any issues.
Bumps [docker/login-action](https://github.com/docker/login-action) from 4.5.2 to 4.6.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@v4.5.2...v4.6.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: 4.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.37.4 to 4.37.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v4.37.4...v4.37.7)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.37.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 5.6.0 to 5.7.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v5.6.0...v5.7.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: 5.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…/setup-java-5.7.0

chore(deps): bump actions/setup-java from 5.6.0 to 5.7.0
…codeql-action-4.37.7

chore(deps): bump github/codeql-action from 4.37.4 to 4.37.7
…login-action-4.6.0

chore(deps): bump docker/login-action from 4.5.2 to 4.6.0
…omponents.client5-httpclient5-5.6.3

chore(deps): bump org.apache.httpcomponents.client5:httpclient5 from 5.2.1 to 5.6.3
More JsonUtil additions and forbidden Json.* calls
…uild-failures-configbaker

Add retry logic to curl commands in configbaker Dockerfile
pdurbin and others added 19 commits September 11, 2026 09:45
Switch to Dataverse SPI 2.1.0-M1 release
…adcrumb-fix

IQSS 12692 - missing ui:params
…vard/487-fix-dataverse-mgmt-menu

Fix access to manage permissions menu
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.37.9 to 4.38.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v4.37.9...v4.38.0)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.38.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
As per discussion on Zulip, making this known to the public as interest has sparked. Marking it experimental, as it is a new, experimental feature.
docs(admin): add locally fair to list of features in admin guide
…codeql-action-4.38.0

chore(deps): bump github/codeql-action from 4.37.9 to 4.38.0
…/setup-java-6.0.1

chore(deps): bump actions/setup-java from 6.0.0 to 6.0.1
Clarify Locally FAIR description in admin guide
Co-authored-by: Oliver Bertuch <poikilotherm@users.noreply.github.com>
- Indent to fix numbering.
- We instead of Core Team.
- Typo: advise.
- Plan to rather than will.
warn that Payara 7.2026.9 doesn't "just work". Link to #12715
Comment on lines +168 to +184
needs: integration-test
name: Check for Secrets Availability
runs-on: ubuntu-latest
outputs:
available: ${{ steps.secret-check.outputs.available }}
steps:
- id: secret-check
# perform secret check & put boolean result as an output
shell: bash
run: |
if [ "${{ secrets.SONAR_TOKEN }}" != '' ]; then
echo "available=true" >> "$GITHUB_OUTPUT";
else
echo "available=false" >> "$GITHUB_OUTPUT";
fi

sonarcloud:
assertTrue(false, "Unexpected XMLStreamException when attempting to parse the dataDscr section: " + xse.getMessage());
} finally {
if (xmlr != null) {
try {xmlr.close();} catch (XMLStreamException e) {}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [reviewdog] <com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck> reported by reviewdog 🐶
'{' at column 21 should have line break after.

@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage is 25.412%develop into master. No base build found for master.

@github-actions

This comment has been minimized.

@pdurbin
pdurbin merged commit 9769107 into master Sep 17, 2026
41 of 48 checks passed
@pdurbin pdurbin added this to the 6.12 milestone Sep 17, 2026
@github-actions

Copy link
Copy Markdown

📦 Pushed preview images as

ghcr.io/gdcc/dataverse:develop
ghcr.io/gdcc/configbaker:develop

🚢 See on GHCR. Use by referencing with full name as printed above, mind the registry name.

@pdurbin pdurbin moved this from Merged 🚀 to Done 🧹 in IQSS Dataverse Project Sep 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done 🧹

Development

Successfully merging this pull request may close these issues.