Skip to content

Merge Dev-flex into Dev - #32

Merged
br648 merged 377 commits into
devfrom
dev-flex
Sep 17, 2026
Merged

br648 merged 377 commits into
devfrom
dev-flex

Conversation

@br648

@br648 br648 commented Aug 19, 2026 •

Copy link
Copy Markdown

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

Merge flex into dev! Need to consider DB migration.

Robin Beer and others added 30 commits March 21, 2022 15:17
The contents of the older comment were more useful!
…ause it is causing the Jit Pack

This update has been cherry picked from dev
…nit tests

The merge of dev-flex (delete cascade updates) into flex-table-additions removed the pattern
reconciliation tests
…e is no longer required

This commit will match the commit hash of 6c471f9
The location group table reference hasn't be created at this point which was causing all sorts of
fun.
@br648 br648 changed the title Dev flex Merge Dev-flex into Dev Aug 19, 2026

@miles-grant-ibigroup miles-grant-ibigroup left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DB migration is fine! It's been tested thoroughly in production

@binh-dam-ibigroup binh-dam-ibigroup left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Soo many files! Blocking: Please remove the <<<<< HEAD merge remnants and delete the AWS SDK S3 dependency. Not blocking: Consider updating the URL for the GTFS spec to gtfs.org. I give a pass on formatting etc.

Comment thread out/artifacts/gtfs_lib/simplelogger.properties Outdated
Comment thread src/main/java/com/conveyal/gtfs/loader/JdbcGtfsExporter.java Outdated
Comment thread src/main/java/com/conveyal/gtfs/loader/JdbcGtfsExporter.java Outdated
Comment thread src/main/java/com/conveyal/gtfs/loader/ReferenceTracker.java Outdated
Comment thread src/main/java/com/conveyal/gtfs/loader/Table.java Outdated
Comment thread src/main/java/com/conveyal/gtfs/loader/Table.java Outdated
Comment thread src/main/java/com/conveyal/gtfs/validator/FlexValidator.java Outdated
Comment thread pom.xml Outdated

@binh-dam-ibigroup binh-dam-ibigroup left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drums rumbling...

@br648
br648 merged commit 065d51c into dev Sep 17, 2026
2 checks passed
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.

4 participants