Skip to content

Commit

Permalink
Merge pull request #97 from usdot-jpo-ode/master
Browse files Browse the repository at this point in the history 
Sync Develop with Master
  • Loading branch information
@dan-du-car
dan-du-car authored Jun 18, 2024
2 parents 42f1dd7 + f5c26bb commit c36cb9c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion api/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ADD ./asn1_codec/pugixml /asn1_codec/pugixml
RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install

# Build and install asn1c submodule
ADD ./asn1_codec/asn1c /asn1_codec/asn1c
ADD ./asn1_codec/usdot-asn1c /asn1_codec/asn1c
RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install

# Make generated files available to the build & compile example
Expand Down
2 changes: 1 addition & 1 deletion api/asn1_codec
Submodule asn1_codec updated 20 files
+9 −1 .github/workflows/dockerhub.yml
+3 −3 .gitmodules
+1 −1 Dockerfile
+1 −1 Dockerfile.dev
+0 −73 Dockerfile.keeprunning
+1 −1 Dockerfile.standalone
+24 −27 README.md
+12 −0 asn1c_combined/README.md
+ − asn1c_combined/generated-files/2016.tar.gz
+ − asn1c_combined/generated-files/2020.tar.gz
+2 −2 build_local.sh
+0 −16 docker-compose-standalone.yml
+14 −0 docs/Release_notes.md
+40 −21 docs/configuration.md
+101 −149 docs/installation.md
+4 −5 docs/interface.md
+32 −10 docs/testing.md
+3 −3 sample.env
+4 −6 src/tests.cpp
+0 −0 usdot-asn1c
2 changes: 1 addition & 1 deletion api/jpo-conflictmonitor
Submodule jpo-conflictmonitor updated 6 files
+6 −1 .github/workflows/dockerhub.yml
+4 −4 jpo-conflictmonitor/pom.xml
+1 −1 jpo-conflictmonitor/src/main/resources/application.yaml
+4 −4 jpo-deduplicator/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
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.0-SNAPSHOT</version>
<version>1.3.1-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.0.0-SNAPSHOT</version>
<version>2.1.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.0.0-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>usdot.jpo.ode</groupId>
<artifactId>jpo-ode-svcs</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>usdot.jpo.ode</groupId>
<artifactId>jpo-geojsonconverter</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.3.1-SNAPSHOT</version>
<classifier>jpo-geojsonconverter</classifier>
</dependency>
<dependency>
<groupId>usdot.jpo.ode</groupId>
<artifactId>jpo-conflictmonitor</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.3.1-SNAPSHOT</version>
<classifier>jpo-conflictmonitor</classifier>
</dependency>
<dependency>
Expand Down

0 comments on commit c36cb9c

Please sign in to comment.