Skip to content

Merge Release/2026 q2 into master#598

Merged
SaikrishnaBairamoni merged 50 commits into
masterfrom
release/2026-q2
Jun 16, 2026
Merged

Merge Release/2026 q2 into master#598
SaikrishnaBairamoni merged 50 commits into
masterfrom
release/2026-q2

Conversation

@drewjj

@drewjj drewjj commented Jun 16, 2026

Copy link
Copy Markdown
Collaborator

PR Details

Merge release/2026-q2 into master for ODE 2026 Q2 release process

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.

SaikrishnaBairamoni and others added 30 commits October 27, 2025 10:36
Update develop from master (2025 Q3)
…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
* 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
Enable JaCoCo coverage reporting for SonarCloud
* 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.
Michael7371 and others added 20 commits May 18, 2026 14:43
…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.
…MP header" across multiple test classes for consistency. Refactor test input formatting for improved readability. Adjust test files to ensure proper newline endings and correct expected output values.
…ues and ensure proper newline endings. Remove unnecessary commas in JSON validation file for cleaner formatting.
…l test methods for improved clarity and maintainability. Update test input handling and ensure consistent formatting across all receiver test classes.
…gnature

ASN Hex 1609.2 Signature Retention (ITSA)
* 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
* 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
* 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>
* 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>
…ature Retention enhancement and clarify existing features and fixes.
…ecting enhancements in jpo-ode functionality, including offline JSON schema support and new port remapping configuration.
import java.net.DatagramPacket;
import java.net.InetAddress;

import lombok.extern.slf4j.Slf4j;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck> reported by reviewdog 🐶
Extra separation in import group before 'lombok.extern.slf4j.Slf4j'

import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.core.KafkaTemplate;
import us.dot.its.jpo.ode.kafka.topics.RawEncodedJsonTopics;
import org.apache.tomcat.util.buf.HexUtils;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck> reported by reviewdog 🐶
Wrong lexicographical order for 'org.apache.tomcat.util.buf.HexUtils' import. Should be before 'us.dot.its.jpo.ode.kafka.topics.RawEncodedJsonTopics'.


private final PortMappedIngestConfig.PortMappedIngestSource ingestConfig;

/**

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck> reported by reviewdog 🐶
Block comment has incorrect indentation level 2, expected is 4, indentation should be the same level as line 35.

* port and buffer size
* @param ingestConfig the configuration object containing the ingest settings
*/
public PortMappedConfigurableReceiver(ReceiverProperties props, KafkaTemplate<String, String> kafkaTemplate,

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck> reported by reviewdog 🐶
'ctor def modifier' has incorrect indentation level 4, expected level should be 2.

* @param ingestConfig the configuration object containing the ingest settings
*/
public PortMappedConfigurableReceiver(ReceiverProperties props, KafkaTemplate<String, String> kafkaTemplate,
RawEncodedJsonTopics rawEncodedJsonTopics, PortMappedIngestConfig.PortMappedIngestSource ingestConfig) {

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck> reported by reviewdog 🐶
'RawEncodedJsonTopics' has incorrect indentation level 6, expected level should be 8.

if (type == null) {
log.warn("Skipping configurable UDP ingest source with missing type. Source: {}", source);
continue;
}else{

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck> reported by reviewdog 🐶
WhitespaceAround: 'else' is not followed by whitespace. Empty blocks may only be represented as {} when not part of a multi-block statement (4.1.3)

if (type == null) {
log.warn("Skipping configurable UDP ingest source with missing type. Source: {}", source);
continue;
}else{

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck> reported by reviewdog 🐶
WhitespaceAround: 'else' is not preceded with whitespace.

if (type == null) {
log.warn("Skipping configurable UDP ingest source with missing type. Source: {}", source);
continue;
}else{

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck> reported by reviewdog 🐶
WhitespaceAround: '{' is not preceded with whitespace.

return type.trim().toUpperCase(Locale.ROOT);
}

private ReceiverProperties buildReceiverProperties(UDPReceiverProperties udpProps,PortMappedIngestConfig.PortMappedIngestSource source) {

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck> reported by reviewdog 🐶
',' is not followed by whitespace.



List<AbstractUdpReceiverPublisher> receivers = portMappedIngestConfigLoader
.loadReceivers(udpProps, rawEncodedJsonTopics, kafkaTemplate);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck> reported by reviewdog 🐶
'.' has incorrect indentation level 6, expected level should be 8.

@SaikrishnaBairamoni SaikrishnaBairamoni merged commit 730a85a into master Jun 16, 2026
13 checks passed
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.

6 participants