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

Sync `candidate_r1` with `develop`
usdot-jpo-ode · Feb 26, 2024 · eef2915 · eef2915
2 parents fd909a0 + ab22739
commit eef2915
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 15 deletions.
diff --git a/docs/Release_notes.md b/docs/Release_notes.md
@@ -1,10 +1,10 @@
 JPO-ODE Release Notes
 ----------------------------
 
-Version 1.6.0, released February 2024
+Version 2.0.0, released February 2024
 ----------------------------------------
 ### **Summary**
-The updates for the jpo-ode 1.6.0 release includes an update for java, switching over to targeting J2735 2020 and some data flow diagram updates.
+The updates for the jpo-ode 2.0.0 release includes an update for java, switching over to targeting J2735 2020 and some data flow diagram updates.
 
 Enhancements in this release:
 - CDOT PR 50: Updated Java to version 21.
@@ -15,6 +15,14 @@ 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. 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
 ----------------------------------------

diff --git a/jpo-ode-common/pom.xml b/jpo-ode-common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jpo-ode-common</artifactId>

diff --git a/jpo-ode-core/pom.xml b/jpo-ode-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jpo-ode-core</artifactId>
@@ -23,12 +23,12 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-common</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
+      <version>2.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-plugins</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
+      <version>2.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>

diff --git a/jpo-ode-plugins/pom.xml b/jpo-ode-plugins/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <properties>
     <!-- SonarQube Properties -->
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-common</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
+      <version>2.0.0-SNAPSHOT</version>
     </dependency>
     <!-- TODO open-ode
     <dependency>

diff --git a/jpo-ode-svcs/pom.xml b/jpo-ode-svcs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>jpo-ode-svcs</artifactId>
   <packaging>jar</packaging>
@@ -102,12 +102,12 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-core</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
+      <version>2.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-plugins</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
+      <version>2.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

diff --git a/jpo-ode-svcs/run.bat b/jpo-ode-svcs/run.bat
@@ -1 +1 @@
-java -jar target\jpo-ode-svcs-1.6.0-SNAPSHOT.jar 
+java -jar target\jpo-ode-svcs-2.0.0-SNAPSHOT.jar 
diff --git a/jpo-ode-svcs/run.sh b/jpo-ode-svcs/run.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -jar target/jpo-ode-svcs-1.6.0-SNAPSHOT.jar 
+java -jar target/jpo-ode-svcs-2.0.0-SNAPSHOT.jar 
diff --git a/pom.xml b/pom.xml
@@ -11,12 +11,12 @@
 
   <scm>
     <developerConnection>scm:git:https://github.com/usdot-jpo-ode/jpo-ode.git</developerConnection>
-    <tag>jpo-ode-1.6.0-SNAPSHOT</tag>
+    <tag>jpo-ode-2.0.0-SNAPSHOT</tag>
   </scm>
 
   <groupId>usdot.jpo.ode</groupId>
   <artifactId>jpo-ode</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>jpo-ode-common</module>