Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop Update Submodules #515

Merged
merged 5 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion jpo-cvdp
Submodule jpo-cvdp updated 59 files
+29 −0 .devcontainer/Dockerfile
+30 −0 .devcontainer/devcontainer.json
+58 −0 .devcontainer/reinstall-cmake.sh
+6 −0 .gitattributes
+20 −0 .github/workflows/docker.yml
+26 −0 .github/workflows/dockerhub.yml
+59 −32 CMakeLists.txt
+11 −4 Dockerfile
+9 −3 Dockerfile-nsv
+9 −3 Dockerfile.standalone
+1 −1 Doxyfile
+95 −26 README.md
+7 −0 build_and_exec.sh
+21 −0 build_and_run_unit_tests.sh
+18 −0 cdot-scripts/build_cdot.sh
+38 −0 config/fieldsToRedact.txt
+10 −3 config/ppmBsm.properties
+10 −3 config/ppmTim.properties
+37 −0 docker-compose-confluent-cloud.yml
+54 −0 docker-compose-standalone.yml
+14 −0 docker-compose.yml
+6 −0 docker-test/ppm_no_map.sh
+103 −0 docs/Release_notes.md
+13 −13 docs/configuration.md
+0 −0 docs/development.md
+1 −0 docs/diagrams/class-usage/PPM Class Usage.drawio
+ docs/diagrams/class-usage/PPM Class Usage.drawio.png
+20 −0 docs/diagrams/data-flow/README.md
+1 −0 docs/diagrams/data-flow/ppm-data-flow.drawio
+ docs/diagrams/data-flow/ppm-data-flow.png
+13 −0 docs/installation.md
+12 −2 docs/testing.md
+35 −0 docs/troubleshooting.md
+170 −0 include/bsm.hpp
+260 −0 include/bsmHandler.hpp
+0 −544 include/bsmfilter.hpp
+92 −0 include/general-redaction/rapidjsonRedactor.hpp
+97 −0 include/general-redaction/redactionPropertiesManager.hpp
+127 −0 include/idRedactor.hpp
+127 −0 include/kafka_consumer.hpp
+6 −13 include/ppm.hpp
+46 −0 include/ppmLogger.hpp
+88 −0 include/velocityFilter.hpp
+1 −0 kafka-test/CMakeLists.txt
+1 −1 kafka-test/src/rdkafka_example.cpp
+28 −0 sample.env
+97 −0 src/bsm.cpp
+50 −244 src/bsmHandler.cpp
+261 −0 src/general-redaction/rapidjsonRedactor.cpp
+166 −0 src/general-redaction/redactionPropertiesManager.cpp
+113 −0 src/idRedactor.cpp
+138 −298 src/kafka_consumer.cpp
+193 −173 src/ppm.cpp
+92 −0 src/ppmLogger.cpp
+414 −11 src/tests.cpp
+1 −1 src/tool.cpp
+41 −0 src/velocityFilter.cpp
+1 −0 unit-test-data/test-case.redaction.general.json
+1 −0 unit-test-data/test-case.redaction.general.nobitstrings.json
2 changes: 1 addition & 1 deletion sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down