Skip to content

Release#311

Merged
landonreed merged 13 commits intomasterfrom
dev
Apr 9, 2021
Merged

Release#311
landonreed merged 13 commits intomasterfrom
dev

Conversation

@br648
Copy link
Copy Markdown
Collaborator

@br648 br648 commented Apr 9, 2021 •
edited
Loading

Checklist

  • Appropriate branch selected (all PRs must first be merged to dev before they can be merged to master)
  • Any modified or new methods or classes have helpful JavaDoc and code is thoroughly commented
  • The description lists all applicable issues this PR seeks to resolve
  • The description lists any configuration setting(s) that differ from the default settings
  • All tests and CI builds passing
  • The description lists all relevant PRs included in this release (remove this if not merging to master)
  • Code coverage does not significantly worsen (ideally it improves) (remove this if not merging to master)

Description

This release PR aims to merge the following PRs into the master branch.

Relevant PRs included in this release:

JUnit Upgrade - #309
Update high severity types - #310

semantic-release-bot and others added 12 commits March 8, 2021 12:18
@semantic-release-bot @landonreed
6.2.0 [ci skip]
5532784
@semantic-release-bot @landonreed
6.2.1 [ci skip]
19916de
@semantic-release-bot @landonreed
6.2.2 [ci skip]
3bd74f7
@landonreed
Prepare next development iteration 6.2.3-SNAPSHOT
b59b602
refactor(JUnit upgrade): Updated JUnit from 4 to 5
0ea501e
refactor(GTFSMainTest): Removed obsolete comment.
6edaf5c
refactor(Addressed PR feedback): Removed redundant timeout assertion …
9002d05 
…and correct assertion static im
refactor(GTFSGraphQLTest): Reinstated timeout assertions
1200e6b
@evansiroky
Merge pull request #309 from conveyal/junit-upgrade
9ebf89b 
JUnit Upgrade
refactor(NewGTFSErrorType): Reduce three error types from HIGH to MEDIUM
fe427bb 
The error types ROUTE_UNUSED, STOP_GEOGRAPHIC_OUTLIER and STOP_LOW_POPULATION_DENSITY are now
classed as medimum severity types.
fix(NewGTFSErrorType.java): Modified error priority and added javadoc
18b1e92
@landonreed
Merge pull request #310 from conveyal/update-high-severity-types
7ee0b08 
Update high severity types
@br648
Copy link
Copy Markdown
Collaborator Author

br648 commented Apr 9, 2021 •
edited
Loading

@landonreed as this is the first time doing this and because there is a merge conflict, I want to run this pass you before making any updates. This is the merge conflict in question:

<<<<<<< HEAD
  <version>6.2.3-SNAPSHOT</version>
=======
  <version>6.2.2</version>
>>>>>>> master

Is this just a case of merging master into dev, bumping the version to 6.2.3 and commiting?

@landonreed
Copy link
Copy Markdown
Contributor

landonreed commented Apr 9, 2021 •
edited
Loading

@br648, I just pushed a merge commit (8d0a19f) that keeps the version at 6.2.3-SNAPSHOT. I think this was just the result of semantic-release not completing fully during the last release (e.g., the version bump commit not getting published or something of that nature).

@landonreed landonreed merged commit d9418bb into master Apr 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@landonreed landonreed landonreed approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@br648 @landonreed @semantic-release-bot @evansiroky