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 release/2024-q2 into master #550

Merged
merged 161 commits into from
Jun 14, 2024
Merged

Merge release/2024-q2 into master #550

merged 161 commits into from
Jun 14, 2024

Conversation

SaikrishnaBairamoni
Copy link
Contributor

PR Details

This PR merges the release candidate branch into the master branch for the Q2 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.

dmccoystephenson and others added 30 commits January 29, 2024 15:08
@dmccoystephenson
Modified Asn1EncodedDataRouter to strip 1609.2 headers from unsigned …
42b497e 
…tims if present
@dmccoystephenson
[maven-release-plugin] prepare release jpo-ode-1.3.0
d28f630
@dmccoystephenson
Added more debug messages
bcf520d
@mwodahl
Update msgRepeatOptions value
d8e9bc5
@mwodahl
docker-compose update
431e3b9
@mwodahl
Merge remote-tracking branch 'origin/dev' into Update/kafka-version
ba153ea
@payneBrandon
Merge pull request #60 from CDOT-CV/Update/1218-msgRepeatOptions
0e8e3f4 
Update msgRepeatOptions value
@mwodahl
Remove unnecessary ports
e9fa119
@mwodahl
Update quickstart-compose.yml
094a8c0
@mwodahl
.devcontainer update
c85ff64
@mwodahl
docs update
3c81180
@mwodahl
add /kafka/ directory to .gitignore
12e9004
@drewjj
Merge pull request #59 from CDOT-CV/Update/kafka-version
bb5b66c 
Kafka version update
@dan-du-car
Merge pull request #540 from usdot-jpo-ode/master
91b0289 
Sync Develop with Master Branch
@dmccoystephenson
Merge branch 'usdot-jpo-ode:develop' into dev
a644c88
@dmccoystephenson
Merge branch 'dev' into 1609dot2/strip-1609dot2-header-from-unsigned-…
165c069 
…messages
@dmccoystephenson
Modified pom.xml to correct merge error
41ff504
@mwodahl
Trim nanoseconds in snmpTimestampFromIso
97ae449
@dmccoystephenson
Modified isHeaderPresent() method
b75b54f
@dmccoystephenson
Merge remote-tracking branch 'origin/hotfix/hotfix_2.0.1' into 1609do…
e25246c 
…t2/strip-1609dot2-header-from-unsigned-messages
@dan-du-car
Merge pull request #542 from usdot-jpo-ode/master
7b9f559 
Sync Master to develop
@dmccoystephenson
Merge branch 'usdot-jpo-ode:develop' into dev
22e0986
@payneBrandon
Merge pull request #62 from CDOT-CV/Bugfix/snmp-timestamp-trim
927ba44 
Trim Nanoseconds from snmpTimestampFromIso
@dmccoystephenson
Cleaned up changes to Asn1EncodedDataRouter class
e4210eb
@dmccoystephenson
Merge branch 'dev' into 1609dot2/strip-1609dot2-header-from-unsigned-…
2101d56 
…messages
@drewjj
1609.2 headers saved in kafka and log offload and UDP endpoints pipel…
87623c9 
…ines merged. Currently only support BSM for both
@drewjj
Update the rest of the Asn1Decode scripts
865b97e
@drewjj
Update all receivers to output OdeData type Strings
e67320d
@drewjj
Updated handling of some message types
80e5c5d
@mwodahl
Add SNMP type .env variable
70fd7fb
dmccoystephenson and others added 26 commits June 4, 2024 10:15
@dmccoystephenson
Removed start flags from OdeProperties class
4e64fce
@dmccoystephenson
Updated submodule compatibility guide for ODE v2.1.0
1ee1673
@dmccoystephenson
Merge pull request #80 from CDOT-CV/docs/update-release-notes-2024-q2
7ff2d04 
Updated `Release_notes.md` for 2.1.0 release
@dmccoystephenson
Merge pull request #85 from CDOT-CV/docs/update-submodule-compatibili…
7f21669 
…ty-guide-for-ode-2024-q2-release

Updated submodule compatibility guide for 2024 Q2 release
@dmccoystephenson
Merge branch 'dev' into resolving-merge-conflicts-6-3-2024
6b7b363
@payneBrandon
Merge pull request #84 from CDOT-CV/resolving-merge-conflicts-6-3-2024
3a37de7 
Resolving merge conflicts on USDOT ODE PR
@dmccoystephenson
Created detailed documentation for quarterly release process
477216d
@dmccoystephenson
Adjusted hotfix-during-validation process in 'quarterly release' summ…
133365c 
…ary in Contributing Guide
@dmccoystephenson
Adjusted testing acceptance criteria in release_process.md
af2dadc
@dmccoystephenson
Added detailed documentation for the standalone hotfix release process
9d0cd4e
@dmccoystephenson
Adjusted capitalization in release_process.md & added wiki link
39d77cb
@dmccoystephenson
Changed release branch format to release_(year)-(quarter) in releas…
7b84ebf 
…e process documentation
@dmccoystephenson
Changed hotfix branch format to hotfix_(year)-(month)-(day) in rele…
a578d9b 
…ase process documentation
@dmccoystephenson
Restarted numbering for each section in release process documentation
03e09e9
@SaikrishnaBairamoni
update the dockerhub.yml to replace tags
1af502c
@dan-du-car
Merge pull request #549 from usdot-jpo-ode/replace/tags
b1cfd22 
update the dockerhub.yml to replace tags
@dmccoystephenson
Merge pull request #87 from CDOT-CV/docs/release-process-documentation
fe6b6d1 
Release Process Documentation
@dmccoystephenson
Updated example docker-compose.yml in dockerhub.md
e377e6e
@dmccoystephenson
Removed '=' from kafka script arguments
9461f6e
@dmccoystephenson
Updated SDW references to 'SDX' in comments & documentation
03789f9
@dmccoystephenson
Updated quickstart-compose.yml
420dca7
@dmccoystephenson
Updated documentation on automatically creating topics w/ Kafka
916b7af
@dmccoystephenson
Modified kafka documentation regarding kafka_init.sh script
64a382f
@dmccoystephenson
Removed '=' from kafka scripts for more arguments
0663b6d
@payneBrandon
Merge pull request #88 from CDOT-CV/pr/addressing-usdot-pr-comments-6…
435db60 
…-13-2024

Addressing USDOT PR comments 6/13/2024
@dan-du-car
Merge pull request #547 from CDOT-CV/dev
23ffeee 
Configurable TIM Signing for RSUs/SDX, Code Refactoring & UDP/Log Ingestion Updates
@dan-du-car dan-du-car merged commit 772ae10 into master Jun 14, 2024
8 of 9 checks passed
@dmccoystephenson
Copy link
Collaborator

dmccoystephenson commented Jun 14, 2024 •
edited
Loading

Looks like the git submodule commit references were not updated before this PR was merged.

This is outlined in step 2 of section 3 of the quarterly release process documentation:
https://github.com/usdot-jpo-ode/jpo-ode/blob/develop/docs/release_process.md#3-project-reference-updates--release-creation

@dan-du-car
Copy link
Contributor

Looks like the git submodule commit references were not updated before this PR was merged.

This is outlined in step 2 of section 3 of the quarterly release process documentation: https://github.com/usdot-jpo-ode/jpo-ode/blob/develop/docs/release_process.md#3-project-reference-updates--release-creation

Good catch

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.
7 participants
@SaikrishnaBairamoni @dmccoystephenson @dan-du-car @mwodahl @payneBrandon @drewjj @Michael7371