Skip to content

Comments

merge 5.11.1 hotfix into develop#8884

Merged
kcondon merged 16 commits intodevelopfrom
8883-merge-5.11.1-hotfix-to-develop
Aug 3, 2022
Merged

merge 5.11.1 hotfix into develop#8884
kcondon merged 16 commits intodevelopfrom
8883-merge-5.11.1-hotfix-to-develop

Conversation

@pdurbin
Copy link
Member

@pdurbin pdurbin commented Aug 2, 2022

What this PR does / why we need it:

We need the bug fixes from 5.11.1 as well as the version change.

Which issue(s) this PR closes:

Closes #8883

Special notes for your reviewer:

In this pull request should we go ahead and rename

V5.11.0.1__8605-support-archival-status.sql

to

V5.11.1.1__8605-support-archival-status.sql

? Or should we create a separate pull request for that?

Suggestions on how to test this:

Make sure the API test pass.

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

No.

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

No.

Additional documentation:

There's a preview of an updated "making releases" page in the dev guide that covers this "merge hotfix into develop" step: https://dataverse-guide--8877.org.readthedocs.build/en/8877/developers/making-releases.html

Here's that pull request:

kcondon and others added 16 commits April 6, 2022 15:08
and we don't want that in a check of the terms
FWIW: looking for the dataset.getThumbnailFile.getFileMetadata() in the filesToDelete list fails in the delete from a published version case (assuming getFileMetadata() doesn't return the dynamically created fmd for the new draft version)
Add suggestion on detecting destroyed datasets.

Add milestone.
Added some bold-faced upgrade guidelines (using language suggested by @qqmyers and my own)
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.001%) to 19.727% when pulling 0f185b5 on 8883-merge-5.11.1-hotfix-to-develop into 751a008 on develop.

@qqmyers
Copy link
Member

qqmyers commented Aug 2, 2022

I don't think the flyway name should change. Anyone who deployed 5.11 will have that in the db already and renaming would cause it to be added as a new row and run again. For those who didn't upgrade to 5.11, the flyway name still works. (AFAIK flyway looks in numerical order and applies all the missing ones, not just those associated with the latest version, so the old name should work for this case as well.)

InputStream xmlStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setValidating(true);
//factory.setValidating(true);
Copy link
Member

Choose a reason for hiding this comment

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

Should this be removed?

@kcondon kcondon self-assigned this Aug 3, 2022
@kcondon kcondon merged commit af22d3f into develop Aug 3, 2022
@kcondon kcondon deleted the 8883-merge-5.11.1-hotfix-to-develop branch August 3, 2022 13:40
@pdurbin pdurbin added this to the 5.11.1 milestone Aug 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

merge 5.11.1 hotfix into develop

6 participants