Merge remote-tracking branch 'origin/dev' into j2735/conform-to-2020-…

…standard
CDOT-CV · Jan 15, 2024 · ea6d468 · ea6d468
2 parents 9548148 + f14a82d
commit ea6d468
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 96 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: "11"
+          java-version: "21"
           distribution: "temurin"
       - name: Run Sonar
         env:

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-ode-svcs/src/test/java/us/dot/its/jpo/ode/upload/FileUploadIntegrationTests.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/upload/FileUploadIntegrationTests.java
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
diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
     <sonar.organization>usdot-jpo-ode</sonar.organization>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     <!-- JaCoCo Properties -->
-    <jacoco.version>0.8.8</jacoco.version>
+    <jacoco.version>0.8.11</jacoco.version>
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
     <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
@@ -116,7 +116,7 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.9.0.2155</version>
+          <version>3.10.0.2594</version>
         </plugin>
         <plugin>
           <groupId>org.springframework.boot</groupId>
+149 −0		.github/workflows/ci.yml
+28 −0		build.sh
+3 −1		docker-compose-confluent-cloud.yml
+2 −1		docker-compose.yml
+18 −0		docs/Release_notes.md
+1 −1		include/acmLogger.hpp
+15,356 −8,872		include/catch/catch.hpp
+1 −1		sample.env
+15 −10		src/acm.cpp
+9 −9		src/acm_blob_producer.cpp
+104 −0		.github/workflows/ci.yml
+0 −61		.travis.yml
+4 −1		Dockerfile
+3 −0		Dockerfile-nsv
+3 −0		Dockerfile.standalone
+38 −0		Dockerfile.testing
+26 −0		README.md
+33 −0		build.sh
+164 −63		do_kafka_test.sh
+16 −0		docker-compose-kafka.yml
+35 −4		docker-test/do_bsm_test.sh
+35 −4		docker-test/do_tim_test.sh
+1 −1		docker-test/ppm_no_map.sh
+9 −2		docker-test/ppm_standalone.sh
+22 −0		docs/Release_notes.md
+0 −1		docs/configuration.md
+15,356 −8,872		include/catch/catch.hpp
+3 −1		include/ppmLogger.hpp
+1 −1		sample.env
+12 −6		sonar-project.properties
+0 −22		src/ppm.cpp
+73 −3		src/ppmLogger.cpp
+11 −11		src/tests.cpp
+4 −5		start_kafka.sh
+4 −0		stop_kafka.sh
+69 −18		test-scripts/standalone.sh
+71 −11		test-scripts/standalone_multi.sh
+1 −1		.github/workflows/docker.yml
+1 −1		.github/workflows/dockerhub.yml
+12 −0		docs/Release_notes.md
+1 −1		run.sh
+1 −1		.github/workflows/ci.yml
+14 −0		docs/Release_notes.md
+1 −1		pom.xml
+3 −2		src/main/java/jpo/sdw/depositor/DepositorProperties.java
+3 −3		src/main/java/jpo/sdw/depositor/consumerdepositors/KafkaConsumerRestDepositor.java
+13 −10		src/test/java/jpo/sdw/depositor/controller/DepositControllerTest.java
+17 −17		src/test/java/jpo/sdw/depositor/controller/KafkaConsumerFactoryTest.java