Release Candidate Changes

7 files changed, 28 insertions, 31 deletions

diff --git a/.gitmodules b/.gitmodules
index cd0213164..d2f68e804 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "generator/rpc_spec"]
 	path = generator/rpc_spec
 	url = https://github.com/smartdevicelink/rpc_spec.git
-	branch = master
+	branch = version/8.0.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23e2aa55c..b7692ed29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,50 +1,47 @@
-# 5.2.0 Release Notes
+# 5.3.0 Release Notes
 
 ## Summary:
 ||Version|
 |--|--|
-| **Protocol** | 5.4.0
-| **RPC** | 7.1.0
+| **Protocol** | 5.4.1
+| **RPC** | 8.0.0
 | **Tested Targeting** | Android 30
 
 
-## Bug Fixes / Enhancements:
-
-- [MenuManager sending secondary image with menuCells when menuCommandSecondaryImage is not supported.](https://github.com/smartdevicelink/sdl_java_suite/issues/1688)
-
-- [IllegalArgumentException when starting video stream with custom RPC MTU](https://github.com/smartdevicelink/sdl_java_suite/issues/1667)
+## Features:
 
-- [Send voiceCommand with duplicate strings](https://github.com/smartdevicelink/sdl_java_suite/issues/1664)
+- [[SDL 0293] Enable OEM exclusive apps support](https://github.com/smartdevicelink/sdl_java_suite/issues/1588)
 
-- [Two voiceCommands contains the same string](https://github.com/smartdevicelink/sdl_java_suite/issues/1677)
-
-- [java.lang.NegativeArraySizeException Crash at SdlPsm.java line 241 com.smartdevicelink.transport.SdlPsm.transitionOnInput](https://github.com/smartdevicelink/sdl_java_suite/issues/1678)
-
-- [Exception handling variances](https://github.com/smartdevicelink/sdl_java_suite/issues/1687)
+## Bug Fixes / Enhancements:
 
-- [Allow SdlDeviceListener to start after BT connection](https://github.com/smartdevicelink/sdl_java_suite/pull/1685)
+- [New TaskMaster release needs to be added to Java Suite Library ](https://github.com/smartdevicelink/sdl_java_suite/issues/1745)
 
-- [voiceCommand that contains no string should be removed](https://github.com/smartdevicelink/sdl_java_suite/issues/1675)
+- [File Manager will upload the same file multiple times](https://github.com/smartdevicelink/sdl_java_suite/issues/1736)
 
-- [Image returned as "not uploaded" in certain circumstances when it's already uploaded, leading to the image being unusable](https://github.com/smartdevicelink/sdl_java_suite/issues/1692)
+- [Fix description for `SeatControlCapabilities` and `RadioControlCapabilities`](https://github.com/smartdevicelink/sdl_java_suite/issues/1739)
 
-- [Primary Graphic not sent to SDL Core for Media Template ](https://github.com/smartdevicelink/sdl_java_suite/issues/1690)
+- [AudioStreamManager and AlertManager have the same queue ID](https://github.com/smartdevicelink/sdl_java_suite/issues/1742)
 
-- [Race condition leads to NPE in TransportManager](https://github.com/smartdevicelink/sdl_java_suite/issues/1703)
+- [java.lang.IndexOutOfBoundsException Crash: SdlRouterService.java line 3275 ](https://github.com/smartdevicelink/sdl_java_suite/issues/1741)
 
-- [Avoid deleting and setting identical voice commands](https://github.com/smartdevicelink/sdl_java_suite/issues/1676)
+- [Old devices with SDL 2.0 can't display text fields and SoftButtons](https://github.com/smartdevicelink/sdl_java_suite/issues/1729)
 
-- [Sdl disconnection is not notified to the app](https://github.com/smartdevicelink/sdl_java_suite/issues/1697)
+- [Swapping de-duplicated menu items causes incorrect unique titles](https://github.com/smartdevicelink/sdl_java_suite/issues/1723)
 
-- [PredefinedLayout.NON_MEDIA not found in templatesAvailable](https://github.com/smartdevicelink/sdl_java_suite/issues/1705)
+- [MenuCell title update issue](https://github.com/smartdevicelink/sdl_java_suite/issues/1651)
 
-- [Lockscreen should show again after dismissal if a DD notification is received where DismissalEnabled is false](https://github.com/smartdevicelink/sdl_java_suite/issues/1695)
+- [Refactor the Menu Manager to Use Queues ](https://github.com/smartdevicelink/sdl_java_suite/issues/1605)
 
-- [Choice Cells and Menu Cells do not take which properties are available into account for uniqueness](https://github.com/smartdevicelink/sdl_java_suite/issues/1682)
+- [Security queries are not implemented to spec](https://github.com/smartdevicelink/sdl_java_suite/issues/1720)
 
-- [BSON library should be updated to the latest version (1.2.5)](https://github.com/smartdevicelink/sdl_java_suite/issues/1712)
+- [Choice Set Present followed directly by a Delete can have undefined behavior](https://github.com/smartdevicelink/sdl_java_suite/issues/1718)
 
+- [Back-to-back choice sets can fail](https://github.com/smartdevicelink/sdl_java_suite/issues/1717)
 
+- [Github CI fails even though tests pass locally ](https://github.com/smartdevicelink/sdl_java_suite/issues/1731)
 
+- [Handler instances using deprecated constructors  ](https://github.com/smartdevicelink/sdl_java_suite/issues/1696)
 
+- [[SDL 0236] Update mismatch in TireStatus structure](https://github.com/smartdevicelink/sdl_java_suite/issues/1089)
 
+- [Choices not saved as preloaded if some choices fail](https://github.com/smartdevicelink/sdl_java_suite/issues/1715)
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 7cbea073b..03f488b07 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.2.0
\ No newline at end of file
+5.3.0
diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle
index 73665a4b7..489da844e 100644
--- a/android/sdl_android/build.gradle
+++ b/android/sdl_android/build.gradle
@@ -5,7 +5,7 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 20
+        versionCode 21
         versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
         buildConfigField "String", "VERSION_NAME", '\"' + versionName + '\"'
         resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'
@@ -42,7 +42,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    //api 'com.livio.taskmaster:taskmaster:0.4.0'
+    //api 'com.livio.taskmaster:taskmaster:0.6.0'
     api 'com.smartdevicelink:bson_java_port:1.2.5'
     api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     api 'androidx.annotation:annotation:1.1.0'
diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
index e80255d1b..f7dd797d0 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
@@ -89,7 +89,7 @@ public class SdlProtocolBase {
     public static final int V2_HEADER_SIZE = 12;
 
     //If increasing MAX PROTOCOL VERSION major version, make sure to alter it in SdlPsm
-    private static final Version MAX_PROTOCOL_VERSION = new Version(5, 4, 0);
+    private static final Version MAX_PROTOCOL_VERSION = new Version(5, 4, 1);
 
     public static final int V1_V2_MTU_SIZE = 1500;
     public static final int V3_V4_MTU_SIZE = 131072;
diff --git a/generator/rpc_spec b/generator/rpc_spec
-Subproject 72632f946941d63a57ee5e99896e3eae3627f7d
+Subproject 20d64e68e1a2af630ac9f33888c971573bcebdd
diff --git a/javaSE/javaSE/build.gradle b/javaSE/javaSE/build.gradle
index 94b7a54d1..aa97ea53a 100644
--- a/javaSE/javaSE/build.gradle
+++ b/javaSE/javaSE/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     extraLibs 'org.mongodb:bson:4.0.5'
     extraLibs 'androidx.annotation:annotation:1.1.0'
     extraLibs 'org.java-websocket:Java-WebSocket:1.3.9'
-    //extraLibs 'com.livio.taskmaster:taskmaster:0.4.0'
+    //extraLibs 'com.livio.taskmaster:taskmaster:0.6.0'
     configurations.api.extendsFrom(configurations.extraLibs)
 }