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.

Sign up for GitHub

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

Jump to bottom

Sync Develop with Master branch for Q3 release 2024 #113

Merged
merged 5 commits into from
Oct 7, 2024
Merged

Sync Develop with Master branch for Q3 release 2024 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e71549
Merge pull request #109 from usdot-jpo-ode/missing-bsm-hotfix
John-Wiens Sep 26, 2024
26a01d7
updated submodule and pom.xml
SaikrishnaBairamoni Sep 30, 2024
a267aef
update reference
dan-du-car Oct 1, 2024
488a228
update ref
dan-du-car Oct 1, 2024
b5668ea
Merge pull request #110 from usdot-jpo-ode/release/2024-q3
SaikrishnaBairamoni Oct 1, 2024
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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

[submodule "api/asn1_codec"]
path = api/asn1_codec
url = https://github.com/iyourshaw/asn1_codec.git
url = https://github.com/usdot-jpo-ode/asn1_codec.git
2 changes: 1 addition & 1 deletion api/asn1_codec
Open in desktop
Submodule asn1_codec updated 20 files
+81 −0 Dockerfile.testing
+5 −8 config/test/c1.properties
+3 −1 data/README.md
+1 −0 data/producer_test1_xml.txt
+1 −0 data/producer_test2_xml.txt
+1 −0 data/producer_test3_xml.txt
+0 −7 data/producer_test_xml.txt
+169 −11 do_kafka_test.sh
+16 −0 docker-compose-kafka.yml
+1 −1 docker-compose.yml
+40 −4 docker-test/do_test.sh
+16 −5 docker-test/test_in.py
+15 −4 docker-test/test_out.py
+10 −0 docs/Release_notes.md
+22 −1 docs/testing.md
+2 −0 kafka-test/README.md
+9 −0 kafka-test/src/rdkafka_example.cpp
+4 −5 start_kafka.sh
+4 −0 stop_kafka.sh
+72 −9 test-scripts/standalone.sh
2 changes: 1 addition & 1 deletion api/jpo-conflictmonitor
Open in desktop
Submodule jpo-conflictmonitor updated 5 files
+3 −0 docker/connect/connect_start.sh
+38 −0 docker/mongo/b_create_indexes.js
+4 −4 jpo-conflictmonitor/pom.xml
+1 −1 jpo-geojsonconverter
+1 −1 test-message-sender/message-sender/pom.xml
12 changes: 6 additions & 6 deletions api/jpo-conflictvisualizer-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>
<groupId>usdot.jpo.ode</groupId>
<artifactId>jpo-conflictvisualizer-api</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>jpo-conflictvisualizer-api</name>
<description>Conflict Visualizer</description>
Expand Down Expand Up @@ -98,7 +98,7 @@
<dependency>
<groupId>usdot.jpo.ode</groupId>
<artifactId>jpo-ode-core</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<!-- required exclusion to preserve keycloak versions -->
<exclusions>
<exclusion>
Expand All @@ -110,23 +110,23 @@
<dependency>
<groupId>usdot.jpo.ode</groupId>
<artifactId>jpo-ode-plugins</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>usdot.jpo.ode</groupId>
<artifactId>jpo-ode-svcs</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>usdot.jpo.ode</groupId>
<artifactId>jpo-geojsonconverter</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.4.2-SNAPSHOT</version>
<classifier>jpo-geojsonconverter</classifier>
</dependency>
<dependency>
<groupId>usdot.jpo.ode</groupId>
<artifactId>jpo-conflictmonitor</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<classifier>jpo-conflictmonitor</classifier>
</dependency>
<dependency>
Expand Down
Loading