Merge pull request #528 from usdot-jpo-ode/develop

Develop into master (release 1.5.0) submodules update
usdot-jpo-ode · Dec 18, 2023 · 0fa45ab · 0fa45ab
2 parents eeb0fb2 + f1a882a
commit 0fa45ab
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/asn1_codec b/asn1_codec
diff --git a/jpo-cvdp b/jpo-cvdp
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
+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