From 1a080d0a7542051b157fbd71b4e4cf5284ab8418 Mon Sep 17 00:00:00 2001 From: Daniel McCoy Stephenson Date: Fri, 16 Feb 2024 09:35:21 -0700 Subject: [PATCH 1/9] Added info on breaking changes to release notes for 1.6.0 --- docs/Release_notes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/Release_notes.md b/docs/Release_notes.md index 493ee1881..d2ba520cf 100644 --- a/docs/Release_notes.md +++ b/docs/Release_notes.md @@ -15,6 +15,9 @@ Enhancements in this release: Known Issues: - No known issues at this time. +Breaking Changes: +- Users should note that due to the switch to J2735 2020, some fields in outputted TIMs will be different. Any programs relying on data from the ODE must be modified to accommodate these updated outputs. + Version 1.5.1, released November 2023 ---------------------------------------- From 263390020376873938acd1bd8f20db0a88448867 Mon Sep 17 00:00:00 2001 From: Daniel McCoy Stephenson Date: Fri, 16 Feb 2024 10:50:58 -0700 Subject: [PATCH 2/9] Added specific info on TIM field renamings to breaking changes section of 1.6.0 release notes --- docs/Release_notes.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/Release_notes.md b/docs/Release_notes.md index d2ba520cf..94f545bef 100644 --- a/docs/Release_notes.md +++ b/docs/Release_notes.md @@ -16,7 +16,12 @@ Known Issues: - No known issues at this time. Breaking Changes: -- Users should note that due to the switch to J2735 2020, some fields in outputted TIMs will be different. Any programs relying on data from the ODE must be modified to accommodate these updated outputs. +- Users should note that due to the switch to J2735 2020, some fields in outputted TIMs will be different. Any programs relying on data from the ODE must be modified to accommodate these updated outputs. The TIM changes in J2735 2020 include the following field renamings: + - `sspTimRights` -> `notUsed` + - `sspLocationRights` -> `notUsed1` + - `sspMsgRights1` -> `notUsed2` + - `sspMsgRights2` -> `notUsed3` + - `duratonTime` -> `durationTime` Version 1.5.1, released November 2023 From 18c69f12e79e17068c56f26206ea0c55a848befa Mon Sep 17 00:00:00 2001 From: Drew Johnston <31270488+drewjj@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:40:18 -0700 Subject: [PATCH 3/9] Update CI --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b90998266..cc156248b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,15 +13,17 @@ jobs: sonar: runs-on: ubuntu-latest + container: + image: eclipse-temurin:21-jdk-alpine + options: --user root steps: - uses: actions/checkout@v4 with: submodules: recursive - - name: Set up JDK - uses: actions/setup-java@v4 + - name: Set up Maven + uses: stCarolas/setup-maven@v4.5 with: - java-version: "21" - distribution: "temurin" + maven-version: 3.9.6 - name: Run Sonar env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 75c803bd0a88fb7479e8154fda5a49b9674f1a3c Mon Sep 17 00:00:00 2001 From: Drew Johnston <31270488+drewjj@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:46:32 -0700 Subject: [PATCH 4/9] Trying CI without submodules --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc156248b..bc69238f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,6 @@ jobs: options: --user root steps: - uses: actions/checkout@v4 - with: - submodules: recursive - name: Set up Maven uses: stCarolas/setup-maven@v4.5 with: From a75786e785e9eae87e23c1e0d0139aa61555f9bf Mon Sep 17 00:00:00 2001 From: Drew Johnston <31270488+drewjj@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:56:28 -0700 Subject: [PATCH 5/9] Add cd workspace to ci --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc69238f2..68d92fd4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,5 +26,6 @@ jobs: env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | + cd $GITHUB_WORKSPACE ls -la && pwd - 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 + mvn -e -X clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.projectBaseDir="repository-path" -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 From 52896819c14f4879b257ce49b606f8c0c2c1fd27 Mon Sep 17 00:00:00 2001 From: Drew Johnston <31270488+drewjj@users.noreply.github.com> Date: Fri, 16 Feb 2024 12:13:46 -0700 Subject: [PATCH 6/9] Completely rework the sonar CI --- .github/workflows/ci.yml | 60 ++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68d92fd4b..d28c9d7b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,22 +10,66 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build uses: docker/build-push-action@v5 - - sonar: + jpo-ode: runs-on: ubuntu-latest container: image: eclipse-temurin:21-jdk-alpine options: --user root steps: - - uses: actions/checkout@v4 + - name: Checkout ${{ github.event.repository.name }} + uses: actions/checkout@v4 - name: Set up Maven uses: stCarolas/setup-maven@v4.5 with: maven-version: 3.9.6 - - name: Run Sonar - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: Build run: | cd $GITHUB_WORKSPACE - ls -la && pwd - mvn -e -X clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.projectBaseDir="repository-path" -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 + ls -ls && pwd + mvn -e -X clean org.jacoco:jacoco-maven-plugin:prepare-agent package + mvn -e -X clean org.jacoco:jacoco-maven-plugin:report package + - name: Archive code coverage results + uses: actions/upload-artifact@v4 + with: + name: jpo-ode + path: /__w/jpo-ode/jpo-ode/target + if-no-files-found: error + sonar: + needs: [jpo-ode] + runs-on: ubuntu-latest + steps: + - name: Checkout ${{ github.event.repository.name }} + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Download code coverage results + uses: actions/download-artifact@v4 + with: + name: jpo-ode + path: home/runner/work/jpo-ode/jpo-ode/target + - name: Find jacoco.xml + shell: bash + run: | + find "$GITHUB_WORKSPACE" -name "jacoco.xml" + - name: Setup SonarScanner + uses: warchant/setup-sonar-scanner@v7 + - name: Generate sonar properties file + run: | + cat < /tmp/sonar-scanner.properties + sonar.host.url=https://sonarcloud.io + sonar.coverage.jacoco.xmlReportPaths=/home/runner/work/jpo-ode/jpo-ode/home/runner/work/jpo-ode/jpo-ode/target/site/jacoco/jacoco.xml + sonar.java.binaries=home/runner/work/jpo-ode/jpo-ode/target + sonar.projectName=jpo-ode + sonar.projectKey=usdot.jpo.ode:jpo-ode + sonar.organization=usdot-jpo-ode + jpo-ode.sonar.projectBaseDir=home/runner/work/jpo-ode/jpo-ode + jpo-ode.sonar.sources=jpo-ode-common/src,jpo-ode-core/src,jpo-ode-plugins/src,jpo-ode-svcs/src + jpo-ode.sonar.tests=jpo-ode-common/src/test,jpo-ode-core/src/test,jpo-ode-plugins/src/test,jpo-ode-svcs/src/test + jpo-ode.sonar.test.inclusions=jpo-ode-common/src/test/**,jpo-ode-core/src/test/**,jpo-ode-plugins/src/test/**,jpo-ode-svcs/src/test/** + EOF + - name: Run SonarScanner + uses: usdot-fhwa-stol/actions/sonar-scanner@main + with: + sonar-properties-path: /tmp/sonar-scanner.properties + sonar-token: ${{ secrets.SONAR_TOKEN }} + working-dir: $GITHUB_WORKSPACE From 549430340db7a9fd49d7d2bab31cadc3cb458170 Mon Sep 17 00:00:00 2001 From: Drew Johnston <31270488+drewjj@users.noreply.github.com> Date: Fri, 16 Feb 2024 12:40:20 -0700 Subject: [PATCH 7/9] Add sonar to pom --- pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pom.xml b/pom.xml index da157a726..3212c7b12 100644 --- a/pom.xml +++ b/pom.xml @@ -159,6 +159,26 @@ maven-release-plugin 2.5.3 + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + From b58e970cd734a11c762a221c2d88b7bf1e8ec245 Mon Sep 17 00:00:00 2001 From: Drew Johnston <31270488+drewjj@users.noreply.github.com> Date: Fri, 16 Feb 2024 13:17:59 -0700 Subject: [PATCH 8/9] Change target location for ci --- .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 d28c9d7b7..0282ef926 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: jpo-ode - path: /__w/jpo-ode/jpo-ode/target + path: /__w/jpo-ode/jpo-ode/jpo-ode-svcs/target if-no-files-found: error sonar: needs: [jpo-ode] From 857310c7b38a7eff2e7bf72db7c92b7f23b97565 Mon Sep 17 00:00:00 2001 From: Drew Johnston <31270488+drewjj@users.noreply.github.com> Date: Fri, 16 Feb 2024 13:41:25 -0700 Subject: [PATCH 9/9] Giving up and reverting it all back --- .github/workflows/ci.yml | 69 +++++++--------------------------------- pom.xml | 20 ------------ 2 files changed, 12 insertions(+), 77 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0282ef926..b90998266 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,66 +10,21 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build uses: docker/build-push-action@v5 - jpo-ode: - runs-on: ubuntu-latest - container: - image: eclipse-temurin:21-jdk-alpine - options: --user root - steps: - - name: Checkout ${{ github.event.repository.name }} - uses: actions/checkout@v4 - - name: Set up Maven - uses: stCarolas/setup-maven@v4.5 - with: - maven-version: 3.9.6 - - name: Build - run: | - cd $GITHUB_WORKSPACE - ls -ls && pwd - mvn -e -X clean org.jacoco:jacoco-maven-plugin:prepare-agent package - mvn -e -X clean org.jacoco:jacoco-maven-plugin:report package - - name: Archive code coverage results - uses: actions/upload-artifact@v4 - with: - name: jpo-ode - path: /__w/jpo-ode/jpo-ode/jpo-ode-svcs/target - if-no-files-found: error + sonar: - needs: [jpo-ode] runs-on: ubuntu-latest steps: - - name: Checkout ${{ github.event.repository.name }} - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: - fetch-depth: 0 - - name: Download code coverage results - uses: actions/download-artifact@v4 + submodules: recursive + - name: Set up JDK + uses: actions/setup-java@v4 with: - name: jpo-ode - path: home/runner/work/jpo-ode/jpo-ode/target - - name: Find jacoco.xml - shell: bash + java-version: "21" + distribution: "temurin" + - name: Run Sonar + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - find "$GITHUB_WORKSPACE" -name "jacoco.xml" - - name: Setup SonarScanner - uses: warchant/setup-sonar-scanner@v7 - - name: Generate sonar properties file - run: | - cat < /tmp/sonar-scanner.properties - sonar.host.url=https://sonarcloud.io - sonar.coverage.jacoco.xmlReportPaths=/home/runner/work/jpo-ode/jpo-ode/home/runner/work/jpo-ode/jpo-ode/target/site/jacoco/jacoco.xml - sonar.java.binaries=home/runner/work/jpo-ode/jpo-ode/target - sonar.projectName=jpo-ode - sonar.projectKey=usdot.jpo.ode:jpo-ode - sonar.organization=usdot-jpo-ode - jpo-ode.sonar.projectBaseDir=home/runner/work/jpo-ode/jpo-ode - jpo-ode.sonar.sources=jpo-ode-common/src,jpo-ode-core/src,jpo-ode-plugins/src,jpo-ode-svcs/src - jpo-ode.sonar.tests=jpo-ode-common/src/test,jpo-ode-core/src/test,jpo-ode-plugins/src/test,jpo-ode-svcs/src/test - jpo-ode.sonar.test.inclusions=jpo-ode-common/src/test/**,jpo-ode-core/src/test/**,jpo-ode-plugins/src/test/**,jpo-ode-svcs/src/test/** - EOF - - name: Run SonarScanner - uses: usdot-fhwa-stol/actions/sonar-scanner@main - with: - sonar-properties-path: /tmp/sonar-scanner.properties - sonar-token: ${{ secrets.SONAR_TOKEN }} - working-dir: $GITHUB_WORKSPACE + ls -la && pwd + 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 3212c7b12..da157a726 100644 --- a/pom.xml +++ b/pom.xml @@ -159,26 +159,6 @@ maven-release-plugin 2.5.3 - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - -