Resolve merge conflicts to master #281
Merged
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
* Bump minimatch and mocha (#263) Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.1.2 and updates ancestor dependency [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together. Updates `minimatch` from 3.0.4 to 3.1.2 - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) Updates `mocha` from 5.2.0 to 10.2.0 - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](mochajs/mocha@v5.2.0...v10.2.0) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: mocha dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add rangeElementDescription.json schema file and updates the attribute.json file to reference it. Example provided. * fix required * changes to array of strings and fill out examples * Remove Old Files (#270) * Remove Old Files * Update Version * Update README.md * Bugfix - Data Quality (#269) * Update .gitignore * Fix Data Quality Evaluation Method Change from array to single object. * Update Version * Update package-lock.json * Update beta version * Reordering DQ Report Properties * Fix Required Data Quality Properties * Fix Required List * Fix Report Schema * Add Additional Enum Options * Add Required * Fix Evaluation Method Changed dateTime to an array. Added enum options for type. * Add Required * Add Required Fields * Add Descriptions * add maxItem rule to schema * Update standaloneQualityReport.json * Updates Version numbers. Requirements. Add derivedElementReport. Cleanup rangeElementDescription. * Update dataQuality.json Remove max items. It does not appear to do anything. * Remove beta from version * Fix Coverage Result Add qualityResultFile. Update required fields. * Fix Coverage Result resultContent is actually resultContentDescription and is a Coverage Description object not an array. * Fix Required Fields --------- Co-authored-by: Jonathan Oliveros <joliveros@xentity.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonathan Oliveros <joliveros@xentity.com>
hmaier-fws
approved these changes
Jan 23, 2024
hmaier-fws
added a commit
that referenced
this pull request
Jan 23, 2024
commit d01223e Author: Johnathan <jwaspin@users.noreply.github.com> Date: Tue Jan 23 10:39:57 2024 -0700 Resolve conflicts attempt number 2 (#282) * Release v2.8.2 (#275) * Bump minimatch and mocha (#263) Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.1.2 and updates ancestor dependency [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together. Updates `minimatch` from 3.0.4 to 3.1.2 - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) Updates `mocha` from 5.2.0 to 10.2.0 - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](mochajs/mocha@v5.2.0...v10.2.0) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: mocha dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add rangeElementDescription.json schema file and updates the attribute.json file to reference it. Example provided. * fix required * changes to array of strings and fill out examples * Remove Old Files (#270) * Remove Old Files * Update Version * Update README.md * Bugfix - Data Quality (#269) * Update .gitignore * Fix Data Quality Evaluation Method Change from array to single object. * Update Version * Update package-lock.json * Update beta version * Reordering DQ Report Properties * Fix Required Data Quality Properties * Fix Required List * Fix Report Schema * Add Additional Enum Options * Add Required * Fix Evaluation Method Changed dateTime to an array. Added enum options for type. * Add Required * Add Required Fields * Add Descriptions * add maxItem rule to schema * Update standaloneQualityReport.json * Updates Version numbers. Requirements. Add derivedElementReport. Cleanup rangeElementDescription. * Update dataQuality.json Remove max items. It does not appear to do anything. * Remove beta from version * Fix Coverage Result Add qualityResultFile. Update required fields. * Fix Coverage Result resultContent is actually resultContentDescription and is a Coverage Description object not an array. * Fix Required Fields --------- Co-authored-by: Jonathan Oliveros <joliveros@xentity.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonathan Oliveros <joliveros@xentity.com> * Re-add package-lock.json * Update README.md --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonathan Oliveros <joliveros@xentity.com> commit a822180 Author: Johnathan <jwaspin@users.noreply.github.com> Date: Tue Jan 23 10:28:41 2024 -0700 Release v2.8.2 (#275) (#281) * Bump minimatch and mocha (#263) Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.1.2 and updates ancestor dependency [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together. Updates `minimatch` from 3.0.4 to 3.1.2 - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) Updates `mocha` from 5.2.0 to 10.2.0 - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](mochajs/mocha@v5.2.0...v10.2.0) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: mocha dependency-type: direct:development ... * Add rangeElementDescription.json schema file and updates the attribute.json file to reference it. Example provided. * fix required * changes to array of strings and fill out examples * Remove Old Files (#270) * Remove Old Files * Update Version * Update README.md * Bugfix - Data Quality (#269) * Update .gitignore * Fix Data Quality Evaluation Method Change from array to single object. * Update Version * Update package-lock.json * Update beta version * Reordering DQ Report Properties * Fix Required Data Quality Properties * Fix Required List * Fix Report Schema * Add Additional Enum Options * Add Required * Fix Evaluation Method Changed dateTime to an array. Added enum options for type. * Add Required * Add Required Fields * Add Descriptions * add maxItem rule to schema * Update standaloneQualityReport.json * Updates Version numbers. Requirements. Add derivedElementReport. Cleanup rangeElementDescription. * Update dataQuality.json Remove max items. It does not appear to do anything. * Remove beta from version * Fix Coverage Result Add qualityResultFile. Update required fields. * Fix Coverage Result resultContent is actually resultContentDescription and is a Coverage Description object not an array. * Fix Required Fields --------- --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonathan Oliveros <joliveros@xentity.com> commit 87ee4c2 Author: Johnathan <jwaspin@users.noreply.github.com> Date: Tue Jan 23 10:11:24 2024 -0700 Bugfix/gem version number (#278) * Increment Ruby Gem Version Incremented to 2.8.2 * Update package-lock.json commit 190d591 Merge: c788fee b88a83d Author: Johnathan Aspinwall <jwaspin@gmail.com> Date: Mon Jan 22 15:16:52 2024 -0700 Merge branch 'dev' into develop commit b88a83d Author: Johnathan <jwaspin@users.noreply.github.com> Date: Mon Jan 22 12:19:06 2024 -0700 Bugfix - Data Quality (#269) * Update .gitignore * Fix Data Quality Evaluation Method Change from array to single object. * Update Version * Update package-lock.json * Update beta version * Reordering DQ Report Properties * Fix Required Data Quality Properties * Fix Required List * Fix Report Schema * Add Additional Enum Options * Add Required * Fix Evaluation Method Changed dateTime to an array. Added enum options for type. * Add Required * Add Required Fields * Add Descriptions * add maxItem rule to schema * Update standaloneQualityReport.json * Updates Version numbers. Requirements. Add derivedElementReport. Cleanup rangeElementDescription. * Update dataQuality.json Remove max items. It does not appear to do anything. * Remove beta from version * Fix Coverage Result Add qualityResultFile. Update required fields. * Fix Coverage Result resultContent is actually resultContentDescription and is a Coverage Description object not an array. * Fix Required Fields --------- Co-authored-by: Jonathan Oliveros <joliveros@xentity.com> commit 0503dc2 Author: Johnathan <jwaspin@users.noreply.github.com> Date: Wed Dec 20 13:32:38 2023 -0700 Remove Old Files (#270) * Remove Old Files * Update Version * Update README.md commit 7bd1405 Author: Jonathan Oliveros <joliveros@xentity.com> Date: Tue Dec 19 15:43:55 2023 -0700 changes to array of strings and fill out examples commit 1bd0c93 Author: Jonathan Oliveros <joliveros@xentity.com> Date: Tue Dec 19 13:50:58 2023 -0700 fix required commit 5749135 Author: Jonathan Oliveros <joliveros@xentity.com> Date: Mon Dec 11 16:56:37 2023 -0700 Add rangeElementDescription.json schema file and updates the attribute.json file to reference it. Example provided. commit 89e8f2c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jun 26 18:09:40 2023 -0800 Bump minimatch and mocha (#263) Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.1.2 and updates ancestor dependency [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together. Updates `minimatch` from 3.0.4 to 3.1.2 - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) Updates `mocha` from 5.2.0 to 10.2.0 - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](mochajs/mocha@v5.2.0...v10.2.0) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: mocha dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.
Fixing merge conflicts (no associated issues)
Hopefully this works - no files changed. Conflict was with package-lock.json