Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pom for 1.x #80

Merged
merged 2 commits into from
Jun 24, 2020
Merged

Update pom for 1.x #80

merged 2 commits into from
Jun 24, 2020

Conversation

sarah-witt
Copy link
Collaborator

@sarah-witt sarah-witt commented Jun 24, 2020

Requirements for Contributing to this repository

  • Fill out the template below. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
  • The pull request must only fix one issue at the time.
  • The pull request must update the test suite to demonstrate the changed functionality.
  • After you create the pull request, all status checks must be pass before a maintainer reviews your contribution. For more details, please see CONTRIBUTING.

What does this PR do?

  • A dependency update was missed when cherry-picking commits from master
  • Also removes merge conflict
  • Note that this POM change is only needed for tests, an alternative approach would be to rewrite tests to not use assertThrows

Description of the Change

Alternate Designs

Possible Drawbacks

Verification Process

Additional Notes

Release Notes

Review checklist (to be filled by reviewers)

  • Feature or bug fix MUST have appropriate tests (unit, integration, etc...)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have one changelog/ label attached. If applicable it should have the backward-incompatible label attached.
  • PR should not have do-not-merge/ label attached.
  • If Applicable, issue must have kind/ and severity/ labels attached at least.

@github-actions github-actions bot added the documentation Documentation related changes label Jun 24, 2020
@sarah-witt sarah-witt marked this pull request as ready for review June 24, 2020 17:30
@sarah-witt sarah-witt added the changelog/Fixed Fixed features results into a bug fix version bump label Jun 24, 2020
@sarah-witt sarah-witt merged commit 503112e into 1.x Jun 24, 2020
@sarah-witt sarah-witt deleted the sarah/update-1.x-dep branch June 24, 2020 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/Fixed Fixed features results into a bug fix version bump documentation Documentation related changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants