Skip to content

8720 merge conflicts#4

Merged
PaulBoon merged 701 commits intoPaulBoon:8720-allow-metadata-reExport-in-smaller-batchesfrom
pdurbin:8720-merge-conflicts
Sep 9, 2022
Merged

8720 merge conflicts#4
PaulBoon merged 701 commits intoPaulBoon:8720-allow-metadata-reExport-in-smaller-batchesfrom
pdurbin:8720-merge-conflicts

Conversation

@pdurbin
Copy link

@pdurbin pdurbin commented Sep 8, 2022

I'm trying to resolve merge conflicts in IQSS#8721

It looks like @landreev removed the updateLastExportTimeStamp method in 8135490 as part of PR IQSS#8782 so I made sure it's still gone in your PR.

qqmyers and others added 30 commits July 22, 2022 15:31
…sed-on-filename

File Recognition - Add support for files without extensions
…tro_correction

correct multi-license introductory description
…ges-bagit-handler

BagIt Support - Improve error messages for BagIt handler
Other small changes:

- Carve out space for advertising experimental metadata blocks.
- CodePlex is extinct. Remove and reorder source hosting.
- Tweaks to BagIt docs.
Moved "see .tsv version" link closer to the name of the metadatablock it's describing
Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
…s-create

8832 toa validation error on ds create
qqmyers and others added 24 commits August 18, 2022 08:57
…IQSS/7324_TRSA-HTTP-store

Simple support for remote web stores
…ow-metadata-blocks

Added new static facet to show metadata blocks with values
…GDCC/8449-use_original_files_in_archival_bag

GDCC/8449 use original files in archival bag
…GDCC/8605-add-archival-status

GDCC/8924 - Check archival status
…IQSS/8960-change_DRS_setting_name

Change setting name
Added LIP's repo with resources for an advanced installation as proposed by Philip Durbin.
add lip-computing/dataverse to prep.rst
…atches IQSS#8720

Conflicts:
src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java

It looks like @landreev removed the updateLastExportTimeStamp method
in 8135490 as part of PR IQSS#8782 so I made sure it's still gone.
@coveralls
Copy link

Pull Request Test Coverage Report for Build #15

  • 935 of 2815 (33.21%) changed or added relevant lines in 104 files are covered.
  • 42 unchanged lines in 23 files lost coverage.
  • Overall coverage increased (+0.8%) to 20.034%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/main/java/edu/harvard/iq/dataverse/Dataverse.java 9 10 90.0%
src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java 0 1 0.0%
src/main/java/edu/harvard/iq/dataverse/api/Users.java 0 1 0.0%
src/main/java/edu/harvard/iq/dataverse/api/datadeposit/SwordServiceBean.java 0 1 0.0%
src/main/java/edu/harvard/iq/dataverse/api/imports/ImportGenericServiceBean.java 6 7 85.71%
src/main/java/edu/harvard/iq/dataverse/api/util/JsonResponseBuilder.java 0 1 0.0%
src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java 0 1 0.0%
src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java 0 1 0.0%
src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java 0 1 0.0%
src/main/java/edu/harvard/iq/dataverse/util/bagit/BagValidation.java 35 36 97.22%
Files with Coverage Reduction New Missed Lines %
src/main/java/edu/harvard/iq/dataverse/api/DownloadInstanceWriter.java 1 8.07%
src/main/java/edu/harvard/iq/dataverse/dataaccess/FileAccessIO.java 1 69.47%
src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java 1 6.47%
src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java 1 0%
src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java 1 52.33%
src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java 1 0%
src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractSubmitToArchiveCommand.java 1 0%
src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java 1 64.29%
src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java 1 5.36%
src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java 1 3.25%
Totals Coverage Status
Change from base Build #14: 0.8%
Covered Lines: 15606
Relevant Lines: 77897

💛 - Coveralls

@PaulBoon PaulBoon merged commit 3e20442 into PaulBoon:8720-allow-metadata-reExport-in-smaller-batches Sep 9, 2022
PaulBoon pushed a commit that referenced this pull request Mar 22, 2023
PaulBoon pushed a commit that referenced this pull request Mar 22, 2023
PaulBoon pushed a commit that referenced this pull request Apr 18, 2024
rewrite :CVocConf docs, explain where to find readme.md
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.