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

Sync CDOT dev with USDOT dev & update logback version #56

Merged
merged 4 commits into from
Jan 31, 2024

Conversation

dmccoystephenson
Copy link
Member

Problem

There is a merge conflict with usdot-jpo-ode#522.

Solution

The latest changes from USDOT dev have been pulled in & the logback version has been updated to 1.4.14, same as it was before.

Testing

The program compiled successfully using mvn locally.

dependabot bot and others added 4 commits December 5, 2023 21:57
Bumps [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13.
- [Commits](qos-ch/logback@v_1.2.9...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…ven/ch.qos.logback-logback-core-1.2.13

Bump ch.qos.logback:logback-core from 1.2.9 to 1.2.13
@drewjj
Copy link
Collaborator

drewjj commented Jan 31, 2024

This does seem to make the sonar fail for some reason.

@drewjj drewjj merged commit e673011 into dev Jan 31, 2024
2 of 4 checks passed
@drewjj drewjj deleted the resolve-merge-conflicts-1-31-2024 branch January 31, 2024 19:26
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