Chore: sync main to dev #25
Merged
Conversation
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
…-versioning Update READMEs to reflect semantic versioning in JAR file paths
…-fork Sync WyoCV fork changes
Chore: sync trihydro fork
Conflicts: cv-data-controller/src/main/java/com/trihydro/cvdatacontroller/controller/ActiveTimController.java cv-data-controller/src/main/java/com/trihydro/cvdatacontroller/controller/MilepostController.java cv-data-controller/src/main/java/com/trihydro/cvdatacontroller/controller/RsuController.java cv-data-controller/src/main/java/com/trihydro/cvdatacontroller/model/DataControllerConfigProperties.java cv-data-controller/src/test/java/com/trihydro/cvdatacontroller/controller/ActiveTimControllerTest.java cv-data-service-library/src/main/java/com/trihydro/library/factory/KafkaFactory.java cv-data-service-library/src/main/java/com/trihydro/library/helpers/TimGenerationHelper.java cv-data-service-library/src/main/java/com/trihydro/library/service/WydotTimService.java cv-data-service-library/src/test/java/com/trihydro/library/service/WydotTimServiceTest.java cv-data-tasks/src/main/java/com/trihydro/tasks/actions/CleanupActiveTims.java ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/UtilityController.java ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/WydotTimBaseController.java ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/WydotTimBowrController.java ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/WydotTimCcController.java ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/WydotTimIncidentController.java ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/WydotTimParkingController.java ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/WydotTimRcController.java ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/WydotTimRwController.java ode-wrapper/src/main/java/com/trihydro/odewrapper/controller/WydotTimVslController.java ode-wrapper/src/main/java/com/trihydro/odewrapper/helpers/SetItisCodes.java ode-wrapper/src/test/java/com/trihydro/odewrapper/WydotTimRcControllerTest.java ode-wrapper/src/test/java/com/trihydro/odewrapper/WydotTimRwControllerTest.java rsu-data-controller/src/test/java/com/trihydro/rsudatacontroller/service/RsuServiceTest.java
pmonington
approved these changes
Dec 1, 2025
dmccoystephenson
approved these changes
Dec 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR pulls the changes from https://dev.azure.com/trihydro/CV/_git/WyoCV via Trihydro#60 and #24. No logic changes were made during the process, so everything in this code has been tested in real-world deployments.
This is the last step in the process needed to align WyoCV with CDOT-CV's fork of TIM-Manager. We need these changes to support the CTW work for CDOT and others.
How was this tested?
mvn clean verify