Resolve 2026 q2 conflicts#231
Merged
Merged
Conversation
…ctor UdpHexDecoder to extract and log untrimmed payload hex
* Use pojos submodule with json schemas in resources * Update pojos submodule: maven version # * Use pojos 1.2.0-alpha2. Update json-schema-validator version to 1.0.88 for tests * Update version in poms * Fix distribution management * package write permission * update versions * Update in submodule: use message frame schemas * fix version
…-ode#594) * Update ci.yml * remove unused sonar propetites file
* configure listener concurrency * concurrency setting * Fix test that fails in ci * tim test diagnostic * error logging * seek to end/autocommit * Revert test change; only set autocommit * +seek to end * test log back to OFF * add env var to docker-compose
…erage Enable JaCoCo coverage reporting for SonarCloud
* Update pojos test procedure
* Adding port remapping receiver configurations * Updated port map receiver to use application.yaml file config * Adding log statement for the receiver configurations * Switched port mapped receiver to inherit functionallity from Generic Receiver * Removing unused variables from port-mapped receiver * Removing unused imports * Adding port-mapped receiver description to readme * Removing unused imports * Removing imports entirely
Co-authored-by: John-Wiens <jwiens@neaeraconsulting.com>
….1 strings end with expected values across multiple receiver test classes.
…o-commit interval and add fetch-max-wait, retries, and linger.ms properties.
* Add env var for adm processes. Update submodules. Update pojos dependency version. * update pojos version * Add details on how to test acm to release process * Clarify which repo to run acm test in * clarify how to set profiles * fix typo * set ode concurrency to 1
* Update stage 1 release submodules for the 2026-Q2 release * Update the compatability matrix and the jpo-ode version * Update release notes * Update module pom version numbers to match the parent * Update jpo-asn version * Update release notes to include new environment variables for ACM processes and test process enhancements. --------- Co-authored-by: Michael7371 <40476797+Michael7371@users.noreply.github.com>
…type and improve packet description for troubleshooting.
… to include KAFKA_AUTO_COMMIT_INTERVAL environment variable; enhance README with architecture module reference and improve documentation structure in Architecture.md.
…ove error logging for header stripping failures. Update multiple receiver tests to remove assertions on ASN.1 string endings, ensuring consistency across test cases.
…ngs in JSON output. Update tests to validate that metadata matches CodecUtils serialization, enhancing reliability across various message types.
…c OdeMsgPayload type. Update multiple receiver tests to utilize parameterized tests for improved readability and maintainability, ensuring consistent setup and teardown processes across test classes. Reverting default UDP receiver tests to use unsigned messaging. Added additional tests with signed messages.
…ecting enhancements in jpo-ode functionality, including offline JSON schema support and new port remapping configuration.
Fix/merge usdot q2 changes
2026 Q2 Updates - Neaera Fork
Merge Release/2026 q2 into master
Merge Master into Dev for 2026-Q2
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
drewjj
requested review from
Michael7371,
Russ-Garrett-Trihydro,
iyourshaw,
payneBrandon and
rylee-s
Collaborator
Author
|
Ignoring the Copilot PortMapped comments for now. I did not need to modify this file for the merge conflict resolution. Changing released code can be handled through additional feature branches if there is a need to do so. |
iyourshaw
approved these changes
Jun 19, 2026
iyourshaw
left a comment
iyourshaw
left a comment
Collaborator
There was a problem hiding this comment.
looks good
Verified that:
- Unit tests pass
- Integration tests pass (udp sender scripts produce expected messages in kafka while running in Docker with COMPOSE_PROFILES=ode,adm,kafka,kafka_setup,kafka_ui)
Michael7371
approved these changes
Jun 19, 2026
Michael7371
left a comment
Michael7371
left a comment
There was a problem hiding this comment.
- Unit tests pass
- Log file processing is functional
- UDP sender scripts process data as expected
Looks good!
pmonington
approved these changes
Jun 22, 2026
pmonington
left a comment
pmonington
left a comment
There was a problem hiding this comment.
The tests pass, and the changes look good to me. One suggestion (non-blocking): we may want to bump the version to 7.0.0 instead of 6.0.1. This PR effectively merges the 6.0.0 release changes into CDOT's 6.0.0 (with the Spring Boot upgrade) which introduces breaking changes. Moving to the next major version (7.0.0) might better reflect the significance of the combined changes.
payneBrandon
requested changes
Jun 22, 2026
payneBrandon
left a comment
payneBrandon
left a comment
There was a problem hiding this comment.
Just a couple comments/questions. Looking good!
…ortMappedConfigurableReceiver.java Co-authored-by: Brandon Payne <bpayne@trihydro.com>
…V/jpo-ode into resolve-2026-q2-conflicts
…s from the 2026-q2 release's 6.0.0
Collaborator
Author
I have incremented the jpo-ode version to 7.0.0-alpha1 since you are right about this more reasonably needing a major version update. I am adding the alpha component to it to differentiate this version from what will eventually be 2026-Q3's 7.0.0 while we still can make further changes to this repository. Future updates can increment the alpha version instead leading up to 2026-Q3. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
PR Details
Description
This pull request is the substitute for a proper sync with the upstream USDOT jpo-ode since upstream doesn't sync properly with the current CDOT-CV develop branch without merge conflicts. This branch began as a branch from the upstream/develop branch and then had the CDOT-CV/develop branch merged into it. The conflicts were then resolved with an effort to maintain both sets of updates.
The conflict resolution fix commit is the following: 0616718
Major changes:
Related Issue
N/A
Motivation and Context
The CDOT-CV fork needs to have the latest jpo-ode changes from USDOT so resolving the conflicts will be necessary for future development of the jpo-ode.
How Has This Been Tested?
Through local maven unit test runs and through Docker with some of the UDP endpoints. Functionally the jpo-ode has not changed. The conflicts primarily revolved around the unit tests.
Types of changes
Checklist:
ODE Contributing Guide