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.

Sign up for GitHub

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

Jump to bottom

Merge candidate_r1 into master #539

Merged
merged 127 commits into from
Feb 26, 2024
Merged

Merge candidate_r1 into master #539

merged 127 commits into from
Feb 26, 2024

Conversation

SaikrishnaBairamoni
Copy link
Contributor

@SaikrishnaBairamoni SaikrishnaBairamoni commented Feb 26, 2024 •
edited by dan-du-car
Loading

PR Details

This PR merges the release candidate branch into the master branch for the Q1 2024 release.

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
    ODE Contributing Guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

payneBrandon and others added 30 commits September 26, 2019 10:45
@payneBrandon
Merge pull request #3 from Trihydro/sdx-update
fb99415 
SDX update
@payneBrandon
Merge remote-tracking branch 'upstream/dev' into dev
f61e599
@payneBrandon
Merge branch 'usdot-jpo-ode:dev' into dev
a3b55d1
@Michael7371
started updates for PSM data feed
b5f8d21
@Michael7371
updated enums to uppercase
dcd785e
@Michael7371
updates to psmBuilder for required parameters
95d1782
@Michael7371
unit test progress
413934d
@Michael7371
updates for psmbuilder and associated POJOs
2bd88df
@Michael7371
working psm ingest and processing
91aeaa4
@Michael7371
adding topic creation for psm
f479c21
@Michael7371
updates
3e186b2
@Michael7371
updated reference to submodules
e316993
@Michael7371
Merge remote-tracking branch 'upstream/develop' into psm-data-feed
f6df692
@Michael7371
remove unnecessary changes
a4f695a
@Michael7371
Merge remote-tracking branch 'upstream/develop' into psm-data-feed
ac69c72
@Michael7371
added unit tests and removed unnecessary changes.
4ffc684
@Michael7371
un-commented services
71c66e9
@Michael7371
updated udp_ip to use env variable
e05ea5f
@Michael7371
removed unnecessary comment
56d7811
@Michael7371
initial commit with working ingest on bsm type messages
36de40d
@Michael7371
added schema link for psm to doc readme
d1ad1e4
@Michael7371
added generic receiver classes
acf570b
@Michael7371
updates for rx tim message processing
92cd295
@Michael7371
updates for more generic receiver.
aeca341
@Michael7371
updates to dataflow
fe8866e
@Michael7371
addressing PR comments.
a28c5ec
@Michael7371
updated TMC environment figure
5f9af98
@Michael7371
updates for driverAlert logs and refactoring new line handling
7749c03
@Michael7371
updates to allow processing of old logs (without new line characters)
7181f9f
@Michael7371
updates to processing
dc765c2
drewjj and others added 28 commits January 31, 2024 12:26
@drewjj
Merge pull request #56 from CDOT-CV/resolve-merge-conflicts-1-31-2024
e673011 
Sync CDOT dev with USDOT dev & update logback version
@Michael7371
initial fixes from pr comments
239fafd
@Michael7371
pulled wsmp header length into a constant
ae1cbe6
@dmccoystephenson
Merge pull request #57 from CDOT-CV/usdot-merge-fixes
86f3d48 
USDOT PSM/Log Offloading Fixes
@dan-du-car
Merge pull request #522 from CDOT-CV/dev
85a25a8 
PSM Data Feed Support, DockerHub Docs, Commsignia Log Offloading Support
@dan-du-car
Merge pull request #532 from Trihydro/develop
0de0068 
Addition of Expiration Date meta data for tracking in the SDX
@drewjj
Update CI
1164ba9
@drewjj
Merge pull request #58 from CDOT-CV/ci-testing
373de19 
Update CI
@dan-du-car
Merge pull request #533 from CDOT-CV/dev
10ca681 
CI Update
@dmccoystephenson
Added info on breaking changes to release notes for 1.6.0
1a080d0
@dmccoystephenson
Added specific info on TIM field renamings to breaking changes sectio…
2633900 
…n of 1.6.0 release notes
@drewjj
Update CI
18c69f1
@drewjj
Trying CI without submodules
75c803b
@drewjj
Add cd workspace to ci
a75786e
@drewjj
Completely rework the sonar CI
5289681
@drewjj
Add sonar to pom
5494303
@drewjj
Change target location for ci
b58e970
@drewjj
Giving up and reverting it all back
857310c
@Michael7371
log processing fix
74830ad
@Michael7371
added comment for removeHeader function
1b8284c
@Michael7371
Merge pull request #61 from CDOT-CV/log-processing-bug-fix
0dc3c22 
Log processing bug fix
@dan-du-car
Merge pull request #535 from CDOT-CV/dev
6f3f426 
Log Processing Bug Fix
@SaikrishnaBairamoni
Merge pull request #536 from usdot-jpo-ode/develop
fd909a0 
merge Log Processing Bug Fix to candidate_r1 branch
@payneBrandon
Merge pull request #534 from CDOT-CV/docs/add-j2735-warning-to-releas…
c9a7429 
…e-notes

Added info on breaking changes to release notes for 1.6.0
@dmccoystephenson
Updated version to 2.0.0-SNAPSHOT
eb41010
@dmccoystephenson
Updated release notes
538ad91
@dan-du-car
Merge pull request #537 from CDOT-CV/pom/update-version-to-2.0.0-SNAP…
ab22739 
…SHOT

Updated version to 2.0.0-SNAPSHOT
@dan-du-car
Merge pull request #538 from usdot-jpo-ode/develop
eef2915 
Sync `candidate_r1` with `develop`
@SaikrishnaBairamoni SaikrishnaBairamoni merged commit 967a238 into master Feb 26, 2024
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dan-du-car dan-du-car dan-du-car approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@SaikrishnaBairamoni @dan-du-car @payneBrandon @Michael7371 @drewjj @dmccoystephenson @mwodahl @Ryan-Roan