diff --git a/.gitmodules b/.gitmodules index 038e716b4..42ec6609a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,7 +15,7 @@ url = https://github.com/usdot-jpo-ode/ode-output-validator-library.git [submodule "jpo-utils"] path = jpo-utils - url = https://github.com/CDOT-CV/jpo-utils.git + url = https://github.com/usdot-jpo-ode/jpo-utils.git [submodule "jpo-asn-pojos"] path = jpo-asn-pojos - url = https://github.com/CDOT-CV/jpo-asn-pojos.git + url = https://github.com/usdot-jpo-ode/jpo-asn-pojos.git diff --git a/docs/Release_notes.md b/docs/Release_notes.md index db79f58e4..6e9ad8d88 100644 --- a/docs/Release_notes.md +++ b/docs/Release_notes.md @@ -1,7 +1,7 @@ JPO-ODE Release Notes ---------------------------- -Version 5.0.2, released October 2025 +Version 5.1.0, released October 2025 ---------------------------------------- ### **Summary** This release introduces expanded support for the latest J2735 2024 message standards through a breaking rework of the POJO data models, impacting all message types and associated pipelines. This release includes major updates to the BSM, SPaT, MAP, SRM, SSM, PSM, and TIM pipelines, along with new pipelines for RTCM, RSM, and SDSM messages. It also refines CI/CD workflows, enhances release validation procedures, and updates dependencies for improved stability and compatibility. These changes modernize the codebase, improve system reliability, and improve ongoing development and deployment efforts. diff --git a/docs/compatibility.md b/docs/compatibility.md index 84ced2deb..379956b61 100644 --- a/docs/compatibility.md +++ b/docs/compatibility.md @@ -1,16 +1,19 @@ # Submodule Compatibility Guide This table serves as a guide, suggesting which versions of individual submodules are best suited to accompany each version of the main module. It helps users ensure compatibility and smooth integration by recommending specific submodule versions for their chosen main module version. -| [ODE (this project)](https://github.com/usdot-jpo-ode/jpo-ode/releases) | [ACM](https://github.com/usdot-jpo-ode/asn1_codec/releases) | [PPM](https://github.com/usdot-jpo-ode/jpo-cvdp/releases) | [SEC](https://github.com/usdot-jpo-ode/jpo-security-svcs/releases) | [SDWD](https://github.com/usdot-jpo-ode/jpo-sdw-depositor/releases) | [S3D](https://github.com/usdot-jpo-ode/jpo-s3-deposit/releases) | [GJConverter](https://github.com/usdot-jpo-ode/jpo-geojsonconverter/releases) | [CMonitor](https://github.com/usdot-jpo-ode/jpo-conflictmonitor/releases) | [CVisualizer](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer/releases) | [CVManager](https://github.com/usdot-jpo-ode/jpo-cvmanager/releases) | -|-------------------------------------------------------------------------|-------------------------------------------------------------|-----------------------------------------------------------|--------------------------------------------------------------------|---------------------------------------------------------------------|-----------------------------------------------------------------|-------------------------------------------------------------------------------|---------------------------------------------------------------------------|---------------------------------------------------------------------------------|----------------------------------------------------------------------| -| 4.1.2 | 3.1.0 | 1.5.0 | 1.6.0 | 1.9.1 | 1.7.1 | 2.1.0 | 2.1.0 | 1.5.0 | 1.6.0 | -| 4.0.0 | 3.0.0 | 1.5.0 | 1.5.0 | 1.9.0 | 1.7.0 | 2.0.0 | 2.0.0 | 1.5.0 | 1.5.0 | -| 3.0.0 | 2.2.0 | 1.4.0 | 1.5.0 | 1.8.0 | 1.6.0 | 1.4.2 | 1.4.2 | 1.4.1 | 1.4.0 | -| 2.1.0 | 2.1.0 | 1.3.0 | 1.4.0 | 1.7.0 | 1.5.0 | 1.3.0 | 1.3.0 | 1.3.0 | 1.3.0 | -| 2.0.x | 2.0.0 | 1.3.0 | 1.4.0 | 1.6.0 | 1.4.0 | 1.2.0 | 1.2.0 | 1.2.0 | 1.2.0 | -| 1.5.1 | 1.5.0 | 1.2.0 | 1.3.0 | 1.5.0 | 1.3.0 | 1.1.0 | 1.1.0 | 1.1.0 | 1.1.0 | -| 1.4.1 | 1.4.1 | 1.1.1 | 1.2.1 | 1.4.1 | 1.2.1 | 1.0.0 | 1.0.1 | 1.0.1 | 1.0.1 | -| 1.4.0 | 1.4.0 | 1.1.0 | 1.2.0 | 1.4.0 | 1.2.0 | N/A | N/A | N/A | N/A | -| 1.3.0 | 1.3.0 | 1.0.0 | 1.0.1 | 1.3.0 | 1.1.0 | N/A | N/A | N/A | N/A | +| [ODE (this project)](https://github.com/usdot-jpo-ode/jpo-ode/releases) | [ACM](https://github.com/usdot-jpo-ode/asn1_codec/releases) | [PPM](https://github.com/usdot-jpo-ode/jpo-cvdp/releases) | [SEC](https://github.com/usdot-jpo-ode/jpo-security-svcs/releases) | [SDWD](https://github.com/usdot-jpo-ode/jpo-sdw-depositor/releases) | [S3D](https://github.com/usdot-jpo-ode/jpo-s3-deposit/releases) | [GJConverter](https://github.com/usdot-jpo-ode/jpo-geojsonconverter/releases) | [CMonitor](https://github.com/usdot-jpo-ode/jpo-conflictmonitor/releases) | [CVisualizer](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer/releases) | [CVManager](https://github.com/usdot-jpo-ode/jpo-cvmanager/releases) | [MEC](https://github.com/usdot-jpo-ode/jpo-mec-deposit/releases) | +|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------| +| 5.1.0 | 3.2.0 | 1.6.0 | 1.7.0 | 2.0.0 | 1.7.1 | 3.2.0 | 3.1.0 | N/A | 2.0.0 | 1.0.0 | +| 4.1.2 | 3.1.0 | 1.5.0 | 1.6.0 | 1.9.1 | 1.7.1 | 2.1.0 | 2.1.0 | 1.5.0 | 1.6.0 | N/A | +| 4.0.0 | 3.0.0 | 1.5.0 | 1.5.0 | 1.9.0 | 1.7.0 | 2.0.0 | 2.0.0 | 1.5.0 | 1.5.0 | N/A | +| 3.0.0 | 2.2.0 | 1.4.0 | 1.5.0 | 1.8.0 | 1.6.0 | 1.4.2 | 1.4.2 | 1.4.1 | 1.4.0 | N/A | +| 2.1.0 | 2.1.0 | 1.3.0 | 1.4.0 | 1.7.0 | 1.5.0 | 1.3.0 | 1.3.0 | 1.3.0 | 1.3.0 | N/A | +| 2.0.x | 2.0.0 | 1.3.0 | 1.4.0 | 1.6.0 | 1.4.0 | 1.2.0 | 1.2.0 | 1.2.0 | 1.2.0 | N/A | +| 1.5.1 | 1.5.0 | 1.2.0 | 1.3.0 | 1.5.0 | 1.3.0 | 1.1.0 | 1.1.0 | 1.1.0 | 1.1.0 | N/A | +| 1.4.1 | 1.4.1 | 1.1.1 | 1.2.1 | 1.4.1 | 1.2.1 | 1.0.0 | 1.0.1 | 1.0.1 | 1.0.1 | N/A | +| 1.4.0 | 1.4.0 | 1.1.0 | 1.2.0 | 1.4.0 | 1.2.0 | N/A | N/A | N/A | N/A | N/A | +| 1.3.0 | 1.3.0 | 1.0.0 | 1.0.1 | 1.3.0 | 1.1.0 | N/A | N/A | N/A | N/A | N/A | For example, if you're using ODE version 2.0.1, it's recommended to use ACM 2.0.0, PPM 1.3.0, SEC 1.4.0, SDWD 1.6.0, S3D 1.4.0, GJConverter 1.2.0, CMonitor 1.2.0, CVisualizer 1.2.0, and CVManager 1.2.0. While other combinations may work, these versions are suggested for the best compatibility. + +Note: The CVisualizer is now deprecated and will no longer be compatible with jpo-ode versions 5.1.0 and later. diff --git a/jpo-asn-pojos b/jpo-asn-pojos index 989190ab9..c7d446df1 160000 --- a/jpo-asn-pojos +++ b/jpo-asn-pojos @@ -1 +1 @@ -Subproject commit 989190ab9bbc98405402e1607a362b4482751404 +Subproject commit c7d446df1ba24d6bf7f485ce7c112423c9cf6f26 diff --git a/jpo-ode-common/pom.xml b/jpo-ode-common/pom.xml index b8692cd81..c01fb219c 100644 --- a/jpo-ode-common/pom.xml +++ b/jpo-ode-common/pom.xml @@ -5,7 +5,7 @@ usdot.jpo.ode jpo-ode - 5.0.2 + 5.1.0 jpo-ode-common diff --git a/jpo-ode-core/pom.xml b/jpo-ode-core/pom.xml index 139dac023..c5ea2bfd1 100644 --- a/jpo-ode-core/pom.xml +++ b/jpo-ode-core/pom.xml @@ -7,7 +7,7 @@ usdot.jpo.ode jpo-ode - 5.0.2 + 5.1.0 jpo-ode-core @@ -25,12 +25,12 @@ usdot.jpo.ode jpo-ode-common - 5.0.2 + 5.1.0 usdot.jpo.ode jpo-ode-plugins - 5.0.2 + 5.1.0 org.apache.httpcomponents @@ -96,7 +96,7 @@ usdot.jpo.asn jpo-asn-j2735-2024 - 1.0.2 + 1.1.0 diff --git a/jpo-ode-core/src/main/resources/schemas/schema-bsm.json b/jpo-ode-core/src/main/resources/schemas/schema-bsm.json index 7fa9d2739..cc8583416 100644 --- a/jpo-ode-core/src/main/resources/schemas/schema-bsm.json +++ b/jpo-ode-core/src/main/resources/schemas/schema-bsm.json @@ -252,7 +252,7 @@ "payload": { "properties": { "data": { - "$ref": "https://raw.githubusercontent.com/CDOT-CV/jpo-asn-pojos/refs/heads/develop/jpo-asn-jsonschema-generator/src/main/resources/schemas/BasicSafetyMessage/BasicSafetyMessageMessageFrame.schema.json" + "$ref": "https://raw.githubusercontent.com/usdot-jpo-ode/jpo-asn-pojos/refs/heads/master/jpo-asn-jsonschema-generator/src/main/resources/schemas/BasicSafetyMessage/BasicSafetyMessageMessageFrame.schema.json" }, "dataType": { "type": "string" diff --git a/jpo-ode-core/src/main/resources/schemas/schema-map.json b/jpo-ode-core/src/main/resources/schemas/schema-map.json index 388d1c442..ca267191c 100644 --- a/jpo-ode-core/src/main/resources/schemas/schema-map.json +++ b/jpo-ode-core/src/main/resources/schemas/schema-map.json @@ -254,7 +254,7 @@ "payload": { "properties": { "data": { - "$ref": "https://raw.githubusercontent.com/CDOT-CV/jpo-asn-pojos/refs/heads/develop/jpo-asn-jsonschema-generator/src/main/resources/schemas/MapData/MapDataMessageFrame.schema.json" + "$ref": "https://raw.githubusercontent.com/usdot-jpo-ode/jpo-asn-pojos/refs/heads/master/jpo-asn-jsonschema-generator/src/main/resources/schemas/MapData/MapDataMessageFrame.schema.json" }, "dataType": { "type": "string" diff --git a/jpo-ode-core/src/main/resources/schemas/schema-psm.json b/jpo-ode-core/src/main/resources/schemas/schema-psm.json index f1df71998..4503cd57f 100644 --- a/jpo-ode-core/src/main/resources/schemas/schema-psm.json +++ b/jpo-ode-core/src/main/resources/schemas/schema-psm.json @@ -253,7 +253,7 @@ "payload": { "properties": { "data": { - "$ref": "https://raw.githubusercontent.com/CDOT-CV/jpo-asn-pojos/refs/heads/develop/jpo-asn-jsonschema-generator/src/main/resources/schemas/PersonalSafetyMessage/PersonalSafetyMessageMessageFrame.schema.json" + "$ref": "https://raw.githubusercontent.com/usdot-jpo-ode/jpo-asn-pojos/refs/heads/master/jpo-asn-jsonschema-generator/src/main/resources/schemas/PersonalSafetyMessage/PersonalSafetyMessageMessageFrame.schema.json" }, "dataType": { "type": "string" diff --git a/jpo-ode-core/src/main/resources/schemas/schema-rsm.json b/jpo-ode-core/src/main/resources/schemas/schema-rsm.json index 296753d9b..e681514db 100644 --- a/jpo-ode-core/src/main/resources/schemas/schema-rsm.json +++ b/jpo-ode-core/src/main/resources/schemas/schema-rsm.json @@ -241,7 +241,7 @@ "payload": { "properties": { "data": { - "$ref": "https://raw.githubusercontent.com/CDOT-CV/jpo-asn-pojos/refs/heads/develop/jpo-asn-jsonschema-generator/src/main/resources/schemas/RoadSafetyMessage/RoadSafetyMessageMessageFrame.schema.json" + "$ref": "https://raw.githubusercontent.com/usdot-jpo-ode/jpo-asn-pojos/refs/heads/master/jpo-asn-jsonschema-generator/src/main/resources/schemas/RoadSafetyMessage/RoadSafetyMessageMessageFrame.schema.json" }, "dataType": { "type": "string" diff --git a/jpo-ode-core/src/main/resources/schemas/schema-rtcm.json b/jpo-ode-core/src/main/resources/schemas/schema-rtcm.json index 12b69f8bf..284eb1783 100644 --- a/jpo-ode-core/src/main/resources/schemas/schema-rtcm.json +++ b/jpo-ode-core/src/main/resources/schemas/schema-rtcm.json @@ -241,7 +241,7 @@ "payload": { "properties": { "data": { - "$ref": "https://raw.githubusercontent.com/CDOT-CV/jpo-asn-pojos/refs/heads/develop/jpo-asn-jsonschema-generator/src/main/resources/schemas/RTCMcorrections/RTCMcorrectionsMessageFrame.schema.json" + "$ref": "https://raw.githubusercontent.com/usdot-jpo-ode/jpo-asn-pojos/refs/heads/master/jpo-asn-jsonschema-generator/src/main/resources/schemas/RTCMcorrections/RTCMcorrectionsMessageFrame.schema.json" }, "dataType": { "type": "string" diff --git a/jpo-ode-core/src/main/resources/schemas/schema-spat.json b/jpo-ode-core/src/main/resources/schemas/schema-spat.json index 5a8694569..2379d50d4 100644 --- a/jpo-ode-core/src/main/resources/schemas/schema-spat.json +++ b/jpo-ode-core/src/main/resources/schemas/schema-spat.json @@ -254,7 +254,7 @@ "payload": { "properties": { "data": { - "$ref": "https://raw.githubusercontent.com/CDOT-CV/jpo-asn-pojos/refs/heads/develop/jpo-asn-jsonschema-generator/src/main/resources/schemas/SPAT/SPATMessageFrame.schema.json" + "$ref": "https://raw.githubusercontent.com/usdot-jpo-ode/jpo-asn-pojos/refs/heads/master/jpo-asn-jsonschema-generator/src/main/resources/schemas/SPAT/SPATMessageFrame.schema.json" }, "dataType": { "type": "string" diff --git a/jpo-ode-core/src/main/resources/schemas/schema-srm.json b/jpo-ode-core/src/main/resources/schemas/schema-srm.json index 52cce5f85..d9f0c1593 100644 --- a/jpo-ode-core/src/main/resources/schemas/schema-srm.json +++ b/jpo-ode-core/src/main/resources/schemas/schema-srm.json @@ -253,7 +253,7 @@ "payload": { "properties": { "data": { - "$ref": "https://raw.githubusercontent.com/CDOT-CV/jpo-asn-pojos/refs/heads/develop/jpo-asn-jsonschema-generator/src/main/resources/schemas/SignalRequestMessage/SignalRequestMessageMessageFrame.schema.json" + "$ref": "https://raw.githubusercontent.com/usdot-jpo-ode/jpo-asn-pojos/refs/heads/master/jpo-asn-jsonschema-generator/src/main/resources/schemas/SignalRequestMessage/SignalRequestMessageMessageFrame.schema.json" }, "dataType": { "type": "string" diff --git a/jpo-ode-core/src/main/resources/schemas/schema-ssm.json b/jpo-ode-core/src/main/resources/schemas/schema-ssm.json index 06b61c507..dc5b33b7c 100644 --- a/jpo-ode-core/src/main/resources/schemas/schema-ssm.json +++ b/jpo-ode-core/src/main/resources/schemas/schema-ssm.json @@ -253,7 +253,7 @@ "payload": { "properties": { "data": { - "$ref": "https://raw.githubusercontent.com/CDOT-CV/jpo-asn-pojos/refs/heads/develop/jpo-asn-jsonschema-generator/src/main/resources/schemas/SignalStatusMessage/SignalStatusMessageMessageFrame.schema.json" + "$ref": "https://raw.githubusercontent.com/usdot-jpo-ode/jpo-asn-pojos/refs/heads/master/jpo-asn-jsonschema-generator/src/main/resources/schemas/SignalStatusMessage/SignalStatusMessageMessageFrame.schema.json" }, "dataType": { "type": "string" diff --git a/jpo-ode-core/src/main/resources/schemas/schema-tim.json b/jpo-ode-core/src/main/resources/schemas/schema-tim.json index 4d51b3fbc..bb6331298 100644 --- a/jpo-ode-core/src/main/resources/schemas/schema-tim.json +++ b/jpo-ode-core/src/main/resources/schemas/schema-tim.json @@ -9,7 +9,7 @@ "type": "object", "properties": { "data": { - "$ref": "https://raw.githubusercontent.com/CDOT-CV/jpo-asn-pojos/refs/heads/develop/jpo-asn-jsonschema-generator/src/main/resources/schemas/TravelerInformation/TravelerInformationMessageFrame.schema.json" + "$ref": "https://raw.githubusercontent.com/usdot-jpo-ode/jpo-asn-pojos/refs/heads/master/jpo-asn-jsonschema-generator/src/main/resources/schemas/TravelerInformation/TravelerInformationMessageFrame.schema.json" }, "dataType": { "type": "string" diff --git a/jpo-ode-plugins/pom.xml b/jpo-ode-plugins/pom.xml index c59f5865c..6b1324f33 100644 --- a/jpo-ode-plugins/pom.xml +++ b/jpo-ode-plugins/pom.xml @@ -11,7 +11,7 @@ usdot.jpo.ode jpo-ode - 5.0.2 + 5.1.0 @@ -27,7 +27,7 @@ usdot.jpo.ode jpo-ode-common - 5.0.2 + 5.1.0