Merge branch 'usdot-jpo-ode:develop' into dev

CDOT-CV · Jan 4, 2024 · 4d5d670 · 4d5d670
2 parents 760c581 + 6a497f2
commit 4d5d670
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/asn1_codec b/asn1_codec
diff --git a/docs/Release_notes.md b/docs/Release_notes.md
@@ -1,6 +1,22 @@
 JPO-ODE Release Notes
 ----------------------------
 
+Version 1.5.0, released November 2023
+----------------------------------------
+
+### **Summary**
+The updates for the jpo-ode 1.5.0 release include CI configuration fixes, README updates and updated submodule references.
+- Fixed CI configuration command parameters.
+- Added README note for Windows users on the shared volume environment variable.
+- Updated submodule references
+- The supported operating systems in the README have been updated to more recent versions.
+- Updated all references to the test package from org.junit.Test to org.junit.jupiter.api.Test. Some tests are also updated to remove deprecated annotations.
+- Introduced changes that enable the ODE to establish communication with RSUs using both the NTCIP1218 protocol and the 4.1 DSRC protocol.
+
+Known Issues:
+- No known issues at this time.
+
+
 Version 1.4.0, released July 5th 2023
 ----------------------------------------
 

diff --git a/jpo-cvdp b/jpo-cvdp
diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/timstorage/NodeSetXY.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/timstorage/NodeSetXY.java
@@ -7,9 +7,9 @@
 public class NodeSetXY extends Asn1Object {
   private static final long serialVersionUID = 1L;
 
-  @JsonProperty("NodeXY")
   private NodeXY[] NodeXY;
-
+
+  @JsonProperty("NodeXY")
   public NodeXY[] getNodeXY() {
     return NodeXY;
   }

diff --git a/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/timstorage/Nodes.java b/jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/timstorage/Nodes.java
@@ -22,12 +22,12 @@
 public class Nodes extends Asn1Object {
 
    private static final long serialVersionUID = 1L;
-   @JsonProperty("NodeLL")
    private NodeLL[] nodeLL;
 
    @JsonProperty("NodeXY")
    private NodeXY[] nodeXY;
-
+
+   @JsonProperty("NodeLL")
    public NodeLL[] getNodeLL() {
       return nodeLL;
    }

diff --git a/jpo-s3-deposit b/jpo-s3-deposit
diff --git a/jpo-sdw-depositor b/jpo-sdw-depositor
diff --git a/jpo-security-svcs b/jpo-security-svcs