Merge/fix build #139
Merged
Merge/fix build #139
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Note that when you upload a mix of files that go through ingest and some succeed and some fail, the failure message is sent.
- Only list files that failed ingest. - Remove "(Error)" from next to file name. - Change "file(s)" to "files". - Remove "Dataverse" to avoid having to say "Dataverse Software".
We decided the "dataset management" page has more context. Previously, the standard guides server base URL and "latest" was hard coded.
"scram-sha-256" is the new "md5" in pg_hba.conf
- rewrite sentence for .tab - link to "the guides" not "see the guides" - only have the last link (to "the guides")
…release after next (IQSS#8309)
Postgres 9.x EOL messaging, release notes updates for Postgres 10
improve messaging for ingest failures, file upload IQSS#8096
Conflicts: src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
this is a difference from develop and looks related to the Jacoco error in the build log. Since it doesn't look related to the branch, let's revert.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges with develop as of today to resolve a new conflict and reverts a change in the pom related to Jacoco that appears to be the cause of the build failure (and not related to multilicense at all). Hopefully this will build cleanly now.