From 2121b8cb7a8e376085987d7d1fa7f0ee3ae7b4b1 Mon Sep 17 00:00:00 2001 From: Michael7371 <40476797+Michael7371@users.noreply.github.com> Date: Thu, 3 Aug 2023 09:26:30 -0600 Subject: [PATCH 01/12] updated asn1_codec submodule --- asn1_codec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asn1_codec b/asn1_codec index b7398925e..792abc0e7 160000 --- a/asn1_codec +++ b/asn1_codec @@ -1 +1 @@ -Subproject commit b7398925e7399888719e06f37bf25abf04a6be27 +Subproject commit 792abc0e750f6929ec79d644c4f9ad463842d2a1 From 616d078bf449725dabfde11730d33f37d0c85214 Mon Sep 17 00:00:00 2001 From: Michael7371 <40476797+Michael7371@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:41:54 -0600 Subject: [PATCH 02/12] updating submodules --- jpo-cvdp | 2 +- jpo-s3-deposit | 2 +- jpo-sdw-depositor | 2 +- jpo-security-svcs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jpo-cvdp b/jpo-cvdp index fa9c0ab70..4d1ba2e99 160000 --- a/jpo-cvdp +++ b/jpo-cvdp @@ -1 +1 @@ -Subproject commit fa9c0ab7044cfc51bc0b30712bca72a7d5cd9321 +Subproject commit 4d1ba2e9974d05bdcde4df039d67bd0a0f2bd510 diff --git a/jpo-s3-deposit b/jpo-s3-deposit index 2880f82a4..4566ed147 160000 --- a/jpo-s3-deposit +++ b/jpo-s3-deposit @@ -1 +1 @@ -Subproject commit 2880f82a4e4dcc2c6567b153d19ce95339823262 +Subproject commit 4566ed1479d3d77a81a2de54953e4dda12710688 diff --git a/jpo-sdw-depositor b/jpo-sdw-depositor index be99dcc8a..00c070fd6 160000 --- a/jpo-sdw-depositor +++ b/jpo-sdw-depositor @@ -1 +1 @@ -Subproject commit be99dcc8a9c1175609326d2f676f4ee4811c6fa4 +Subproject commit 00c070fd65d4b2e680d359e08f1ad091ff99d33a diff --git a/jpo-security-svcs b/jpo-security-svcs index 2c30cd228..7e6a73361 160000 --- a/jpo-security-svcs +++ b/jpo-security-svcs @@ -1 +1 @@ -Subproject commit 2c30cd228687ead3a7d3cca98ab680de2722405a +Subproject commit 7e6a733611196a1579d15e2b3dbfac6147d6693b From 086d14f74a67f356e7343517a07ed7b671715c9c Mon Sep 17 00:00:00 2001 From: Michael7371 <40476797+Michael7371@users.noreply.github.com> Date: Thu, 24 Aug 2023 13:54:21 -0600 Subject: [PATCH 03/12] added documentation for the DOCKER_SHARED_VOLUME_WINDOWS variable and set the default value to empty --- README.md | 1 + sample.env | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9df88a1ef..49fb2d9b5 100644 --- a/README.md +++ b/README.md @@ -249,6 +249,7 @@ Copy the following files from `jpo-ode` directory into your DOCKER_SHARED_VOLUME - Copy jpo-ode/ppm.properties to ${DOCKER_SHARED_VOLUME}/config.properties. Open the newly copied `config.properties` file in a text editor and update the `metadata.broker.list=your.docker.host.ip:9092` line with your system's DOCKER_HOST_IP in place of the dummy `your.docker.host.ip` string. - Copy jpo-ode/adm.properties to ${DOCKER_SHARED_VOLUME}/adm.properties - Copy jpo-ode/aem.properties to ${DOCKER_SHARED_VOLUME}/aem.properties +- Specifying the variable: ${DOCKER_SHARED_VOLUME_WINDOWS} to "C:" may be required for certain Windows users. Navigate to the root directory of the jpo-ode project and run the following command: diff --git a/sample.env b/sample.env index 45f6aebd1..f8fc395c6 100644 --- a/sample.env +++ b/sample.env @@ -30,7 +30,7 @@ DOCKER_HOST_IP= # (Required) The full path of a directory on the host machine to be shared with docker containers. # Hint: usually the path to the `jpo-ode` directory. DOCKER_SHARED_VOLUME= -DOCKER_SHARED_VOLUME_WINDOWS=C: +DOCKER_SHARED_VOLUME_WINDOWS= # (Required if values are not sent in REST request JSON messages) # RSU SNMP username and password From d7cedbbe0527a73bab80042e993fe079c6628816 Mon Sep 17 00:00:00 2001 From: Michael7371 <40476797+Michael7371@users.noreply.github.com> Date: Mon, 28 Aug 2023 11:04:59 -0600 Subject: [PATCH 04/12] updating sonar organization in pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af7d485df..a768dc1be 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ ${maven.build.timestamp} yyyy-MM-dd'T'HH:mm:ss.SSSZ 11 - usdot-jpo-ode + usdot-jpo-ode-1 https://sonarcloud.io 0.8.8 From 7494f4abfe2d2b4e54695f82ea8e3a810452e77f Mon Sep 17 00:00:00 2001 From: Michael7371 <40476797+Michael7371@users.noreply.github.com> Date: Mon, 28 Aug 2023 15:35:39 -0600 Subject: [PATCH 05/12] reverting pom.xml and fixing the pom.xml for sonarcloud --- .github/workflows/ci.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81ec0ca57..a366fc1a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,4 +27,4 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | ls -la && pwd - mvn -e -X clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.projectKey=usdot-jpo-ode-1_jpo-ode -Dsonar.projectName=jpo-ode -Dsonar.organization=usdot-jpo-ode-1 -Dsonar.host.url=https://sonarcloud.io -Dsonar.branch.name=$GITHUB_REF_NAME + mvn -e -X clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.projectKey=usdot.jpo.ode:jpo-ode -Dsonar.projectName=jpo-ode -Dsonar.organization=usdot-jpo-ode -Dsonar.host.url=https://sonarcloud.io -Dsonar.branch.name=$GITHUB_REF_NAME diff --git a/pom.xml b/pom.xml index a768dc1be..af7d485df 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ ${maven.build.timestamp} yyyy-MM-dd'T'HH:mm:ss.SSSZ 11 - usdot-jpo-ode-1 + usdot-jpo-ode https://sonarcloud.io 0.8.8 From 65d2f81f8f9090961f1ae72dd5f4f8d2fe5eb41d Mon Sep 17 00:00:00 2001 From: Daniel McCoy Stephenson Date: Mon, 6 Nov 2023 13:28:55 -0700 Subject: [PATCH 06/12] Added release notes for 1.5.0 --- docs/Release_notes.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/Release_notes.md b/docs/Release_notes.md index 25e1f6076..32c4b2f36 100644 --- 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 ---------------------------------------- From c49bd1e1237a7c246009b9160dc4332eec4beace Mon Sep 17 00:00:00 2001 From: Daniel McCoy Stephenson Date: Tue, 5 Dec 2023 10:27:46 -0700 Subject: [PATCH 07/12] Updated git submodule commit references to latest commit in master branches. --- asn1_codec | 2 +- jpo-cvdp | 2 +- jpo-s3-deposit | 2 +- jpo-sdw-depositor | 2 +- jpo-security-svcs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/asn1_codec b/asn1_codec index 792abc0e7..af8a1a7f5 160000 --- a/asn1_codec +++ b/asn1_codec @@ -1 +1 @@ -Subproject commit 792abc0e750f6929ec79d644c4f9ad463842d2a1 +Subproject commit af8a1a7f53fb7f9dea364e9fefa12420f7ccd75e diff --git a/jpo-cvdp b/jpo-cvdp index 4d1ba2e99..a57f0c62c 160000 --- a/jpo-cvdp +++ b/jpo-cvdp @@ -1 +1 @@ -Subproject commit 4d1ba2e9974d05bdcde4df039d67bd0a0f2bd510 +Subproject commit a57f0c62c5ed3c1c381c47ed33b7bf220c981eeb diff --git a/jpo-s3-deposit b/jpo-s3-deposit index 4566ed147..564e8dfbd 160000 --- a/jpo-s3-deposit +++ b/jpo-s3-deposit @@ -1 +1 @@ -Subproject commit 4566ed1479d3d77a81a2de54953e4dda12710688 +Subproject commit 564e8dfbd6b4d0e6ace494d80374440bc89b5943 diff --git a/jpo-sdw-depositor b/jpo-sdw-depositor index 00c070fd6..8dfca7f6c 160000 --- a/jpo-sdw-depositor +++ b/jpo-sdw-depositor @@ -1 +1 @@ -Subproject commit 00c070fd65d4b2e680d359e08f1ad091ff99d33a +Subproject commit 8dfca7f6c376f38067a3f15e5505d3eec0c71513 diff --git a/jpo-security-svcs b/jpo-security-svcs index 7e6a73361..1d056eaf0 160000 --- a/jpo-security-svcs +++ b/jpo-security-svcs @@ -1 +1 @@ -Subproject commit 7e6a733611196a1579d15e2b3dbfac6147d6693b +Subproject commit 1d056eaf0d9c026764324b70a8aa7141dfd5ecbd From aa3a707b0f59bcfc0806d8534bb2c87dfce7b1f8 Mon Sep 17 00:00:00 2001 From: Brandon Payne Date: Wed, 27 Dec 2023 10:32:44 -0700 Subject: [PATCH 08/12] Moving JsonProperty declaration to getters to avoid duplicate fetch in serialization/deserialization scenarios --- .../us/dot/its/jpo/ode/plugin/j2735/timstorage/NodeSetXY.java | 4 ++-- .../us/dot/its/jpo/ode/plugin/j2735/timstorage/Nodes.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 index 0e06deaac..4980d6304 100644 --- 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 index f0eb2c90f..5a86763fa 100644 --- 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; } From 4a0cbe3e1a4a75db779e985711dfbf8501e84a0d Mon Sep 17 00:00:00 2001 From: Drew Johnston <31270488+drewjj@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:18:26 -0700 Subject: [PATCH 09/12] Remove redundant test that no longer functions --- .../upload/FileUploadIntegrationTests.java | 84 ------------------- 1 file changed, 84 deletions(-) delete mode 100644 jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/upload/FileUploadIntegrationTests.java 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 deleted file mode 100644 index d6fd7ad2d..000000000 --- a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/upload/FileUploadIntegrationTests.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright 2018 572682 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy - * of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - ******************************************************************************/ -package us.dot.its.jpo.ode.upload; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.then; -import static org.mockito.ArgumentMatchers.any; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.test.web.server.LocalServerPort; -import org.springframework.core.io.ClassPathResource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.multipart.MultipartFile; - -import us.dot.its.jpo.ode.storage.StorageService; - -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class FileUploadIntegrationTests { - - @Autowired - private TestRestTemplate restTemplate; - - @MockBean - private StorageService storageService; - - @LocalServerPort - private int port; - - @Disabled - @Test - public void shouldUploadFile() throws Exception { - ClassPathResource resource = new ClassPathResource("testupload.txt", getClass()); - - MultiValueMap map = new LinkedMultiValueMap(); - map.add("file", resource); - ResponseEntity response = this.restTemplate.postForEntity("/", map, String.class); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.FOUND); - assertThat(response.getHeaders().getLocation().toString()).startsWith("http://localhost:" + this.port + "/"); - then(storageService).should().store(any(MultipartFile.class), "obulog"); - } - - @Disabled - @Test - public void shouldDownloadFile() throws Exception { - ClassPathResource resource = new ClassPathResource("testupload.txt", getClass()); - given(this.storageService.loadAsResource("testupload.txt")).willReturn(resource); - - ResponseEntity response = this.restTemplate - .getForEntity("/files/{filename}", String.class, "testupload.txt"); - - assertThat(response.getStatusCode()).isEqualTo(200); - assertThat(response.getHeaders().getFirst(HttpHeaders.CONTENT_DISPOSITION)) - .isEqualTo("attachment; filename=\"testupload.txt\""); - assertThat(response.getBody()).isEqualTo("Spring Framework"); - } - -} From fe0ed8dc68dc1877fe89699b4ae40eeee441a986 Mon Sep 17 00:00:00 2001 From: Marc Wodahl Date: Wed, 10 Jan 2024 08:04:48 -0700 Subject: [PATCH 10/12] Update sonar plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a589b7c1..4261b73b2 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ usdot-jpo-ode https://sonarcloud.io - 0.8.8 + 0.8.11 jacoco reuseReports ${project.basedir}/target/site/jacoco/jacoco.xml From 3eecfbaad9f21dd5395b5a0a7b8f4bb132384430 Mon Sep 17 00:00:00 2001 From: Marc Wodahl Date: Wed, 10 Jan 2024 08:07:48 -0700 Subject: [PATCH 11/12] sonar-maven-plugin version update --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4261b73b2..d700afd9b 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 3.9.0.2155 + 3.10.0.2594 org.springframework.boot From 6de4f3dd6359ddee7936cfc2e8902ac7755dd887 Mon Sep 17 00:00:00 2001 From: Marc Wodahl Date: Thu, 11 Jan 2024 08:21:35 -0700 Subject: [PATCH 12/12] Update github workflow java version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a366fc1a0..3d734ab27 100644 --- 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: